summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2010-09-21 08:23:20 +0200
committerMichael Adam <obnox@samba.org>2010-09-21 08:52:06 +0200
commit4696cd6cbe02d93039240f82917582f4e7a91aa9 (patch)
tree70835b4eab1115313f3e70c095acd2fd27af427a
parentb11cc305083844052d0b82560e3a7006b3520f14 (diff)
downloadsamba-4696cd6cbe02d93039240f82917582f4e7a91aa9.tar.gz
samba-4696cd6cbe02d93039240f82917582f4e7a91aa9.tar.xz
samba-4696cd6cbe02d93039240f82917582f4e7a91aa9.zip
s3:registry: move reg_api_regf prototypes to their own header file.
These two calls are currently only used in the WINREG rpc server. And this reqires linking in the regfio code.
-rw-r--r--source3/include/registry.h5
-rw-r--r--source3/registry/reg_api_regf.c1
-rw-r--r--source3/registry/reg_api_regf.h35
-rw-r--r--source3/rpc_server/srv_winreg_nt.c1
4 files changed, 37 insertions, 5 deletions
diff --git a/source3/include/registry.h b/source3/include/registry.h
index 3a8a7aaabfb..09a8333eb35 100644
--- a/source3/include/registry.h
+++ b/source3/include/registry.h
@@ -130,11 +130,6 @@ struct registry_key {
#define REG_KEY_HKPT 2
-/* The following definitions come from registry/reg_api_regf.c */
-
-WERROR reg_restorekey(struct registry_key *key, const char *fname);
-WERROR reg_savekey(struct registry_key *key, const char *fname);
-
/* The following definitions come from registry/reg_init_basic.c */
WERROR registry_init_common(void);
diff --git a/source3/registry/reg_api_regf.c b/source3/registry/reg_api_regf.c
index 8f249b5aa74..394e31afcfa 100644
--- a/source3/registry/reg_api_regf.c
+++ b/source3/registry/reg_api_regf.c
@@ -20,6 +20,7 @@
#include "includes.h"
#include "registry.h"
+#include "reg_api_regf.h"
#include "reg_cachehook.h"
#include "regfio.h"
#include "reg_util_internal.h"
diff --git a/source3/registry/reg_api_regf.h b/source3/registry/reg_api_regf.h
new file mode 100644
index 00000000000..c68261fa95f
--- /dev/null
+++ b/source3/registry/reg_api_regf.h
@@ -0,0 +1,35 @@
+/*
+ * Unix SMB/CIFS implementation.
+ *
+ * Virtual Windows Registry Layer
+ *
+ * Copyright (C) Volker Lendecke 2006
+ * Copyright (C) Michael Adam 2007-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/>.
+ */
+
+/*
+ * Portion of reg_api that references regfio.c code.
+ * These are the savekey and restorekey calls.
+ * These calls are currently only used in the WINREG rpc server.
+ */
+
+#ifndef _REG_API_REGF_H
+#define _REG_API_REGF_H
+
+WERROR reg_restorekey(struct registry_key *key, const char *fname);
+WERROR reg_savekey(struct registry_key *key, const char *fname);
+
+#endif /* _REG_API_REGF_H */
diff --git a/source3/rpc_server/srv_winreg_nt.c b/source3/rpc_server/srv_winreg_nt.c
index fbcf76d53b8..298f33ab705 100644
--- a/source3/rpc_server/srv_winreg_nt.c
+++ b/source3/rpc_server/srv_winreg_nt.c
@@ -25,6 +25,7 @@
#include "registry/reg_parse_prs.h"
#include "registry.h"
#include "registry/reg_api.h"
+#include "registry/reg_api_regf.h"
#include "registry/reg_perfcount.h"
#include "rpc_misc.h"