s3:services_db: remove the TALLOC_CTX argument from svcctl_set_secdesc

diff --git a/source3/include/proto.h b/source3/include/proto.h
index d7b9cb0a93cdcc187a02bfbf3df694fa781646d8..b076e230f7dda42e6b7f7fe0558c059574c3d1d6 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4397,7 +4397,8 @@ bool init_service_op_table( void );
 
 void svcctl_init_keys( void );
 struct security_descriptor *svcctl_get_secdesc( TALLOC_CTX *ctx, const char *name, struct security_token *token );
-bool svcctl_set_secdesc( TALLOC_CTX *ctx, const char *name, struct security_descriptor *sec_desc, struct security_token *token );
+bool svcctl_set_secdesc(const char *name, struct security_descriptor *sec_desc,
+                       struct security_token *token);
 const char *svcctl_lookup_dispname(TALLOC_CTX *ctx, const char *name, struct security_token *token );
 const char *svcctl_lookup_description(TALLOC_CTX *ctx, const char *name, struct security_token *token );
 struct regval_ctr *svcctl_fetch_regvalues( const char *name, struct security_token *token );

diff --git a/source3/rpc_server/srv_svcctl_nt.c b/source3/rpc_server/srv_svcctl_nt.c
index e55978c660c72e93d1afcc2eefaef74dbc29e82c..74f9d813beb43c41889be258a4ab6c349a8ebd3d 100644 (file)
--- a/source3/rpc_server/srv_svcctl_nt.c
+++ b/source3/rpc_server/srv_svcctl_nt.c
@@ -956,8 +956,7 @@ WERROR _svcctl_SetServiceObjectSecurity(struct pipes_struct *p,
 
        /* store the new SD */
 
-       if ( !svcctl_set_secdesc( p->mem_ctx, info->name, sec_desc,
-                                 p->server_info->ptok) )
+       if (!svcctl_set_secdesc(info->name, sec_desc, p->server_info->ptok))
                return WERR_ACCESS_DENIED;
 
        return WERR_OK;

diff --git a/source3/services/services_db.c b/source3/services/services_db.c
index 50e54b6524008e32fa8ca7a8f5597e86f3ff463a..baac9d90d5ed86953c85534eaf2a9042a2c35ea5 100644 (file)
--- a/source3/services/services_db.c
+++ b/source3/services/services_db.c
@@ -574,7 +574,8 @@ done:
  Wrapper to make storing a Service sd easier
 ********************************************************************/
 
-bool svcctl_set_secdesc( TALLOC_CTX *ctx, const char *name, struct security_descriptor *sec_desc, struct security_token *token )
+bool svcctl_set_secdesc(const char *name, struct security_descriptor *sec_desc,
+                       struct security_token *token)
 {
        struct registry_key *key = NULL;
        WERROR wresult;