summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2010-09-21 08:50:54 +0200
committerMichael Adam <obnox@samba.org>2010-09-21 08:52:06 +0200
commita35daebaf1d0201077fe57f78350804c2e4fde50 (patch)
tree767cdd8e88050baf5a09513385814c8aa0d2d4fa
parentd25b2adf34a86c8abd0129304143f72dd6a9807c (diff)
downloadsamba-a35daebaf1d0201077fe57f78350804c2e4fde50.tar.gz
samba-a35daebaf1d0201077fe57f78350804c2e4fde50.tar.bz2
samba-a35daebaf1d0201077fe57f78350804c2e4fde50.zip
s3:registry: move prototype from reg_init_smbconf.c to its own header.
-rw-r--r--source3/include/registry.h5
-rw-r--r--source3/lib/smbconf/smbconf_reg.c1
-rw-r--r--source3/registry/reg_init_smbconf.c1
-rw-r--r--source3/registry/reg_init_smbconf.h27
4 files changed, 29 insertions, 5 deletions
diff --git a/source3/include/registry.h b/source3/include/registry.h
index 99990eca98..c87b89af7b 100644
--- a/source3/include/registry.h
+++ b/source3/include/registry.h
@@ -129,9 +129,4 @@ struct registry_key {
#define REG_KEY_HKPD 1
#define REG_KEY_HKPT 2
-
-/* The following definitions come from registry/reg_init_smbconf.c */
-
-WERROR registry_init_smbconf(const char *keyname);
-
#endif /* _REGISTRY_H */
diff --git a/source3/lib/smbconf/smbconf_reg.c b/source3/lib/smbconf/smbconf_reg.c
index f6d6bd7104..11affd9479 100644
--- a/source3/lib/smbconf/smbconf_reg.c
+++ b/source3/lib/smbconf/smbconf_reg.c
@@ -24,6 +24,7 @@
#include "registry/reg_backend_db.h"
#include "registry/reg_util_token.h"
#include "registry/reg_api_util.h"
+#include "registry/reg_init_smbconf.h"
#include "lib/smbconf/smbconf_init.h"
#include "lib/smbconf/smbconf_reg.h"
diff --git a/source3/registry/reg_init_smbconf.c b/source3/registry/reg_init_smbconf.c
index e2024df8b5..18ee455bfd 100644
--- a/source3/registry/reg_init_smbconf.c
+++ b/source3/registry/reg_init_smbconf.c
@@ -22,6 +22,7 @@
#include "reg_cachehook.h"
#include "reg_backend_db.h"
#include "reg_init_basic.h"
+#include "reg_init_smbconf.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/registry/reg_init_smbconf.h b/source3/registry/reg_init_smbconf.h
new file mode 100644
index 0000000000..480d7af6c2
--- /dev/null
+++ b/source3/registry/reg_init_smbconf.h
@@ -0,0 +1,27 @@
+/*
+ * 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_INIT_SMBCONF_H
+#define _REG_INIT_SMBCONF_H
+
+WERROR registry_init_smbconf(const char *keyname);
+
+#endif /* _REG_INIT_SMBCONF_H */