svn commit: samba r11064 - in trunk/source: . utils
jerry at samba.org
jerry at samba.org
Fri Oct 14 18:37:14 GMT 2005
Author: jerry
Date: 2005-10-14 18:37:13 +0000 (Fri, 14 Oct 2005)
New Revision: 11064
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11064
Log:
rename wr_eventlog to eventlogadm
Added:
trunk/source/utils/eventlogadm.c
Removed:
trunk/source/utils/wr_eventlog.c
Modified:
trunk/source/Makefile.in
Changeset:
Modified: trunk/source/Makefile.in
===================================================================
--- trunk/source/Makefile.in 2005-10-14 17:32:37 UTC (rev 11063)
+++ trunk/source/Makefile.in 2005-10-14 18:37:13 UTC (rev 11064)
@@ -130,7 +130,7 @@
bin/tdbtool at EXEEXT@
BIN_PROGS3 = bin/smbpasswd at EXEEXT@ bin/rpcclient at EXEEXT@ bin/smbcacls at EXEEXT@ \
bin/profiles at EXEEXT@ bin/ntlm_auth at EXEEXT@ \
- bin/smbcquotas at EXEEXT@ bin/wr_eventlog at EXEEXT@
+ bin/smbcquotas at EXEEXT@ bin/eventlogadm at EXEEXT@
TORTURE_PROGS = bin/smbtorture at EXEEXT@ bin/msgtest at EXEEXT@ \
bin/masktest at EXEEXT@ bin/locktest at EXEEXT@ \
@@ -616,7 +616,7 @@
$(LIBMSRPC_OBJ) $(SECRETS_OBJ) $(POPT_LIB_OBJ) \
$(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ)
-WR_EVENTLOG_OBJ = utils/wr_eventlog.o rpc_server/srv_eventlog_lib.o \
+WR_EVENTLOG_OBJ = utils/eventlogadm.o rpc_server/srv_eventlog_lib.o \
$(PARAM_OBJ) $(LIB_NONSMBD_OBJ)
TALLOCTORT_OBJ = lib/talloctort.o $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) libsmb/nterr.o
@@ -757,7 +757,7 @@
smbfilter : SHOWFLAGS bin/smbfilter at EXEEXT@
-wr_eventlog: SHOWFLAGS bin/wr_eventlog at EXEEXT@
+eventlogadm: SHOWFLAGS bin/eventlogadm at EXEEXT@
talloctort : SHOWFLAGS bin/talloctort at EXEEXT@
@@ -768,7 +768,7 @@
modules: SHOWFLAGS proto_exists $(MODULES)
-everything: all libsmbclient debug2html smbfilter talloctort modules torture wr_eventlog \
+everything: all libsmbclient debug2html smbfilter talloctort modules torture eventlogadm \
$(EVERYTHING_PROGS)
.SUFFIXES:
@@ -981,7 +981,7 @@
@echo Linking $@
@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
-bin/wr_eventlog at EXEEXT@: $(WR_EVENTLOG_OBJ) @BUILD_POPT@ bin/.dummy
+bin/eventlogadm at EXEEXT@: $(WR_EVENTLOG_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(WR_EVENTLOG_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@
Copied: trunk/source/utils/eventlogadm.c (from rev 11060, trunk/source/utils/wr_eventlog.c)
Deleted: trunk/source/utils/wr_eventlog.c
===================================================================
--- trunk/source/utils/wr_eventlog.c 2005-10-14 17:32:37 UTC (rev 11063)
+++ trunk/source/utils/wr_eventlog.c 2005-10-14 18:37:13 UTC (rev 11064)
@@ -1,166 +0,0 @@
-/*
- * Samba Unix/Linux SMB client utility
- * Write Eventlog records to a tdb
- *
- * Copyright (C) Brian Moran 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 2 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, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-
-#include "includes.h"
-
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_UTIL_EVENTLOG
-
-Eventlog_entry ee;
-
-extern int optind;
-extern char *optarg;
-
-int opt_debug = 0;
-
-static void usage( char *s )
-{
- printf( "\nUsage: %s [-d] [-h] <Eventlog Name>\n", s );
- printf( "\t-d\tturn debug on\n" );
- printf( "\t-h\tdisplay help\n\n" );
-}
-
-static void display_eventlog_names( void )
-{
- const char **elogs;
- int i;
-
- elogs = lp_eventlog_list( );
- printf( "Active eventlog names (from smb.conf):\n" );
- printf( "--------------------------------------\n" );
- for ( i = 0; elogs[i]; i++ ) {
- printf( "\t%s\n", elogs[i] );
- }
-}
-
-int main( int argc, char *argv[] )
-{
- FILE *f1;
-
- /* fixed constants are bad bad bad */
- pstring linein;
- BOOL is_eor;
- int pret, opt;
- int rcnum;
- char *argfname, *exename;
- char *tdbname;
-
-
- TDB_CONTEXT *elog_tdb;
-
- opt_debug = 0; /* todo set this from getopts */
-
-
- lp_load( dyn_CONFIGFILE, True, False, False );
-
- exename = argv[0];
-
- while ( ( opt = getopt( argc, argv, "dh" ) ) != -1 ) {
- switch ( opt ) {
- case 'h':
- usage( argv[0] );
- display_eventlog_names( );
- exit( 0 );
- break;
-
- case 'd':
- opt_debug = 1;
- break;
- }
- }
-
- argc -= optind;
- argv += optind;
-
- if ( argc < 1 ) {
- usage( exename );
- exit( 1 );
- }
-
-
-
- f1 = stdin;
-
- if ( !f1 ) {
- printf( "Can't open STDIN\n" );
- return -1;
- }
-
-
- if ( opt_debug ) {
- printf( "Starting %s for eventlog [%s]\n", exename, argv[0] );
- display_eventlog_names( );
- }
-
- argfname = argv[0];
-
- if ( !(elog_tdb = elog_open_tdb( argfname ) ) ) {
- printf( "can't open the eventlog TDB (%s)\n", tdbname );
- return -1;
- }
-
- ZERO_STRUCT( ee ); /* MUST initialize between records */
-
- while ( !feof( f1 ) ) {
- fgets( linein, sizeof( linein ) - 1, f1 );
- linein[strlen( linein ) - 1] = 0; /* whack the line delimiter */
-
- if ( opt_debug )
- printf( "Read line [%s]\n", linein );
-
- is_eor = False;
-
- pret = parse_logentry( ( char * ) &linein, &ee, &is_eor );
-
- if ( is_eor ) {
- fixup_eventlog_entry( &ee );
-
- if ( opt_debug )
- printf( "record number [%d], tg [%d] , tw [%d]\n",
- ee.record.record_number,
- ee.record.time_generated,
- ee.record.time_written );
-
- if ( ee.record.time_generated != 0 ) {
-
- /* printf("Writing to the event log\n"); */
-
- rcnum = write_eventlog_tdb( elog_tdb, &ee );
- if ( !rcnum ) {
- printf( "Can't write to the event log\n" );
- } else {
- if ( opt_debug )
- printf( "Wrote record %d\n",
- rcnum );
- }
- } else {
- if ( opt_debug )
- printf( "<null record>\n" );
- }
- ZERO_STRUCT( ee ); /* MUST initialize between records */
- }
- }
-
- tdb_close( elog_tdb );
-
- return 0;
-}
More information about the samba-cvs
mailing list