fix some uchar/char conflicts

(This used to be commit c164681dfe2ad9623a59f01eea914bf27d4801e5)

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 4781b103ce0858dcc0d9ef42a6ab27976f849692..99a194d5c5b1827d22e52bd4cf924a46cf16eed0 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -111,9 +111,9 @@ void cred_session_key(DOM_CHAL *clnt_chal, DOM_CHAL *srv_chal, char *pass,
                      uchar session_key[8]);
 void cred_create(uchar session_key[8], DOM_CHAL *stor_cred, UTIME timestamp, 
                 DOM_CHAL *cred);
-int cred_assert(DOM_CHAL *cred, char session_key[8], DOM_CHAL *stored_cred,
+int cred_assert(DOM_CHAL *cred, uchar session_key[8], DOM_CHAL *stored_cred,
                UTIME timestamp);
-BOOL clnt_deal_with_creds(char sess_key[8],
+BOOL clnt_deal_with_creds(uchar sess_key[8],
                          DOM_CRED *sto_clnt_cred, DOM_CRED *rcv_srv_cred);
 BOOL deal_with_creds(uchar sess_key[8],
                     DOM_CRED *sto_clnt_cred, 

diff --git a/source3/libsmb/credentials.c b/source3/libsmb/credentials.c
index 754aebca9921fbcce3b959ef5ae7eb63c94d1b05..b06ca6ffc6dab877487b7e826187bb23e83e7973 100644 (file)
--- a/source3/libsmb/credentials.c
+++ b/source3/libsmb/credentials.c
@@ -115,7 +115,7 @@ Output:
       returns 1 if computed credential matches received credential
       returns 0 otherwise
 ****************************************************************************/
-int cred_assert(DOM_CHAL *cred, char session_key[8], DOM_CHAL *stored_cred,
+int cred_assert(DOM_CHAL *cred, uchar session_key[8], DOM_CHAL *stored_cred,
                UTIME timestamp)
 {
        DOM_CHAL cred2;
@@ -144,7 +144,7 @@ int cred_assert(DOM_CHAL *cred, char session_key[8], DOM_CHAL *stored_cred,
 /****************************************************************************
   checks credentials; generates next step in the credential chain
 ****************************************************************************/
-BOOL clnt_deal_with_creds(char sess_key[8],
+BOOL clnt_deal_with_creds(uchar sess_key[8],
                          DOM_CRED *sto_clnt_cred, DOM_CRED *rcv_srv_cred)
 {
        UTIME new_clnt_time;