s3:registry: extract the reg_util_legacy prototypes into their own header.

And use them only where necessary.

4 files changed, 47 insertions, 8 deletions

diff --git a/source3/include/registry.h b/source3/include/registry.h
index 812c3ec6cb..8c784e1f16 100644
--- a/source3/include/registry.h
+++ b/source3/include/registry.h
@@ -161,14 +161,6 @@ char *normalize_reg_path(TALLOC_CTX *ctx, const char *keyname );
 void normalize_dbkey(char *key);
 char *reg_remaining_path(TALLOC_CTX *ctx, const char *key);
 
-/* The following definitions come from registry/reg_util_legacy.c  */
-
-WERROR regkey_open_internal(TALLOC_CTX *ctx,
-			    struct registry_key_handle **regkey,
-			    const char *path,
-			    const struct nt_user_token *token,
-			    uint32 access_desired );
-
 /* The following definitions come from registry/regfio.c  */
 
 /* The following definitions come from lib/util_reg_api.c  */
diff --git a/source3/registry/reg_util_legacy.c b/source3/registry/reg_util_legacy.c
index f8f3764c88..7f2eecc19e 100644
--- a/source3/registry/reg_util_legacy.c
+++ b/source3/registry/reg_util_legacy.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "registry.h"
+#include "reg_util_legacy.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/registry/reg_util_legacy.h b/source3/registry/reg_util_legacy.h
new file mode 100644
index 0000000000..8b330fb0a3
--- /dev/null
+++ b/source3/registry/reg_util_legacy.h
@@ -0,0 +1,45 @@
+/* 
+ *  Unix SMB/CIFS implementation.
+ *  Virtual Windows Registry Layer
+ *  Copyright (C) Gerald Carter                     2002-2005
+ *  Copyright (C) Michael Adam                      2009
+ *
+ *  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_LEGACY_H
+#define _REG_UTIL_LEGACY_H
+
+/*
+ * This module contains legacy code code from the old regkey
+ * interface that is now mostly hidden behind the reg_api interface.
+ * This code should be removed once the last users of the old code
+ * have been converted.
+ */
+
+#include "includes.h"
+#include "registry.h"
+
+/**
+ * legacy open key function that should be replaced by uses of
+ * reg_open_path
+ */
+
+WERROR regkey_open_internal(TALLOC_CTX *ctx,
+			    struct registry_key_handle **regkey,
+			    const char *path,
+			    const struct nt_user_token *token,
+			    uint32 access_desired );
+
+#endif /* _REG_UTIL_LEGACY_H */
diff --git a/source3/services/services_db.c b/source3/services/services_db.c
index daf4f50b77..e0568d6574 100644
--- a/source3/services/services_db.c
+++ b/source3/services/services_db.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "services/services.h"
 #include "registry.h"
+#include "registry/reg_util_legacy.h"
 
 struct rcinit_file_information {
 	char *description;