mirror of
https://github.com/samba-team/samba.git
synced 2025-03-27 22:50:26 +03:00
r25564: Pass sharename to delete_share_security()
(This used to be commit d100bfffe2a503b8820889faedc6ed57100ca7af)
This commit is contained in:
parent
3a14416dde
commit
b5535567c1
@ -197,18 +197,20 @@ BOOL set_share_security(const char *share_name, SEC_DESC *psd)
|
||||
Delete a security descriptor.
|
||||
********************************************************************/
|
||||
|
||||
BOOL delete_share_security(const struct share_params *params)
|
||||
BOOL delete_share_security(const char *servicename)
|
||||
{
|
||||
TDB_DATA kbuf;
|
||||
fstring key;
|
||||
char *key;
|
||||
|
||||
slprintf(key, sizeof(key)-1, "SECDESC/%s",
|
||||
lp_servicename(params->service));
|
||||
if (!(key = talloc_asprintf(talloc_tos(), "SECDESC/%s",
|
||||
servicename))) {
|
||||
return False;
|
||||
}
|
||||
kbuf = string_term_tdb_data(key);
|
||||
|
||||
if (tdb_trans_delete(share_tdb, kbuf) != 0) {
|
||||
DEBUG(0,("delete_share_security: Failed to delete entry for share %s\n",
|
||||
lp_servicename(params->service) ));
|
||||
DEBUG(0, ("delete_share_security: Failed to delete entry for "
|
||||
"share %s\n", servicename));
|
||||
return False;
|
||||
}
|
||||
|
||||
|
@ -5517,7 +5517,7 @@ int load_usershare_shares(void)
|
||||
/* Remove from the share ACL db. */
|
||||
DEBUG(10,("load_usershare_shares: Removing deleted usershare %s\n",
|
||||
lp_servicename(iService) ));
|
||||
delete_share_security(snum2params_static(iService));
|
||||
delete_share_security(lp_servicename(iService));
|
||||
free_service_byindex(iService);
|
||||
}
|
||||
}
|
||||
@ -5749,7 +5749,7 @@ int lp_servicenumber(const char *pszServiceName)
|
||||
|
||||
if (!usershare_exists(iService, &last_mod)) {
|
||||
/* Remove the share security tdb entry for it. */
|
||||
delete_share_security(snum2params_static(iService));
|
||||
delete_share_security(lp_servicename(iService));
|
||||
/* Remove it from the array. */
|
||||
free_service_byindex(iService);
|
||||
/* Doesn't exist anymore. */
|
||||
|
@ -1994,7 +1994,7 @@ WERROR _srvsvc_NetShareDel(pipes_struct *p, struct srvsvc_NetShareDel *r)
|
||||
}
|
||||
|
||||
/* Delete the SD in the database. */
|
||||
delete_share_security(params);
|
||||
delete_share_security(lp_servicename(params->service));
|
||||
|
||||
lp_killservice(params->service);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user