summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJim McDonough <jmcd@samba.org>2002-05-31 00:29:29 +0000
committerJim McDonough <jmcd@samba.org>2002-05-31 00:29:29 +0000
commita14fbf6763709f035ed37062cbb6dfbe273c40e3 (patch)
tree31e7ac6231413f7ceee1f6538395b23d29898eb8 /source3
parent0e3260de6fdaa93ce0dddd98b1413662be972ce3 (diff)
downloadsamba-a14fbf6763709f035ed37062cbb6dfbe273c40e3.tar.gz
samba-a14fbf6763709f035ed37062cbb6dfbe273c40e3.tar.bz2
samba-a14fbf6763709f035ed37062cbb6dfbe273c40e3.zip
netfileenum was missing the username filter.
(This used to be commit 8fc3dba8bd99c55bef9ac137976dd35134a49342)
Diffstat (limited to 'source3')
-rw-r--r--source3/include/rpc_srvsvc.h3
-rw-r--r--source3/rpc_parse/parse_srv.c9
2 files changed, 11 insertions, 1 deletions
diff --git a/source3/include/rpc_srvsvc.h b/source3/include/rpc_srvsvc.h
index 6c5f6b819c..1aa9abe043 100644
--- a/source3/include/rpc_srvsvc.h
+++ b/source3/include/rpc_srvsvc.h
@@ -623,6 +623,9 @@ typedef struct q_net_file_enum_info
uint32 ptr_qual_name; /* pointer (to qualifier name) */
UNISTR2 uni_qual_name; /* qualifier name "\\qualifier" */
+ uint32 ptr_user_name; /* pointer (to user name) */
+ UNISTR2 uni_user_name; /* user name */
+
uint32 file_level; /* file level */
SRV_FILE_INFO_CTR *ctr;
diff --git a/source3/rpc_parse/parse_srv.c b/source3/rpc_parse/parse_srv.c
index 79cf0d9776..78748463ac 100644
--- a/source3/rpc_parse/parse_srv.c
+++ b/source3/rpc_parse/parse_srv.c
@@ -1986,7 +1986,7 @@ void init_srv_q_net_file_enum(SRV_Q_NET_FILE_ENUM *q_n,
init_buf_unistr2(&q_n->uni_srv_name, &q_n->ptr_srv_name, srv_name);
init_buf_unistr2(&q_n->uni_qual_name, &q_n->ptr_qual_name, qual_name);
- q_n->file_level = file_level;
+ q_n->file_level = q_n->ctr->switch_value = file_level;
q_n->preferred_len = preferred_len;
memcpy(&q_n->enum_hnd, hnd, sizeof(*hnd));
@@ -2023,6 +2023,13 @@ BOOL srv_io_q_net_file_enum(char *desc, SRV_Q_NET_FILE_ENUM *q_n, prs_struct *ps
if(!prs_align(ps))
return False;
+ if(!prs_uint32("ptr_user_name", ps, depth, &q_n->ptr_user_name))
+ return False;
+ if(!smb_io_unistr2("", &q_n->uni_user_name, q_n->ptr_user_name, ps, depth))
+ return False;
+
+ if(!prs_align(ps))
+ return False;
if(!prs_uint32("file_level", ps, depth, &q_n->file_level))
return False;