From 5292f1c2f3c419ab2efe9acb935a199a31630006 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 14 Oct 2005 18:38:03 +0000 Subject: r11065: rename wr_eventlog to eventlogadm (This used to be commit 9a63b52efaf0b49982d56dc7c301f59bbb076a6e) --- source3/Makefile.in | 10 +-- source3/utils/eventlogadm.c | 166 ++++++++++++++++++++++++++++++++++++++++++++ source3/utils/wr_eventlog.c | 166 -------------------------------------------- 3 files changed, 171 insertions(+), 171 deletions(-) create mode 100644 source3/utils/eventlogadm.c delete mode 100644 source3/utils/wr_eventlog.c diff --git a/source3/Makefile.in b/source3/Makefile.in index 7664f71bc6..c10f7c3856 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -130,7 +130,7 @@ BIN_PROGS2 = bin/smbcontrol@EXEEXT@ bin/smbtree@EXEEXT@ bin/tdbbackup@EXEEXT@ \ bin/tdbtool@EXEEXT@ BIN_PROGS3 = bin/smbpasswd@EXEEXT@ bin/rpcclient@EXEEXT@ bin/smbcacls@EXEEXT@ \ bin/profiles@EXEEXT@ bin/ntlm_auth@EXEEXT@ \ - bin/smbcquotas@EXEEXT@ bin/wr_eventlog@EXEEXT@ + bin/smbcquotas@EXEEXT@ bin/eventlogadm@EXEEXT@ TORTURE_PROGS = bin/smbtorture@EXEEXT@ bin/msgtest@EXEEXT@ \ bin/masktest@EXEEXT@ bin/locktest@EXEEXT@ \ @@ -614,7 +614,7 @@ SMBCQUOTAS_OBJ = utils/smbcquotas.o $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \ $(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 @@ -753,7 +753,7 @@ debug2html : SHOWFLAGS bin/debug2html@EXEEXT@ smbfilter : SHOWFLAGS bin/smbfilter@EXEEXT@ -wr_eventlog: SHOWFLAGS bin/wr_eventlog@EXEEXT@ +eventlogadm: SHOWFLAGS bin/eventlogadm@EXEEXT@ talloctort : SHOWFLAGS bin/talloctort@EXEEXT@ @@ -764,7 +764,7 @@ wins : SHOWFLAGS @WINBIND_WINS_NSS@ 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: @@ -977,7 +977,7 @@ bin/smbcquotas@EXEEXT@: $(SMBCQUOTAS_OBJ) @BUILD_POPT@ bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) -bin/wr_eventlog@EXEEXT@: $(WR_EVENTLOG_OBJ) @BUILD_POPT@ bin/.dummy +bin/eventlogadm@EXEEXT@: $(WR_EVENTLOG_OBJ) @BUILD_POPT@ bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(WR_EVENTLOG_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ diff --git a/source3/utils/eventlogadm.c b/source3/utils/eventlogadm.c new file mode 100644 index 0000000000..bb3c1bc9bb --- /dev/null +++ b/source3/utils/eventlogadm.c @@ -0,0 +1,166 @@ +/* + * 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] \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( "\n" ); + } + ZERO_STRUCT( ee ); /* MUST initialize between records */ + } + } + + tdb_close( elog_tdb ); + + return 0; +} diff --git a/source3/utils/wr_eventlog.c b/source3/utils/wr_eventlog.c deleted file mode 100644 index bb3c1bc9bb..0000000000 --- a/source3/utils/wr_eventlog.c +++ /dev/null @@ -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] \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( "\n" ); - } - ZERO_STRUCT( ee ); /* MUST initialize between records */ - } - } - - tdb_close( elog_tdb ); - - return 0; -} -- cgit