svn commit: samba r11373 - in branches/SAMBA_4_0/source: librpc/idl nbt_server

[abartlet at samba.org]

Author: abartlet
Date: 2005-10-28 13:22:09 +0000 (Fri, 28 Oct 2005)
New Revision: 11373

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11373

Log:
Handle an apparent alias in NBT ntlogin replies.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/librpc/idl/nbt.idl
   branches/SAMBA_4_0/source/nbt_server/irpc.c


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/nbt.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/nbt.idl	2005-10-28 12:08:03 UTC (rev 11372)
+++ branches/SAMBA_4_0/source/librpc/idl/nbt.idl	2005-10-28 13:22:09 UTC (rev 11373)
@@ -536,8 +536,9 @@
 	/*******************************************/
 	/* \MAILSLOT\NET\NTLOGON mailslot requests */
 	typedef enum {
-		NTLOGON_SAM_LOGON       = 0x12,
-		NTLOGON_SAM_LOGON_REPLY = 0x13
+		NTLOGON_SAM_LOGON         = 0x12,
+		NTLOGON_SAM_LOGON_REPLY   = 0x13,
+		NTLOGON_SAM_LOGON_REPLY15 = 0x15
 	} nbt_ntlogon_command;
 
 	typedef struct {
@@ -566,6 +567,7 @@
 	typedef [nodiscriminant] union {
 		[case(NTLOGON_SAM_LOGON)]       nbt_ntlogon_sam_logon logon;
 		[case(NTLOGON_SAM_LOGON_REPLY)] nbt_ntlogon_sam_logon_reply reply;
+		[case(NTLOGON_SAM_LOGON_REPLY15)] nbt_ntlogon_sam_logon_reply reply;
 	} nbt_ntlogon_request;
 
 	typedef [flag(NDR_NOALIGN),public] struct {

Modified: branches/SAMBA_4_0/source/nbt_server/irpc.c
===================================================================
--- branches/SAMBA_4_0/source/nbt_server/irpc.c	2005-10-28 12:08:03 UTC (rev 11372)
+++ branches/SAMBA_4_0/source/nbt_server/irpc.c	2005-10-28 13:22:09 UTC (rev 11373)
@@ -81,7 +81,8 @@
 	case NTLOGON_SAM_LOGON:
 		DEBUG(0, ("Huh -- got NTLOGON_SAM_LOGON as reply\n"));
 		break;
-	case NTLOGON_SAM_LOGON_REPLY: {
+	case NTLOGON_SAM_LOGON_REPLY:
+	case NTLOGON_SAM_LOGON_REPLY15: {
 		const char *p = ntlogon.req.reply.server;
 
 		DEBUG(10, ("NTLOGON_SAM_LOGON_REPLY: server: %s, user: %s, "