From 7b1c5392f789ff933e8ab61c9b65b400b7c33ffe Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 18 Apr 2000 03:34:27 +0000 Subject: [PATCH] updates from the TNG branch (This used to be commit 36fb5bc72fc6c0de719205ea34f497bfa0c4082f) --- source3/nmbd/nmbd_processlogon.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/source3/nmbd/nmbd_processlogon.c b/source3/nmbd/nmbd_processlogon.c index 3c0df6995e9..9784afe9e2e 100644 --- a/source3/nmbd/nmbd_processlogon.c +++ b/source3/nmbd/nmbd_processlogon.c @@ -101,8 +101,7 @@ logons are not enabled.\n", inet_ntoa(p->ip) )); send_mailslot(True, getdc, outbuf,PTR_DIFF(q,outbuf), - dgram->dest_name.name, - dgram->dest_name.name_type, + global_myname, 0x0, dgram->source_name.name, dgram->source_name.name_type, p->ip, *iface_ip(p->ip), p->port); @@ -175,7 +174,7 @@ logons are not enabled.\n", inet_ntoa(p->ip) )); DEBUG(3,("process_logon_packet: GETDC request from %s at IP %s, \ reporting %s domain %s 0x%x ntversion=%x lm_nt token=%x lm_20 token=%x\n", - machine,inet_ntoa(p->ip), reply_name, lp_workgroup(), + machine,inet_ntoa(p->ip), reply_name, global_myworkgroup, QUERYFORPDC_R, (uint32)ntversion, (uint32)lmnttoken, (uint32)lm20token )); @@ -183,8 +182,7 @@ reporting %s domain %s 0x%x ntversion=%x lm_nt token=%x lm_20 token=%x\n", send_mailslot(True, getdc, outbuf,PTR_DIFF(q,outbuf), - dgram->dest_name.name, - dgram->dest_name.name_type, + global_myname, 0x0, dgram->source_name.name, dgram->source_name.name_type, p->ip, *iface_ip(p->ip), p->port); @@ -255,9 +253,8 @@ reporting %s domain %s 0x%x ntversion=%x lm_nt token=%x lm_20 token=%x\n", q += 2; q += dos_PutUniCode(q, reply_name,sizeof(pstring), True); - unistrcpy(q, uniuser); - q = skip_unibuf(q, PTR_DIFF(buf+len, q)); /* User name (workstation trust account) */ - q += dos_PutUniCode(q, lp_workgroup(),sizeof(pstring), True); + q += dos_PutUniCode(q, ascuser, sizeof(pstring), True); + q += dos_PutUniCode(q, global_myworkgroup,sizeof(pstring), True); /* tell the client what version we are */ SIVAL(q, 0, 1); /* our ntversion */ @@ -269,8 +266,7 @@ reporting %s domain %s 0x%x ntversion=%x lm_nt token=%x lm_20 token=%x\n", send_mailslot(True, getdc, outbuf,PTR_DIFF(q,outbuf), - dgram->dest_name.name, - dgram->dest_name.name_type, + global_myname, 0x0, dgram->source_name.name, dgram->source_name.name_type, p->ip, *iface_ip(p->ip), p->port);