summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2010-05-24 23:27:57 +0200
committerMichael Adam <obnox@samba.org>2010-05-25 10:35:26 +0200
commite3f7fab668c1bf1366257f64a5099cca919ca358 (patch)
treeebb9a392738ad25173fcc4b3447154ce52815e02
parent847a19df946432558e75a6f81f0a761407114f45 (diff)
downloadsamba-e3f7fab668c1bf1366257f64a5099cca919ca358.tar.gz
samba-e3f7fab668c1bf1366257f64a5099cca919ca358.tar.bz2
samba-e3f7fab668c1bf1366257f64a5099cca919ca358.zip
s3:registry: move registry_create_admin_token() to new reg_util_token.c
-rw-r--r--source3/Makefile.in1
-rw-r--r--source3/registry/reg_init_smbconf.c38
-rw-r--r--source3/registry/reg_util_token.c58
3 files changed, 59 insertions, 38 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index f895374e33..7acbbbc536 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -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)
diff --git a/source3/registry/reg_init_smbconf.c b/source3/registry/reg_init_smbconf.c
index 394de5883d..f811049557 100644
--- a/source3/registry/reg_init_smbconf.c
+++ b/source3/registry/reg_init_smbconf.c
@@ -28,44 +28,6 @@
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,
* e.g. utils/net_conf.c and loadparm.c
diff --git a/source3/registry/reg_util_token.c b/source3/registry/reg_util_token.c
new file mode 100644
index 0000000000..08ed4f4311
--- /dev/null
+++ b/source3/registry/reg_util_token.c
@@ -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;
+}