diff options
| author | Michael Adam <obnox@samba.org> | 2010-09-20 03:38:45 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2010-09-21 06:53:30 +0200 |
| commit | 9bfd587358fb58b98dd0fbdd72069430a89cefc7 (patch) | |
| tree | b3d0d6dc4eae6c5a710ca3adbd6b60ea059d96f7 | |
| parent | 91d5446390dc41b43fe18785a765bbd71ff709c2 (diff) | |
| download | samba-9bfd587358fb58b98dd0fbdd72069430a89cefc7.tar.gz samba-9bfd587358fb58b98dd0fbdd72069430a89cefc7.tar.bz2 samba-9bfd587358fb58b98dd0fbdd72069430a89cefc7.zip | |
s3:services_db: remove the TALLOC_CTX argument from svcctl_set_secdesc
| -rw-r--r-- | source3/include/proto.h | 3 | ||||
| -rw-r--r-- | source3/rpc_server/srv_svcctl_nt.c | 3 | ||||
| -rw-r--r-- | source3/services/services_db.c | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index d7b9cb0a93..b076e230f7 100644 --- 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 e55978c660..74f9d813be 100644 --- 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 50e54b6524..baac9d90d5 100644 --- 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; |