From f3053739b7e62e4749821bf2283d67ec379b1abc Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Mon, 24 May 2010 23:37:09 +0200
Subject: [PATCH] s3:registry: move prototype registry_create_admin_token() to
 new header reg_util_token.h

and use it only where necessary.
---
 source3/include/registry.h        |  2 --
 source3/lib/smbconf/smbconf_reg.c |  1 +
 source3/registry/reg_util_token.c |  1 +
 source3/registry/reg_util_token.h | 26 ++++++++++++++++++++++++++
 source3/utils/net_registry.c      |  1 +
 5 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 source3/registry/reg_util_token.h

diff --git a/source3/include/registry.h b/source3/include/registry.h
index 0914ba54866..33234037d7b 100644
--- a/source3/include/registry.h
+++ b/source3/include/registry.h
@@ -67,8 +67,6 @@ WERROR registry_init_full(void);
 
 /* The following definitions come from registry/reg_init_smbconf.c  */
 
-NTSTATUS registry_create_admin_token(TALLOC_CTX *mem_ctx,
-				     NT_USER_TOKEN **ptoken);
 WERROR registry_init_smbconf(const char *keyname);
 
 /* The following definitions come from lib/util_reg_api.c  */
diff --git a/source3/lib/smbconf/smbconf_reg.c b/source3/lib/smbconf/smbconf_reg.c
index f6602676e21..4aa3c09defe 100644
--- a/source3/lib/smbconf/smbconf_reg.c
+++ b/source3/lib/smbconf/smbconf_reg.c
@@ -21,6 +21,7 @@
 #include "lib/smbconf/smbconf_private.h"
 #include "registry.h"
 #include "registry/reg_backend_db.h"
+#include "registry/reg_util_token.h"
 #include "lib/smbconf/smbconf_init.h"
 #include "lib/smbconf/smbconf_reg.h"
 
diff --git a/source3/registry/reg_util_token.c b/source3/registry/reg_util_token.c
index 08ed4f4311b..f218dfa472b 100644
--- a/source3/registry/reg_util_token.c
+++ b/source3/registry/reg_util_token.c
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "reg_util_token.h"
 
 /*
  * create a fake token just with enough rights to
diff --git a/source3/registry/reg_util_token.h b/source3/registry/reg_util_token.h
new file mode 100644
index 00000000000..80cec49fcc8
--- /dev/null
+++ b/source3/registry/reg_util_token.h
@@ -0,0 +1,26 @@
+/*
+ * 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/>.
+ */
+
+#ifndef _REG_UTIL_TOKEN_H
+#define _REG_UTIL_TOKEN_H
+
+NTSTATUS registry_create_admin_token(TALLOC_CTX *mem_ctx,
+				     NT_USER_TOKEN **ptoken);
+
+#endif /* _REG_UTIL_TOKEN_H */
diff --git a/source3/utils/net_registry.c b/source3/utils/net_registry.c
index 0c3aea0f4af..53cce123606 100644
--- a/source3/utils/net_registry.c
+++ b/source3/utils/net_registry.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "registry.h"
+#include "registry/reg_util_token.h"
 #include "utils/net.h"
 #include "utils/net_registry_util.h"
 #include "include/g_lock.h"
-- 
2.34.1