summaryrefslogtreecommitdiff
path: root/source3/lib/smbconf
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-03-20 12:25:44 +0100
committerMichael Adam <obnox@samba.org>2008-03-21 02:25:56 +0100
commitf12b10566df44df3c86b59c0cff80b52534558b3 (patch)
treeae5eef7bbf220039226610b553f458740f17be44 /source3/lib/smbconf
parentd19e308a146e10f1673a7e6fc36e5303b9d02ac7 (diff)
downloadsamba-f12b10566df44df3c86b59c0cff80b52534558b3.tar.gz
samba-f12b10566df44df3c86b59c0cff80b52534558b3.tar.bz2
samba-f12b10566df44df3c86b59c0cff80b52534558b3.zip
libsmbconf: move smbconf_reg_initialize() down to the smbconf operations.
Michael (This used to be commit f2d605006cd1187f70a044c3356d436e91093d5f)
Diffstat (limited to 'source3/lib/smbconf')
-rw-r--r--source3/lib/smbconf/smbconf.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/source3/lib/smbconf/smbconf.c b/source3/lib/smbconf/smbconf.c
index bd3d551d69..ba20316b57 100644
--- a/source3/lib/smbconf/smbconf.c
+++ b/source3/lib/smbconf/smbconf.c
@@ -57,26 +57,6 @@ static WERROR smbconf_add_string_to_array(TALLOC_CTX *mem_ctx,
return WERR_OK;
}
-static WERROR smbconf_reg_initialize(struct smbconf_ctx *ctx)
-{
- WERROR werr = WERR_OK;
-
- if (!registry_init_smbconf()) {
- werr = WERR_REG_IO_FAILURE;
- goto done;
- }
-
- werr = ntstatus_to_werror(registry_create_admin_token(ctx,
- &(ctx->token)));
- if (!W_ERROR_IS_OK(werr)) {
- DEBUG(1, ("Error creating admin token\n"));
- goto done;
- }
-
-done:
- return werr;
-}
-
/**
* Open a registry key specified by "path"
*/
@@ -433,6 +413,26 @@ static WERROR smbconf_global_check(struct smbconf_ctx *ctx)
*
**********************************************************************/
+static WERROR smbconf_reg_initialize(struct smbconf_ctx *ctx)
+{
+ WERROR werr = WERR_OK;
+
+ if (!registry_init_smbconf()) {
+ werr = WERR_REG_IO_FAILURE;
+ goto done;
+ }
+
+ werr = ntstatus_to_werror(registry_create_admin_token(ctx,
+ &(ctx->token)));
+ if (!W_ERROR_IS_OK(werr)) {
+ DEBUG(1, ("Error creating admin token\n"));
+ goto done;
+ }
+
+done:
+ return werr;
+}
+
/**
* Get the change sequence number of the given service/parameter.
* service and parameter strings may be NULL.