summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2010-09-21 08:45:06 +0200
committerMichael Adam <obnox@samba.org>2010-09-21 08:52:06 +0200
commitd25b2adf34a86c8abd0129304143f72dd6a9807c (patch)
tree1d79e5a084aaf2d15451e21e3b9a7e433ee27165
parent0bd2756b974f171eb837d30309e2a46915edd861 (diff)
downloadsamba-d25b2adf34a86c8abd0129304143f72dd6a9807c.tar.gz
samba-d25b2adf34a86c8abd0129304143f72dd6a9807c.tar.bz2
samba-d25b2adf34a86c8abd0129304143f72dd6a9807c.zip
s3:registry: move prototype from reg_init_full.c to its own header.
-rw-r--r--source3/include/registry.h4
-rw-r--r--source3/registry/reg_init_full.c1
-rw-r--r--source3/registry/reg_init_full.h27
-rw-r--r--source3/smbd/server.c1
4 files changed, 29 insertions, 4 deletions
diff --git a/source3/include/registry.h b/source3/include/registry.h
index 03b4a5c3cc..99990eca98 100644
--- a/source3/include/registry.h
+++ b/source3/include/registry.h
@@ -130,10 +130,6 @@ struct registry_key {
#define REG_KEY_HKPT 2
-/* The following definitions come from registry/reg_init_full.c */
-
-WERROR registry_init_full(void);
-
/* The following definitions come from registry/reg_init_smbconf.c */
WERROR registry_init_smbconf(const char *keyname);
diff --git a/source3/registry/reg_init_full.c b/source3/registry/reg_init_full.c
index e17bc413c2..fca07b1693 100644
--- a/source3/registry/reg_init_full.c
+++ b/source3/registry/reg_init_full.c
@@ -27,6 +27,7 @@
#include "reg_perfcount.h"
#include "reg_eventlog.h"
#include "reg_init_basic.h"
+#include "reg_init_full.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/registry/reg_init_full.h b/source3/registry/reg_init_full.h
new file mode 100644
index 0000000000..8ba327e504
--- /dev/null
+++ b/source3/registry/reg_init_full.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_FULL_H
+#define _REG_INIT_FULL_H
+
+WERROR registry_init_full(void);
+
+#endif /* _REG_INIT_FULL_H */
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index e2edaf3a3c..8a55f933f7 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -26,6 +26,7 @@
#include "smbd/globals.h"
#include "librpc/gen_ndr/messaging.h"
#include "registry.h"
+#include "registry/reg_init_full.h"
#include "libcli/auth/schannel.h"
#include "secrets.h"
#include "memcache.h"