summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2005-10-28 13:22:09 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:45:28 -0500
commit4378c3c9ccb997e8e861ca057f4c0823f661fd19 (patch)
treed005c50622879b7564b456fcef3c91996eee35d1
parenta2b93c3f5f964e0d9434889d0e47e14bc9e67b8f (diff)
downloadsamba-4378c3c9ccb997e8e861ca057f4c0823f661fd19.tar.gz
samba-4378c3c9ccb997e8e861ca057f4c0823f661fd19.tar.bz2
samba-4378c3c9ccb997e8e861ca057f4c0823f661fd19.zip
r11373: Handle an apparent alias in NBT ntlogin replies.
Andrew Bartlett (This used to be commit 51d55d2211195fe5d345ce130001dff1bfbfcef3)
-rw-r--r--source4/librpc/idl/nbt.idl6
-rw-r--r--source4/nbt_server/irpc.c3
2 files changed, 6 insertions, 3 deletions
diff --git a/source4/librpc/idl/nbt.idl b/source4/librpc/idl/nbt.idl
index e188c61d86..96295100bb 100644
--- a/source4/librpc/idl/nbt.idl
+++ b/source4/librpc/idl/nbt.idl
@@ -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 {
diff --git a/source4/nbt_server/irpc.c b/source4/nbt_server/irpc.c
index 14a274da5e..c5d7a83d83 100644
--- a/source4/nbt_server/irpc.c
+++ b/source4/nbt_server/irpc.c
@@ -81,7 +81,8 @@ static void getdc_recv_ntlogon_reply(struct dgram_mailslot_handler *dgmslot,
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, "