s3:registry: move registry_create_admin_token() to new reg_util_token.c
authorMichael Adam <obnox@samba.org>
Mon, 24 May 2010 21:27:57 +0000 (23:27 +0200)
committerMichael Adam <obnox@samba.org>
Tue, 25 May 2010 08:35:26 +0000 (10:35 +0200)
source3/Makefile.in
source3/registry/reg_init_smbconf.c
source3/registry/reg_util_token.c [new file with mode: 0644]

index f895374e33902a829bdac61983cf94362ff1fa1a..7acbbbc536b953d5bc1325d31c942d4b7fa4e5ff 100644 (file)
@@ -596,6 +596,7 @@ REG_BASE_OBJ = registry/reg_api.o \
               $(REG_INIT_BASIC_OBJ)
 
 REG_SMBCONF_OBJ = $(REG_BASE_OBJ) \
+                 registry/reg_util_token.o \
                  $(REG_BACKENDS_SMBCONF_OBJ) \
                  $(REG_INIT_SMBCONF_OBJ)
 
index 394de5883d70ddc594a6d2fc464528e0fce700dc..f8110495575b21daa661be7b9dd45661ee3b952b 100644 (file)
 
 extern struct registry_ops smbconf_reg_ops;
 
-/*
- * create a fake token just with enough rights to
- * locally access the registry:
- *
- * - builtin administrators sid
- * - disk operators privilege
- */
-NTSTATUS registry_create_admin_token(TALLOC_CTX *mem_ctx,
-                                    NT_USER_TOKEN **ptoken)
-{
-       NTSTATUS status;
-       NT_USER_TOKEN *token = NULL;
-
-       if (ptoken == NULL) {
-               return NT_STATUS_INVALID_PARAMETER;
-       }
-
-       token = TALLOC_ZERO_P(mem_ctx, NT_USER_TOKEN);
-       if (token == NULL) {
-               DEBUG(1, ("talloc failed\n"));
-               status = NT_STATUS_NO_MEMORY;
-               goto done;
-       }
-       token->privileges = se_disk_operators;
-       status = add_sid_to_array(token, &global_sid_Builtin_Administrators,
-                                 &token->user_sids, &token->num_sids);
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(1, ("Error adding builtin administrators sid "
-                         "to fake token.\n"));
-               goto done;
-       }
-
-       *ptoken = token;
-
-done:
-       return status;
-}
-
 /*
  * init the smbconf portion of the registry.
  * for use in places where not the whole registry is needed,
diff --git a/source3/registry/reg_util_token.c b/source3/registry/reg_util_token.c
new file mode 100644 (file)
index 0000000..08ed4f4
--- /dev/null
@@ -0,0 +1,58 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * Registry helper routines
+ * Copyright (C) Michael Adam 2007
+ * 
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option)
+ * any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ * 
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "includes.h"
+
+/*
+ * create a fake token just with enough rights to
+ * locally access the registry:
+ *
+ * - builtin administrators sid
+ * - disk operators privilege
+ */
+NTSTATUS registry_create_admin_token(TALLOC_CTX *mem_ctx,
+                                    NT_USER_TOKEN **ptoken)
+{
+       NTSTATUS status;
+       NT_USER_TOKEN *token = NULL;
+
+       if (ptoken == NULL) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       token = TALLOC_ZERO_P(mem_ctx, NT_USER_TOKEN);
+       if (token == NULL) {
+               DEBUG(1, ("talloc failed\n"));
+               status = NT_STATUS_NO_MEMORY;
+               goto done;
+       }
+       token->privileges = se_disk_operators;
+       status = add_sid_to_array(token, &global_sid_Builtin_Administrators,
+                                 &token->user_sids, &token->num_sids);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(1, ("Error adding builtin administrators sid "
+                         "to fake token.\n"));
+               goto done;
+       }
+
+       *ptoken = token;
+
+done:
+       return status;
+}