sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-30 17:49:30 +03:00
Code Activity

s3:smbd: Fix size types in reply_negprot()

Browse Source 
This fixes compilation with -Wstrict-overflow=2.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Andreas Schneider
2018-03-22 11:49:18 +01:00
committed by Jeremy Allison
parent abc9c56021
commit 06940155f3
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source3/smbd/negprot.c
View File

@ -557,14 +557,15 @@ static const struct {
void reply_negprot(struct smb_request *req) void reply_negprot(struct smb_request *req)
{ {
int choice= -1; size_t choice = 0;
int chosen_level = -1; int chosen_level = -1;
bool choice_set = false;
int protocol; int protocol;
const char *p; const char *p;
int protocols = 0; int protocols = 0;
int num_cliprotos; int num_cliprotos;
char **cliprotos; char **cliprotos;
int i; size_t i;
size_t converted_size; size_t converted_size;
struct smbXsrv_connection *xconn = req->xconn; struct smbXsrv_connection *xconn = req->xconn;
struct smbd_server_connection *sconn = req->sconn; struct smbd_server_connection *sconn = req->sconn;
@ -733,14 +734,16 @@ void reply_negprot(struct smb_request *req)
if (strequal(cliprotos[i],supported_protocols[protocol].proto_name)) { if (strequal(cliprotos[i],supported_protocols[protocol].proto_name)) {
choice = i; choice = i;
chosen_level = supported_protocols[protocol].protocol_level; chosen_level = supported_protocols[protocol].protocol_level;
choice_set = true;
} }
i++; i++;
} }
if(choice != -1) if (choice_set) {
break; break;
}
} }
if (choice == -1) { if (!choice_set) {
bool ok; bool ok;
DBG_NOTICE("No protocol supported !\n"); DBG_NOTICE("No protocol supported !\n");
@ -760,7 +763,7 @@ void reply_negprot(struct smb_request *req)
supported_protocols[protocol].proto_reply_fn(req, choice); supported_protocols[protocol].proto_reply_fn(req, choice);
DEBUG(3,("Selected protocol %s\n",supported_protocols[protocol].proto_name)); DEBUG(3,("Selected protocol %s\n",supported_protocols[protocol].proto_name));
DEBUG( 5, ( "negprot index=%d\n", choice ) ); DBG_INFO("negprot index=%zu\n", choice);
/* We always have xconn->smb1.signing_state also for >= SMB2_02 */ /* We always have xconn->smb1.signing_state also for >= SMB2_02 */
signing_required = smb_signing_is_mandatory(xconn->smb1.signing_state); signing_required = smb_signing_is_mandatory(xconn->smb1.signing_state);