diff options
author | Stefan Metzmacher <metze@samba.org> | 2004-12-04 13:56:25 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:06:21 -0500 |
commit | 9112a632f6791ffc3c3c1aadd214cbaba8fe816e (patch) | |
tree | 129b941d550b15e919461dedcde286f1697ba94d /source4/smb_server/negprot.c | |
parent | 4127edc1afd702ac3bcb77893ba864eb98729451 (diff) | |
download | samba-9112a632f6791ffc3c3c1aadd214cbaba8fe816e.tar.gz samba-9112a632f6791ffc3c3c1aadd214cbaba8fe816e.tar.bz2 samba-9112a632f6791ffc3c3c1aadd214cbaba8fe816e.zip |
r4063: - change char * -> uint8_t in struct request_buffer
- change smbcli_read/write to take void * for the buffers to match read(2)/write(2)
all this fixes a lot of gcc-4 warnings
metze
(This used to be commit b94f92bc6637f748d6f7049f4f9a30b0b8d18a7a)
Diffstat (limited to 'source4/smb_server/negprot.c')
-rw-r--r-- | source4/smb_server/negprot.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/smb_server/negprot.c b/source4/smb_server/negprot.c index bd1d8249d9..2cbdb9fcca 100644 --- a/source4/smb_server/negprot.c +++ b/source4/smb_server/negprot.c @@ -25,7 +25,7 @@ /* initialise the auth_context for this server and return the cryptkey */ -static void get_challenge(struct smbsrv_connection *smb_conn, char buff[8]) +static void get_challenge(struct smbsrv_connection *smb_conn, uint8_t buff[8]) { NTSTATUS nt_status; const uint8_t *cryptkey; @@ -386,7 +386,7 @@ void reply_negprot(struct smbsrv_request *req) int Index=0; int choice = -1; int protocol; - char *p; + uint8_t *p; if (req->smb_conn->negotiate.done_negprot) { smbsrv_terminate_connection(req->smb_conn, "multiple negprot's are not permitted"); @@ -398,8 +398,8 @@ void reply_negprot(struct smbsrv_request *req) while (p < req->in.data + req->in.data_size) { Index++; - DEBUG(3,("Requested protocol [%s]\n",p)); - p += strlen(p) + 2; + DEBUG(3,("Requested protocol [%s]\n",(const char *)p)); + p += strlen((const char *)p) + 2; } /* Check for protocols, most desirable first */ @@ -409,10 +409,10 @@ void reply_negprot(struct smbsrv_request *req) if ((supported_protocols[protocol].protocol_level <= lp_maxprotocol()) && (supported_protocols[protocol].protocol_level >= lp_minprotocol())) while (p < (req->in.data + req->in.data_size)) { - if (strequal(p,supported_protocols[protocol].proto_name)) + if (strequal((const char *)p,supported_protocols[protocol].proto_name)) choice = Index; Index++; - p += strlen(p) + 2; + p += strlen((const char *)p) + 2; } if(choice != -1) break; |