r13439: Fix NET_SAM_LOGON_EX.

Jeremy.

diff --git a/source/include/rpc_netlogon.h b/source/include/rpc_netlogon.h
index 008204b28d5ea52edd910774f0eb6f2418c3b12d..e26768b7b9431606668cca64371d7c3a34dca1db 100644 (file)
--- a/source/include/rpc_netlogon.h
+++ b/source/include/rpc_netlogon.h
@@ -574,7 +574,7 @@ typedef struct sam_info {
 
 /* SAM_INFO - sam logon/off id structure - no creds */
 typedef struct sam_info_ex {
-       DOM_CLNT_INFO2  client;
+       DOM_CLNT_SRV    client;
        uint16          logon_level;
        NET_ID_INFO_CTR *ctr;
 } DOM_SAM_INFO_EX;

diff --git a/source/rpc_parse/parse_misc.c b/source/rpc_parse/parse_misc.c
index 26da87b280a03fdb90e0b9ad1a0c6a457ab26b59..b5b224c0a405dddd609104fb5dcaf11eeffa1096 100644 (file)
--- a/source/rpc_parse/parse_misc.c
+++ b/source/rpc_parse/parse_misc.c
@@ -1368,7 +1368,7 @@ static void init_clnt_srv(DOM_CLNT_SRV *logcln, const char *logon_srv, const cha
  Inits or writes a DOM_CLNT_SRV structure.
 ********************************************************************/
 
-static BOOL smb_io_clnt_srv(const char *desc, DOM_CLNT_SRV *logcln, prs_struct *ps, int depth)
+BOOL smb_io_clnt_srv(const char *desc, DOM_CLNT_SRV *logcln, prs_struct *ps, int depth)
 {
        if (logcln == NULL)
                return False;

diff --git a/source/rpc_parse/parse_net.c b/source/rpc_parse/parse_net.c
index d336df161db92a5683dda3fc0dba79655297019a..3734ce26a69c4fba2f047aef040f53fc9c3913c5 100644 (file)
--- a/source/rpc_parse/parse_net.c
+++ b/source/rpc_parse/parse_net.c
@@ -1381,7 +1381,7 @@ static BOOL smb_io_sam_info_ex(const char *desc, DOM_SAM_INFO_EX *sam, prs_struc
        if(!prs_align(ps))
                return False;
        
-       if(!smb_io_clnt_info2("", &sam->client, ps, depth))
+       if(!smb_io_clnt_srv("", &sam->client, ps, depth))
                return False;
 
        if(!prs_uint16("logon_level  ", ps, depth, &sam->logon_level))

diff --git a/source/rpc_server/srv_netlog_nt.c b/source/rpc_server/srv_netlog_nt.c
index 39f2f4a09c0fc79bc346971ecfeff8b7f3342983..9c7f17c14f69297e8da132a1c163baf5d05485b6 100644 (file)
--- a/source/rpc_server/srv_netlog_nt.c
+++ b/source/rpc_server/srv_netlog_nt.c
@@ -941,6 +941,7 @@ NTSTATUS _net_sam_logon_ex(pipes_struct *p, NET_Q_SAM_LOGON_EX *q_u, NET_R_SAM_L
        q.validation_level = q_u->validation_level;
 
        /* Map a DOM_SAM_INFO_EX into a DOM_SAM_INFO with no creds. */
+       q.sam_id.client.login = q_u->sam_id.client;
        q.sam_id.logon_level = q_u->sam_id.logon_level;
        q.sam_id.ctr = q_u->sam_id.ctr;