summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2010-05-24 23:06:27 +0200
committerMichael Adam <obnox@samba.org>2010-05-25 10:35:26 +0200
commit847a19df946432558e75a6f81f0a761407114f45 (patch)
tree2ea662efc3c8448a448964f330a9801d458eab8b
parent5a92d88f38dc9fc65db7e6451eae2d22da04463e (diff)
downloadsamba-847a19df946432558e75a6f81f0a761407114f45.tar.gz
samba-847a19df946432558e75a6f81f0a761407114f45.tar.bz2
samba-847a19df946432558e75a6f81f0a761407114f45.zip
s3:registry: extract reg_eventlog prototypes to header of their own
and use them only where needed.
-rw-r--r--source3/include/registry.h6
-rw-r--r--source3/registry/reg_eventlog.c1
-rw-r--r--source3/registry/reg_eventlog.h29
-rw-r--r--source3/registry/reg_init_full.c1
-rw-r--r--source3/utils/eventlogadm.c1
5 files changed, 32 insertions, 6 deletions
diff --git a/source3/include/registry.h b/source3/include/registry.h
index 3496f13c49..0914ba5486 100644
--- a/source3/include/registry.h
+++ b/source3/include/registry.h
@@ -56,12 +56,6 @@ WERROR reg_create_path(TALLOC_CTX *mem_ctx, const char *orig_path,
WERROR reg_delete_path(const struct nt_user_token *token,
const char *orig_path);
-/* The following definitions come from registry/reg_eventlog.c */
-
-bool eventlog_init_keys(void);
-bool eventlog_add_source( const char *eventlog, const char *sourcename,
- const char *messagefile );
-
/* The following definitions come from registry/reg_init_basic.c */
WERROR registry_init_common(void);
diff --git a/source3/registry/reg_eventlog.c b/source3/registry/reg_eventlog.c
index 43b6bb8968..b2bf69fa51 100644
--- a/source3/registry/reg_eventlog.c
+++ b/source3/registry/reg_eventlog.c
@@ -23,6 +23,7 @@
#include "includes.h"
#include "registry.h"
#include "reg_backend_db.h"
+#include "reg_eventlog.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/registry/reg_eventlog.h b/source3/registry/reg_eventlog.h
new file mode 100644
index 0000000000..69f2f99aad
--- /dev/null
+++ b/source3/registry/reg_eventlog.h
@@ -0,0 +1,29 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * Virtual Windows Registry Layer
+ * Copyright (C) Marcin Krzysztof Porwit 2005,
+ * Copyright (C) Brian Moran 2005.
+ * Copyright (C) Gerald (Jerry) Carter 2005.
+ *
+ * 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_EVENTLOG_H
+#define _REG_EVENTLOG_H
+
+bool eventlog_init_keys(void);
+bool eventlog_add_source( const char *eventlog, const char *sourcename,
+ const char *messagefile );
+
+#endif /* _REG_EVENTLOG_H */
diff --git a/source3/registry/reg_init_full.c b/source3/registry/reg_init_full.c
index a3604e6c38..265fed30ca 100644
--- a/source3/registry/reg_init_full.c
+++ b/source3/registry/reg_init_full.c
@@ -25,6 +25,7 @@
#include "reg_cachehook.h"
#include "reg_backend_db.h"
#include "reg_perfcount.h"
+#include "reg_eventlog.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/utils/eventlogadm.c b/source3/utils/eventlogadm.c
index 7dbcf7d371..15b8d207a2 100644
--- a/source3/utils/eventlogadm.c
+++ b/source3/utils/eventlogadm.c
@@ -26,6 +26,7 @@
#include "lib/eventlog/eventlog.h"
#include "registry.h"
#include "registry/reg_backend_db.h"
+#include "registry/reg_eventlog.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_UTIL_EVENTLOG