diff options
| author | Andrew Tridgell <tridge@samba.org> | 1998-08-14 17:38:29 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 1998-08-14 17:38:29 +0000 |
| commit | b9623ab59e813131b1ed3f51616a46e719d59c21 (patch) | |
| tree | a1ba04e55e67ca102b05dd22b024bab9e9d51d57 /source3/libsmb | |
| parent | 58fb3c31c03601042fdba71501068fcaea8a821c (diff) | |
| download | samba-b9623ab59e813131b1ed3f51616a46e719d59c21.tar.gz samba-b9623ab59e813131b1ed3f51616a46e719d59c21.tar.bz2 samba-b9623ab59e813131b1ed3f51616a46e719d59c21.zip | |
this is the bug change to using connection_struct* instead of cnum.
Connections[] is now a local array in server.c
I might have broken something with this change. In particular the
oplock code is suspect and some .dll files aren't being oplocked when
I expected them to be. I'll look at it after I've got some sleep.
(This used to be commit c7ee025ead4a85b6fa44a832047b878451845fb6)
Diffstat (limited to 'source3/libsmb')
| -rw-r--r-- | source3/libsmb/credentials.c | 6 | ||||
| -rw-r--r-- | source3/libsmb/nmblib.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/libsmb/credentials.c b/source3/libsmb/credentials.c index c9f7ee429b..26d5c13bc9 100644 --- a/source3/libsmb/credentials.c +++ b/source3/libsmb/credentials.c @@ -96,7 +96,7 @@ void cred_create(uchar session_key[8], DOM_CHAL *stor_cred, UTIME timestamp, DEBUG(5,(" sess_key : %s\n", credstr(session_key))); DEBUG(5,(" stor_cred: %s\n", credstr(stor_cred->data))); - DEBUG(5,(" timestamp: %lx\n" , timestamp.time)); + DEBUG(5,(" timestamp: %x\n" , timestamp.time)); DEBUG(5,(" timecred : %s\n", credstr(time_cred.data))); DEBUG(5,(" calc_cred: %s\n", credstr(cred->data))); } @@ -200,12 +200,12 @@ BOOL deal_with_creds(uchar sess_key[8], new_cred = IVAL(sto_clnt_cred->challenge.data, 0); new_cred += new_clnt_time.time; - DEBUG(5,("deal_with_creds: new_cred[0]=%lx\n", new_cred)); + DEBUG(5,("deal_with_creds: new_cred[0]=%x\n", new_cred)); /* doesn't matter that server time is 0 */ rtn_srv_cred->timestamp.time = 0; - DEBUG(5,("deal_with_creds: new_clnt_time=%lx\n", new_clnt_time.time)); + DEBUG(5,("deal_with_creds: new_clnt_time=%x\n", new_clnt_time.time)); /* create return credentials for inclusion in the reply */ cred_create(sess_key, &(sto_clnt_cred->challenge), new_clnt_time, diff --git a/source3/libsmb/nmblib.c b/source3/libsmb/nmblib.c index 9c7a606a26..c887ff55de 100644 --- a/source3/libsmb/nmblib.c +++ b/source3/libsmb/nmblib.c @@ -90,7 +90,7 @@ static void debug_nmb_res_rec(struct res_rec *res, char *hdr) DEBUGADD(4, ("%c", x)); } - DEBUGADD(4, (" hex ", i)); + DEBUGADD(4, (" hex ")); for (j = 0; j < 16; j++) { |