summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Disseldorp <ddiss@samba.org>2014-11-25 22:22:23 +0100
committerJeremy Allison <jra@samba.org>2014-11-26 19:05:37 +0100
commit2d755a4e2aa1e5dffdd3e8eafa82ce07f428def1 (patch)
treef8eccd8ad313f406c3434100258db51d16508037
parentc426f97238e4f664d1b13781101ca9c942aa7d0d (diff)
downloadsamba-2d755a4e2aa1e5dffdd3e8eafa82ce07f428def1.tar.gz
srv_srvsvc_nt: remove unneeded get_share_params() call
The snum and share name are already determined via the prior find_service() call. Signed-off-by: David Disseldorp <ddiss@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
-rw-r--r--source3/rpc_server/srvsvc/srv_srvsvc_nt.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
index eaa70e784d6..5c26f15bafa 100644
--- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
@@ -2143,7 +2143,6 @@ WERROR _srvsvc_NetShareDel(struct pipes_struct *p,
int ret;
int snum;
bool is_disk_op;
- struct share_params *params;
TALLOC_CTX *ctx = p->mem_ctx;
DEBUG(5,("_srvsvc_NetShareDel: %d\n", __LINE__));
@@ -2168,10 +2167,6 @@ WERROR _srvsvc_NetShareDel(struct pipes_struct *p,
return WERR_NO_SUCH_SHARE;
}
- if (!(params = get_share_params(p->mem_ctx, share_name))) {
- return WERR_NO_SUCH_SHARE;
- }
-
/* No change to printer shares. */
if (lp_printable(snum))
return WERR_ACCESS_DENIED;
@@ -2190,7 +2185,7 @@ WERROR _srvsvc_NetShareDel(struct pipes_struct *p,
"%s \"%s\" \"%s\"",
lp_delete_share_command(talloc_tos()),
get_dyn_CONFIGFILE(),
- lp_servicename(talloc_tos(), snum));
+ share_name);
if (!command) {
return WERR_NOMEM;
}
@@ -2219,9 +2214,9 @@ WERROR _srvsvc_NetShareDel(struct pipes_struct *p,
return WERR_ACCESS_DENIED;
/* Delete the SD in the database. */
- delete_share_security(lp_servicename(talloc_tos(), params->service));
+ delete_share_security(share_name);
- lp_killservice(params->service);
+ lp_killservice(snum);
return WERR_OK;
}