diff -ur a/Makefile.linux b/Makefile.linux --- a/Makefile.linux 2008-02-21 10:20:29.000000000 +0300 +++ b/Makefile.linux 2010-08-30 23:46:54.000000000 +0400 @@ -1,14 +1,15 @@ ### $RISS: trafd/Makefile.linux,v 1.3 2005/08/30 08:16:27 frol Exp $ PREFIX= /usr/local +BINDIR= ${PREFIX}/sbin TRAFDDIR= /var/trafd ETCDIR= ${PREFIX}/etc MANDIR= ${PREFIX}/man TRAFSTAT_PORT= 150 -TRAFD_USER= trafd -TRAFD_GROUP= trafd -TRAFD_UID= 150 -TRAFD_GID= 150 +TRAFD_USER= nobody +TRAFD_GROUP= nobody +#TRAFD_UID= 150 +#TRAFD_GID= 150 TRAFD_MAX_TO_SAVE= 104800 DEFINES+= -DPREFIX=\"${PREFIX}\" \ @@ -20,6 +21,7 @@ -DMAX_TO_SAVE=${TRAFD_MAX_TO_SAVE} COMMON_SUB+= PREFIX=${PREFIX} \ + BINDIR=${BINDIR} \ TRAFDDIR=${TRAFDDIR} \ ETCDIR=${ETCDIR} \ TRAFSTAT_PORT=${TRAFSTAT_PORT} \ @@ -28,7 +30,9 @@ SUBDIRS?= lib trafd traflog trafstat trafstatd trafslice trafctl \ trafrev trafdb -CFLAGS+= -Wall -O -pipe + +CFLAGS = $(CCARGS) +CFLAGS+= -Wall CFLAGS+= -D_BSD_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 CFLAGS+= -DRETSIGTYPE=void -DRETSIGVAL= -DHAVE_FCNTL_H @@ -83,25 +87,21 @@ if test "$$?" -ne "0"; then exit 1; fi; \ done; -install: all install-createuser install-dirs - -install-createuser: adduser.sh - sh adduser.sh ${TRAFD_USER} ${TRAFD_GROUP} ${TRAFD_UID} ${TRAFD_GID} \ - ${TRAFDDIR} +install: all install-dirs install-dirs: - @for dir in ${DESTDIR}${PREFIX} ${DESTDIR}${PREFIX}/bin \ + @for dir in ${DESTDIR}${PREFIX} ${DESTDIR}${BINDIR} \ ${DESTDIR}${ETCDIR} ${DESTDIR}${MANDIR}; do \ if [ ! -d $$dir ]; then \ - echo ${INSTALL_DIR} $$dir; \ - ${INSTALL_DIR} $$dir; \ + echo "mkdir -p $$dir"; \ + mkdir -p $$dir; \ fi; \ done @for dir in ${DESTDIR}${TRAFDDIR} ${DESTDIR}${TRAFDDIR}/tmp \ ${DESTDIR}${TRAFDDIR}/run; do \ if [ ! -d $$dir ]; then \ - echo ${INSTALL} -d -o ${TRAFD_USER} -g ${TRAFD_GROUP} -m 0750 $$dir; \ - ${INSTALL} -d -o ${TRAFD_USER} -g ${TRAFD_GROUP} -m 0750 $$dir; \ + echo "mkdir -p $$dir"; \ + mkdir -p $$dir; \ fi; \ done diff -ur a/include/pathnames.h b/include/pathnames.h --- a/include/pathnames.h 2004-11-17 12:06:31.000000000 +0300 +++ b/include/pathnames.h 2010-08-30 23:46:54.000000000 +0400 @@ -49,7 +49,7 @@ /* where locate trafstat */ #ifndef PATH_TRAFSTAT -#define PATH_TRAFSTAT PREFIX "/bin/trafstat" +#define PATH_TRAFSTAT PREFIX "/sbin/trafstat" #endif /* where locate trafstat.log */ diff -ur a/trafctl/trafctl.conf-sample.in b/trafctl/trafctl.conf-sample.in --- a/trafctl/trafctl.conf-sample.in 2006-04-17 14:15:21.000000000 +0400 +++ b/trafctl/trafctl.conf-sample.in 2010-08-30 23:46:54.000000000 +0400 @@ -12,8 +12,8 @@ #rotate_savefile_prefix="%%TRAFDDIR%%/trafd." ### number of savefiles to keep when rotating #rotate_num=5 -#trafd_program="%%PREFIX%%/bin/trafd" -#trafslice_program="%%PREFIX%%/bin/trafslice" +#trafd_program="%%BINDIR%%/trafd" +#trafslice_program="%%BINDIR%%/trafslice" ### don't put interfaces into promisc mode, restore on start, ### change credentials to those of user "%%TRAFD_USER%%" #trafd_flags="-p -r -u %%TRAFD_USER%% -g %%TRAFD_GROUP%% -C" diff -ur a/trafctl/trafctl.in b/trafctl/trafctl.in --- a/trafctl/trafctl.in 2006-04-17 14:15:21.000000000 +0400 +++ b/trafctl/trafctl.in 2010-08-30 23:46:54.000000000 +0400 @@ -21,7 +21,7 @@ [ -z "$CONFIG_FILE" ] && CONFIG_FILE="%%ETCDIR%%/trafctl.conf" PATH="/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:%%PREFIX%%/sbin:%%PREFIX%%/bin" -PREFIX="%%PREFIX%%" +BINDIR="%%BINDIR%%" TRAFDDIR="%%TRAFDDIR%%" ME="`basename $0`" @@ -32,10 +32,10 @@ STATS_SIGNAL="-INFO" ### defaults -trafd_program="$PREFIX/bin/trafd" +trafd_program="$BINDIR/trafd" trafd_flags="-p -r -u %%TRAFD_USER%% -g %%TRAFD_GROUP%% -C" -trafslice_program="$PREFIX/bin/trafslice" -traflog_programm="$PREFIX/bin/traflog" +trafslice_program="$BINDIR/trafslice" +traflog_programm="$BINDIR/traflog" trafd_save_prefix="$TRAFDDIR/trafd." trafd_pid_prefix="$TRAFDDIR/run/trafd." trafd_sock_prefix="$TRAFDDIR/tmp/trafd." @@ -111,7 +111,7 @@ >>$logfile else ### log to syslog - logger -p user.info -t "$ME[$$]" "$*" + logger -p local0.info -t "$ME[$$]" "$*" fi } @@ -160,6 +160,7 @@ local ifname expr flags trafd_cmd rc=0 if trafd_running "$1"; then log "($1) trafd is already running" + rc=1 else ifname="`echo $1 | sed 's/[^a-zA-Z0-9]/_/'`" @@ -198,6 +199,7 @@ log "($1) error sending $STOP_SIGNAL to trafd" else log "($1) trafd is not running on that interface" + rc=1 fi return $rc } @@ -215,6 +217,7 @@ log "($1) error sending $DUMP_SIGNAL to trafd" else log "($1) trafd is not running on that interface" + rc=1 fi return $rc } @@ -232,6 +235,7 @@ log "($1) error sending $SAVE_SIGNAL to trafd" else log "($1) trafd is not running on that interface" + rc=1 fi return $rc } @@ -320,6 +324,7 @@ log "($1) error sending $STATS_SIGNAL to trafd" else log "($1) trafd is not running on that interface" + rc=1 fi return $rc } diff -ur a/trafd/main.c b/trafd/main.c --- a/trafd/main.c 2006-09-27 07:13:37.000000000 +0400 +++ b/trafd/main.c 2010-08-30 23:46:54.000000000 +0400 @@ -213,7 +213,7 @@ else cmdbuf = copy_argv(&argv[optind]); - openlog(program_name, LOG_PID|LOG_CONS, LOG_DAEMON); + openlog(program_name, LOG_PID|LOG_CONS, LOG_LOCAL0); if (device_name == 0) if ((device_name = getenv("IFF_LISTEN")) == NULL) diff -ur a/trafdb/main.c b/trafdb/main.c --- a/trafdb/main.c 2008-02-21 10:20:29.000000000 +0300 +++ b/trafdb/main.c 2010-08-30 23:46:54.000000000 +0400 @@ -32,6 +32,7 @@ * $RISS: trafd/trafdb/main.c,v 1.1 2006/08/31 10:49:19 count Exp $ * */ +#define _XOPEN_SOURCE #include #include diff -ur a/trafstatd/Makefile.linux b/trafstatd/Makefile.linux --- a/trafstatd/Makefile.linux 2004-11-17 12:06:31.000000000 +0300 +++ b/trafstatd/Makefile.linux 2010-08-30 23:46:54.000000000 +0400 @@ -1,9 +1,5 @@ PROG= trafstatd BINDIR= ${PREFIX}/bin -AFTER_INSTALL= install-addservice TOPDIR?= .. include ${TOPDIR}/Makefile.linux - -install-addservice: - sh addservice.sh trafstat ${TRAFSTAT_PORT} ${BINDIR}/trafstatd ${TRAFD_USER} diff -ur a/trafstatd/trafstatd.c b/trafstatd/trafstatd.c --- a/trafstatd/trafstatd.c 2008-02-21 10:20:30.000000000 +0300 +++ b/trafstatd/trafstatd.c 2010-08-30 23:46:54.000000000 +0400 @@ -91,7 +91,7 @@ if (lastp[-1] != '\n') *lastp++ = '\n'; - openlog(program_name, LOG_PID, LOG_DAEMON); + openlog(program_name, LOG_PID|LOG_CONS, LOG_LOCAL0); syslog(LOG_INFO, "%s: %s: %s", inet_ntoa(sin.sin_addr), type, line); closelog(); }