summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2011-02-01 11:49:33 +0100
committerGünther Deschner <gd@samba.org>2011-02-07 12:32:01 +0100
commit09dafc4a256c14db6ca8ed68b99d774e118f7051 (patch)
tree22b30023522df3982cd548eb78d8b7b395a5028a
parent96565db5f66f791968ed354fc8f39464ff0a7e5a (diff)
downloadsamba-09dafc4a256c14db6ca8ed68b99d774e118f7051.tar.gz
samba-09dafc4a256c14db6ca8ed68b99d774e118f7051.tar.bz2
samba-09dafc4a256c14db6ca8ed68b99d774e118f7051.zip
s3-rpc_server: Added a svcctl shutdown function.
Signed-off-by: Günther Deschner <gd@samba.org>
-rw-r--r--source3/include/proto.h1
-rw-r--r--source3/rpc_server/srv_svcctl_nt.c7
-rw-r--r--source3/services/svc_winreg_glue.c16
3 files changed, 16 insertions, 8 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 4094df7769..ddb5c5e68b 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4372,6 +4372,7 @@ char *valid_share_pathname(TALLOC_CTX *ctx, const char *dos_pathname);
/* The following definitions come from rpc_server/srv_svcctl_nt.c */
bool init_service_op_table( void );
+bool shutdown_service_op_table(void);
/* The following definitions come from rpcclient/cmd_dfs.c */
diff --git a/source3/rpc_server/srv_svcctl_nt.c b/source3/rpc_server/srv_svcctl_nt.c
index cc6cf84eb6..e8e55ca981 100644
--- a/source3/rpc_server/srv_svcctl_nt.c
+++ b/source3/rpc_server/srv_svcctl_nt.c
@@ -106,6 +106,13 @@ bool init_service_op_table( void )
return True;
}
+bool shutdown_service_op_table(void)
+{
+ TALLOC_FREE(svcctl_ops);
+
+ return true;
+}
+
/********************************************************************
********************************************************************/
diff --git a/source3/services/svc_winreg_glue.c b/source3/services/svc_winreg_glue.c
index 2ab9914bcc..2b35556caf 100644
--- a/source3/services/svc_winreg_glue.c
+++ b/source3/services/svc_winreg_glue.c
@@ -106,12 +106,12 @@ struct security_descriptor *svcctl_get_secdesc(TALLOC_CTX *mem_ctx,
&key_hnd,
&result);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("svcctl_set_secdesc: Could not open %s - %s\n",
+ DEBUG(2, ("svcctl_set_secdesc: Could not open %s - %s\n",
key, nt_errstr(status)));
return NULL;
}
if (!W_ERROR_IS_OK(result)) {
- DEBUG(0, ("svcctl_set_secdesc: Could not open %s - %s\n",
+ DEBUG(2, ("svcctl_set_secdesc: Could not open %s - %s\n",
key, win_errstr(result)));
return NULL;
}
@@ -123,14 +123,14 @@ struct security_descriptor *svcctl_get_secdesc(TALLOC_CTX *mem_ctx,
&sd,
&result);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("svcctl_get_secdesc: error getting value 'Security': "
+ DEBUG(2, ("svcctl_get_secdesc: error getting value 'Security': "
"%s\n", nt_errstr(status)));
return NULL;
}
if (W_ERROR_EQUAL(result, WERR_BADFILE)) {
goto fallback_to_default_sd;
} else if (!W_ERROR_IS_OK(result)) {
- DEBUG(0, ("svcctl_get_secdesc: error getting value 'Security': "
+ DEBUG(2, ("svcctl_get_secdesc: error getting value 'Security': "
"%s\n", win_errstr(result)));
return NULL;
}
@@ -221,12 +221,12 @@ bool svcctl_set_secdesc(struct messaging_context *msg_ctx,
&action,
&result);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("svcctl_set_secdesc: Could not create key %s: %s\n",
+ DEBUG(2, ("svcctl_set_secdesc: Could not create key %s: %s\n",
wkey.name, nt_errstr(status)));
goto done;
}
if (!W_ERROR_IS_OK(result)) {
- DEBUG(0, ("svcctl_set_secdesc: Could not create key %s: %s\n",
+ DEBUG(2, ("svcctl_set_secdesc: Could not create key %s: %s\n",
wkey.name, win_errstr(result)));
goto done;
}
@@ -293,12 +293,12 @@ const char *svcctl_get_string_value(TALLOC_CTX *mem_ctx,
&key_hnd,
&result);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("svcctl_get_string_value: Could not open %s - %s\n",
+ DEBUG(2, ("svcctl_get_string_value: Could not open %s - %s\n",
path, nt_errstr(status)));
goto done;
}
if (!W_ERROR_IS_OK(result)) {
- DEBUG(0, ("svcctl_get_string_value: Could not open %s - %s\n",
+ DEBUG(2, ("svcctl_get_string_value: Could not open %s - %s\n",
path, win_errstr(result)));
goto done;
}