diff options
| author | Andrew Tridgell <tridge@samba.org> | 1997-11-02 04:11:05 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 1997-11-02 04:11:05 +0000 |
| commit | e67c2e9dc64e8a9f848d2769c33eef1d09fdb3e1 (patch) | |
| tree | 69e033ff51d0d11b948af9b7c2ff578281073da9 | |
| parent | 4012c1cc8f47c7b3271a76a362ed2e4be4e8405c (diff) | |
| download | samba-e67c2e9dc64e8a9f848d2769c33eef1d09fdb3e1.tar.gz samba-e67c2e9dc64e8a9f848d2769c33eef1d09fdb3e1.tar.bz2 samba-e67c2e9dc64e8a9f848d2769c33eef1d09fdb3e1.zip | |
fix some uchar/char conflicts
(This used to be commit c164681dfe2ad9623a59f01eea914bf27d4801e5)
| -rw-r--r-- | source3/include/proto.h | 4 | ||||
| -rw-r--r-- | source3/libsmb/credentials.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 4781b103ce..99a194d5c5 100644 --- 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 754aebca99..b06ca6ffc6 100644 --- 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; |