summaryrefslogtreecommitdiff
path: root/source3/pipenetlog.c
diff options
context:
space:
mode:
authorLuke Leighton <lkcl@samba.org>1997-10-13 16:32:43 +0000
committerLuke Leighton <lkcl@samba.org>1997-10-13 16:32:43 +0000
commit106410a376fa520a62e065e7a0becb5796aaf80e (patch)
tree036246acff5ed732bcb6c33306d15225b37f179f /source3/pipenetlog.c
parent1035aa9c73bd26e0b01781e6b9b8af51b2013a25 (diff)
downloadsamba-106410a376fa520a62e065e7a0becb5796aaf80e.tar.gz
samba-106410a376fa520a62e065e7a0becb5796aaf80e.tar.bz2
samba-106410a376fa520a62e065e7a0becb5796aaf80e.zip
resolving some of the confusion over credentials.
(This used to be commit 9d1f45ca6bbdeeef448ccb55e1275c6f9ec59820)
Diffstat (limited to 'source3/pipenetlog.c')
-rw-r--r--source3/pipenetlog.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/source3/pipenetlog.c b/source3/pipenetlog.c
index ef5acdc545..0191d2fa5e 100644
--- a/source3/pipenetlog.c
+++ b/source3/pipenetlog.c
@@ -303,6 +303,7 @@ static BOOL update_dcinfo(int cnum, uint16 vuid,
for (i = 0; i < 8; i++)
{
dc->srv_chal.data[i] = 0xA5;
+ dc->srv_cred.data[i] = 0xA5;
}
/* from client / server challenges and md4 password, generate sess key */
@@ -347,7 +348,6 @@ static void api_lsa_auth_2( user_struct *vuser,
{
LSA_Q_AUTH_2 q_a;
- DOM_CHAL srv_chal;
UTIME srv_time;
srv_time.time = 0;
@@ -357,14 +357,17 @@ static void api_lsa_auth_2( user_struct *vuser,
/* check that the client credentials are valid */
cred_assert(&(q_a.clnt_chal), vuser->dc.sess_key,
- &(vuser->dc.srv_cred), srv_time);
+ &(vuser->dc.clnt_cred), srv_time);
- /* create server credentials for inclusion in the reply */
- cred_create(vuser->dc.sess_key, &(vuser->dc.clnt_cred), srv_time, &srv_chal);
+ /* create server challenge for inclusion in the reply */
+ cred_create(vuser->dc.sess_key, &(vuser->dc.srv_cred), srv_time, &(vuser->dc.srv_chal));
+
+ /* update the client credentials (copy server challenge) for use next time */
+ memcpy(vuser->dc.clnt_cred.data, vuser->dc.srv_chal.data, sizeof(vuser->dc.clnt_cred.data));
- /* construct reply. */
+ /* construct reply. */
*rdata_len = lsa_reply_auth_2(&q_a, *rdata + 0x18, *rdata,
- &srv_chal, 0x0);
+ &(vuser->dc.srv_chal), 0x0);
}
@@ -378,7 +381,7 @@ static BOOL deal_with_credentials(user_struct *vuser,
/* check that the client credentials are valid */
if (cred_assert(&(clnt_cred->challenge), vuser->dc.sess_key,
- &(vuser->dc.srv_cred), clnt_cred->timestamp))
+ &(vuser->dc.clnt_cred), clnt_cred->timestamp))
{
return False;
}