svn commit: samba r13439 - in branches/SAMBA_3_0/source: include rpc_parse rpc_server

[jra]

Author: jra
Date: 2006-02-10 19:16:50 +0000 (Fri, 10 Feb 2006)
New Revision: 13439

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

Log:
Fix NET_SAM_LOGON_EX.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/include/rpc_netlogon.h
   branches/SAMBA_3_0/source/rpc_parse/parse_misc.c
   branches/SAMBA_3_0/source/rpc_parse/parse_net.c
   branches/SAMBA_3_0/source/rpc_server/srv_netlog_nt.c


Changeset:
Modified: branches/SAMBA_3_0/source/include/rpc_netlogon.h
===================================================================
--- branches/SAMBA_3_0/source/include/rpc_netlogon.h    2006-02-10 19:16:48 UTC 
(rev 13438)
+++ branches/SAMBA_3_0/source/include/rpc_netlogon.h    2006-02-10 19:16:50 UTC 
(rev 13439)
@@ -574,7 +574,7 @@
 
 /* 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;

Modified: branches/SAMBA_3_0/source/rpc_parse/parse_misc.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_parse/parse_misc.c    2006-02-10 19:16:48 UTC 
(rev 13438)
+++ branches/SAMBA_3_0/source/rpc_parse/parse_misc.c    2006-02-10 19:16:50 UTC 
(rev 13439)
@@ -1368,7 +1368,7 @@
  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;

Modified: branches/SAMBA_3_0/source/rpc_parse/parse_net.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_parse/parse_net.c     2006-02-10 19:16:48 UTC 
(rev 13438)
+++ branches/SAMBA_3_0/source/rpc_parse/parse_net.c     2006-02-10 19:16:50 UTC 
(rev 13439)
@@ -1381,7 +1381,7 @@
        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))

Modified: branches/SAMBA_3_0/source/rpc_server/srv_netlog_nt.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_server/srv_netlog_nt.c        2006-02-10 
19:16:48 UTC (rev 13438)
+++ branches/SAMBA_3_0/source/rpc_server/srv_netlog_nt.c        2006-02-10 
19:16:50 UTC (rev 13439)
@@ -941,6 +941,7 @@
        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;