summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2010-05-23 15:25:00 +0200
committerMichael Adam <obnox@samba.org>2010-05-25 10:35:24 +0200
commit14a025062ee2923aac4f9e57c05a9004ddf55856 (patch)
treeed8d14194d03dd2d784144cd873bc348565aed35 /source3
parent9c5d7c789664d15017a837ad735b79e3b0ea4479 (diff)
downloadsamba-14a025062ee2923aac4f9e57c05a9004ddf55856.tar.gz
samba-14a025062ee2923aac4f9e57c05a9004ddf55856.tar.bz2
samba-14a025062ee2923aac4f9e57c05a9004ddf55856.zip
s3:registry: extract the reg_cachehook prototypes into their own header.
And use them only where necessary.
Diffstat (limited to 'source3')
-rw-r--r--source3/include/registry.h8
-rw-r--r--source3/registry/reg_api.c1
-rw-r--r--source3/registry/reg_cachehook.c1
-rw-r--r--source3/registry/reg_cachehook.h29
-rw-r--r--source3/registry/reg_init_basic.c1
-rw-r--r--source3/registry/reg_init_full.c1
-rw-r--r--source3/registry/reg_init_smbconf.c1
7 files changed, 34 insertions, 8 deletions
diff --git a/source3/include/registry.h b/source3/include/registry.h
index bb58b402fa..812c3ec6cb 100644
--- a/source3/include/registry.h
+++ b/source3/include/registry.h
@@ -100,14 +100,6 @@ bool regdb_values_need_update(struct regval_ctr *values);
/* The following definitions come from registry/reg_backend_tcpip_params.c */
-
-/* The following definitions come from registry/reg_cachehook.c */
-
-WERROR reghook_cache_init(void);
-WERROR reghook_cache_add(const char *keyname, struct registry_ops *ops);
-struct registry_ops *reghook_cache_find(const char *keyname);
-void reghook_dump_cache( int debuglevel );
-
/* The following definitions come from registry/reg_dispatcher.c */
bool store_reg_keys(struct registry_key_handle *key,
diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c
index 0f130516c4..744428e80b 100644
--- a/source3/registry/reg_api.c
+++ b/source3/registry/reg_api.c
@@ -64,6 +64,7 @@
#include "includes.h"
#include "registry.h"
+#include "reg_cachehook.h"
#include "regfio.h"
#undef DBGC_CLASS
diff --git a/source3/registry/reg_cachehook.c b/source3/registry/reg_cachehook.c
index a5c4c62948..6b00ab4aa1 100644
--- a/source3/registry/reg_cachehook.c
+++ b/source3/registry/reg_cachehook.c
@@ -23,6 +23,7 @@
#include "includes.h"
#include "adt_tree.h"
#include "registry.h"
+#include "reg_cachehook.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/registry/reg_cachehook.h b/source3/registry/reg_cachehook.h
new file mode 100644
index 0000000000..7c901c0df4
--- /dev/null
+++ b/source3/registry/reg_cachehook.h
@@ -0,0 +1,29 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * Virtual Windows Registry Layer
+ * Copyright (C) Gerald Carter 2002.
+ * Copyright (C) Michael Adam 2008
+ *
+ * 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_CACHEHOOK_H
+#define _REG_CACHEHOOK_H
+
+WERROR reghook_cache_init(void);
+WERROR reghook_cache_add(const char *keyname, struct registry_ops *ops);
+struct registry_ops *reghook_cache_find(const char *keyname);
+void reghook_dump_cache( int debuglevel );
+
+#endif /* _REG_CACHEHOOK_H */
diff --git a/source3/registry/reg_init_basic.c b/source3/registry/reg_init_basic.c
index 4958df22a0..0ad98a6265 100644
--- a/source3/registry/reg_init_basic.c
+++ b/source3/registry/reg_init_basic.c
@@ -19,6 +19,7 @@
#include "includes.h"
#include "registry.h"
+#include "reg_cachehook.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/registry/reg_init_full.c b/source3/registry/reg_init_full.c
index fd4026dc96..f211112ce3 100644
--- a/source3/registry/reg_init_full.c
+++ b/source3/registry/reg_init_full.c
@@ -22,6 +22,7 @@
#include "includes.h"
#include "registry.h"
+#include "reg_cachehook.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/registry/reg_init_smbconf.c b/source3/registry/reg_init_smbconf.c
index 632ac3b534..6ba0e47c49 100644
--- a/source3/registry/reg_init_smbconf.c
+++ b/source3/registry/reg_init_smbconf.c
@@ -19,6 +19,7 @@
#include "includes.h"
#include "registry.h"
+#include "reg_cachehook.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_REGISTRY