diff options
| author | Jeremy Allison <jra@samba.org> | 2006-02-10 19:16:50 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:10:02 -0500 |
| commit | e493d329122e16a70f9f858aaa9ba51d20eba3c7 (patch) | |
| tree | 692301a9e9b7d3d9528a52c279300fafef81b5ba /source3 | |
| parent | e19ae285813e2e00d97f6b1c01a135935aa43fdc (diff) | |
| download | samba-e493d329122e16a70f9f858aaa9ba51d20eba3c7.tar.gz samba-e493d329122e16a70f9f858aaa9ba51d20eba3c7.tar.bz2 samba-e493d329122e16a70f9f858aaa9ba51d20eba3c7.zip | |
r13439: Fix NET_SAM_LOGON_EX.
Jeremy.
(This used to be commit 9437ffc84f4d924ab67f3e16ef507d2aeeeb5f34)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/rpc_netlogon.h | 2 | ||||
| -rw-r--r-- | source3/rpc_parse/parse_misc.c | 2 | ||||
| -rw-r--r-- | source3/rpc_parse/parse_net.c | 2 | ||||
| -rw-r--r-- | source3/rpc_server/srv_netlog_nt.c | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/source3/include/rpc_netlogon.h b/source3/include/rpc_netlogon.h index 008204b28d..e26768b7b9 100644 --- a/source3/include/rpc_netlogon.h +++ b/source3/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/source3/rpc_parse/parse_misc.c b/source3/rpc_parse/parse_misc.c index 26da87b280..b5b224c0a4 100644 --- a/source3/rpc_parse/parse_misc.c +++ b/source3/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/source3/rpc_parse/parse_net.c b/source3/rpc_parse/parse_net.c index d336df161d..3734ce26a6 100644 --- a/source3/rpc_parse/parse_net.c +++ b/source3/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/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c index 39f2f4a09c..9c7f17c14f 100644 --- a/source3/rpc_server/srv_netlog_nt.c +++ b/source3/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; |