summaryrefslogtreecommitdiff
path: root/source4/rpc_server/srvsvc
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-10-29 21:04:31 +0100
committerGünther Deschner <gd@samba.org>2008-10-31 02:44:29 +0100
commit0b95cb251ce0043e393139a22a0f3ac6121406c5 (patch)
tree8bc527f53d2abf8c8768ac7d581c3cf9ba0a5280 /source4/rpc_server/srvsvc
parent4b8606f616cdd2fe885729a044d6139fc0001780 (diff)
downloadsamba-0b95cb251ce0043e393139a22a0f3ac6121406c5.tar.gz
samba-0b95cb251ce0043e393139a22a0f3ac6121406c5.tar.bz2
samba-0b95cb251ce0043e393139a22a0f3ac6121406c5.zip
s4-srvsvc: merge srvsvc_NetShareInfo502 from s3.
Apparently both s3 and s4 are not entirely correct one this. metze is looking into hand-marshalling security descriptors so this will fix this finally. For now, just keep the two in sync. Guenther
Diffstat (limited to 'source4/rpc_server/srvsvc')
-rw-r--r--source4/rpc_server/srvsvc/dcesrv_srvsvc.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
index 58eed57f0f..70911e92fe 100644
--- a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
+++ b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
@@ -697,8 +697,7 @@ static WERROR dcesrv_srvsvc_fiel_ShareInfo(struct dcesrv_call_state *dce_call, T
info->info502->path = dcesrv_common_get_share_path(mem_ctx, dce_ctx, scfg);
W_ERROR_HAVE_NO_MEMORY(info->info502->path);
info->info502->password = talloc_strdup(mem_ctx, share_string_option(scfg, SHARE_PASSWORD, NULL));
- info->info502->unknown = dcesrv_common_get_share_unknown(mem_ctx, dce_ctx, scfg);
- info->info502->sd = dcesrv_common_get_security_descriptor(mem_ctx, dce_ctx, scfg);
+ info->info502->sd_buf.sd = dcesrv_common_get_security_descriptor(mem_ctx, dce_ctx, scfg);
return WERR_OK;
}
@@ -1323,7 +1322,7 @@ static WERROR dcesrv_srvsvc_NetShareSetInfo(struct dcesrv_call_state *dce_call,
r->in.info.info502->type,
r->in.info.info502->max_users,
0,
- r->in.info.info502->sd);
+ r->in.info.info502->sd_buf.sd);
if (W_ERROR_EQUAL(status, WERR_OK)) {
return status;
}