summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2011-01-28 12:37:18 +0100
committerGünther Deschner <gd@samba.org>2011-02-07 12:32:01 +0100
commit1adbbeef32b71450b6c878ea34b431d19ea39523 (patch)
tree262c2b1d864aa5dec788402610d2fdf844a5a23f /source3
parenta3a38fdb553f978ae58bc0b62db93e1ca2908658 (diff)
downloadsamba-1adbbeef32b71450b6c878ea34b431d19ea39523.tar.gz
samba-1adbbeef32b71450b6c878ea34b431d19ea39523.tar.bz2
samba-1adbbeef32b71450b6c878ea34b431d19ea39523.zip
s3-registry: Remove obsolete reg_eventlog.
Signed-off-by: Günther Deschner <gd@samba.org>
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in4
-rw-r--r--source3/registry/reg_eventlog.c186
-rw-r--r--source3/registry/reg_eventlog.h27
-rw-r--r--source3/registry/reg_init_full.c1
4 files changed, 1 insertions, 217 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index d6753f13a6..ad7690771b 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -655,7 +655,6 @@ REG_SMBCONF_OBJ = $(REG_BASE_OBJ) \
REG_FULL_OBJ = $(REG_SMBCONF_OBJ) \
$(REG_BACKENDS_EXTRA_OBJ) \
$(REG_INIT_FULL_OBJ) \
- registry/reg_eventlog.o \
registry/reg_perfcount.o \
librpc/gen_ndr/ndr_perfcount.o
@@ -1261,8 +1260,7 @@ SMBCQUOTAS_OBJ = utils/smbcquotas.o $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
EVTLOGADM_OBJ0 = utils/eventlogadm.o
EVTLOGADM_OBJ = $(EVTLOGADM_OBJ0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
- $(LIBSMB_ERR_OBJ) \
- registry/reg_eventlog.o $(LIB_EVENTLOG_OBJ) \
+ $(LIBSMB_ERR_OBJ) $(LIB_EVENTLOG_OBJ) \
librpc/gen_ndr/ndr_eventlog.o \
librpc/gen_ndr/ndr_lsa.o
diff --git a/source3/registry/reg_eventlog.c b/source3/registry/reg_eventlog.c
deleted file mode 100644
index 74b3ed43b7..0000000000
--- a/source3/registry/reg_eventlog.c
+++ /dev/null
@@ -1,186 +0,0 @@
-
-/*
- * 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/>.
- */
-
-#include "includes.h"
-#include "registry.h"
-#include "reg_backend_db.h"
-#include "reg_eventlog.h"
-#include "reg_objects.h"
-
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_REGISTRY
-
-/**********************************************************************
- for an eventlog, add in the default values
-*********************************************************************/
-
-bool eventlog_init_keys(void)
-{
- /* Find all of the eventlogs, add keys for each of them */
- const char **elogs = lp_eventlog_list();
- char *evtlogpath = NULL;
- char *evtfilepath = NULL;
- struct regsubkey_ctr *subkeys;
- struct regval_ctr *values;
- uint32 uiMaxSize;
- uint32 uiRetention;
- uint32 uiCategoryCount;
- DATA_BLOB data;
- TALLOC_CTX *ctx = talloc_tos();
- WERROR werr;
-
- while (elogs && *elogs) {
- werr = regsubkey_ctr_init(ctx, &subkeys);
- if (!W_ERROR_IS_OK(werr)) {
- DEBUG( 0, ( "talloc() failure!\n" ) );
- return False;
- }
- regdb_fetch_keys(KEY_EVENTLOG, subkeys);
- regsubkey_ctr_addkey( subkeys, *elogs );
- if ( !regdb_store_keys( KEY_EVENTLOG, subkeys ) ) {
- TALLOC_FREE(subkeys);
- return False;
- }
- TALLOC_FREE(subkeys);
-
- /* add in the key of form KEY_EVENTLOG/Application */
- DEBUG( 5,
- ( "Adding key of [%s] to path of [%s]\n", *elogs,
- KEY_EVENTLOG ) );
-
- evtlogpath = talloc_asprintf(ctx, "%s\\%s",
- KEY_EVENTLOG, *elogs);
- if (!evtlogpath) {
- return false;
- }
- /* add in the key of form KEY_EVENTLOG/Application/Application */
- DEBUG( 5,
- ( "Adding key of [%s] to path of [%s]\n", *elogs,
- evtlogpath ) );
- werr = regsubkey_ctr_init(ctx, &subkeys);
- if (!W_ERROR_IS_OK(werr)) {
- DEBUG( 0, ( "talloc() failure!\n" ) );
- return False;
- }
- regdb_fetch_keys( evtlogpath, subkeys );
- regsubkey_ctr_addkey( subkeys, *elogs );
-
- if ( !regdb_store_keys( evtlogpath, subkeys ) ) {
- TALLOC_FREE(subkeys);
- return False;
- }
- TALLOC_FREE( subkeys );
-
- /* now add the values to the KEY_EVENTLOG/Application form key */
-
- werr = regval_ctr_init(ctx, &values);
- if (!W_ERROR_IS_OK(werr)) {
- DEBUG( 0, ( "talloc() failure!\n" ) );
- return False;
- }
- DEBUG( 5,
- ( "Storing values to eventlog path of [%s]\n",
- evtlogpath ) );
- regdb_fetch_values( evtlogpath, values );
-
-
- if (!regval_ctr_key_exists(values, "MaxSize")) {
-
- /* assume we have none, add them all */
-
- /* hard code some initial values */
-
- /* uiDisplayNameId = 0x00000100; */
- uiMaxSize = 0x00080000;
- uiRetention = 0x93A80;
-
- regval_ctr_addvalue(values, "MaxSize", REG_DWORD,
- (uint8 *)&uiMaxSize,
- sizeof(uint32));
-
- regval_ctr_addvalue(values, "Retention", REG_DWORD,
- (uint8 *)&uiRetention,
- sizeof(uint32));
-
- regval_ctr_addvalue_sz(values, "PrimaryModule", *elogs);
- push_reg_sz(talloc_tos(), &data, *elogs);
-
- regval_ctr_addvalue(values, "Sources", REG_MULTI_SZ,
- data.data,
- data.length);
-
- evtfilepath = talloc_asprintf(ctx,
- "%%SystemRoot%%\\system32\\config\\%s.tdb",
- *elogs);
- if (!evtfilepath) {
- TALLOC_FREE(values);
- }
- push_reg_sz(talloc_tos(), &data, evtfilepath);
- regval_ctr_addvalue(values, "File", REG_EXPAND_SZ, data.data,
- data.length);
- regdb_store_values(evtlogpath, values);
-
- }
-
- TALLOC_FREE(values);
-
- /* now do the values under KEY_EVENTLOG/Application/Application */
- TALLOC_FREE(evtlogpath);
- evtlogpath = talloc_asprintf(ctx, "%s\\%s\\%s",
- KEY_EVENTLOG, *elogs, *elogs);
- if (!evtlogpath) {
- return false;
- }
-
- werr = regval_ctr_init(ctx, &values);
- if (!W_ERROR_IS_OK(werr)) {
- DEBUG( 0, ( "talloc() failure!\n" ) );
- return False;
- }
- DEBUG( 5,
- ( "Storing values to eventlog path of [%s]\n",
- evtlogpath));
- regdb_fetch_values(evtlogpath, values);
- if (!regval_ctr_key_exists( values, "CategoryCount")) {
-
- /* hard code some initial values */
-
- uiCategoryCount = 0x00000007;
- regval_ctr_addvalue( values, "CategoryCount",
- REG_DWORD,
- (uint8 *) &uiCategoryCount,
- sizeof( uint32 ) );
- push_reg_sz(talloc_tos(), &data,
- "%SystemRoot%\\system32\\eventlog.dll");
-
- regval_ctr_addvalue( values, "CategoryMessageFile",
- REG_EXPAND_SZ,
- data.data,
- data.length);
- regdb_store_values( evtlogpath, values );
- }
- TALLOC_FREE(values);
- elogs++;
- }
-
- return true;
-}
diff --git a/source3/registry/reg_eventlog.h b/source3/registry/reg_eventlog.h
deleted file mode 100644
index d4e13c73ee..0000000000
--- a/source3/registry/reg_eventlog.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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);
-
-#endif /* _REG_EVENTLOG_H */
diff --git a/source3/registry/reg_init_full.c b/source3/registry/reg_init_full.c
index dabc9683f3..39ce8f348b 100644
--- a/source3/registry/reg_init_full.c
+++ b/source3/registry/reg_init_full.c
@@ -25,7 +25,6 @@
#include "reg_cachehook.h"
#include "reg_backend_db.h"
#include "reg_perfcount.h"
-#include "reg_eventlog.h"
#include "reg_init_basic.h"
#include "reg_init_full.h"