diff -C 3 -r tcp_wrappers_7.6/Makefile fixed/tcp_wrappers_7.6/Makefile
*** tcp_wrappers_7.6/Makefile	Fri Mar 21 13:27:21 1997
--- fixed/tcp_wrappers_7.6/Makefile	Sun Apr 15 23:16:18 2001
***************
*** 44,50 ****
  #REAL_DAEMON_DIR=/usr/etc
  #
  # SysV.4 Solaris 2.x OSF AIX
! #REAL_DAEMON_DIR=/usr/sbin
  #
  # BSD 4.4
  #REAL_DAEMON_DIR=/usr/libexec
--- 44,50 ----
  #REAL_DAEMON_DIR=/usr/etc
  #
  # SysV.4 Solaris 2.x OSF AIX
! REAL_DAEMON_DIR=/usr/sbin
  #
  # BSD 4.4
  #REAL_DAEMON_DIR=/usr/libexec
***************
*** 143,150 ****
  
  linux:
  	@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
! 	LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ=setenv.o \
! 	NETGROUP= TLI= EXTRA_CFLAGS="-DBROKEN_SO_LINGER" all
  
  # This is good for many SYSV+BSD hybrids with NIS, probably also for HP-UX 7.x.
  hpux hpux8 hpux9 hpux10:
--- 143,150 ----
  
  linux:
  	@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
! 	LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ= \
! 	NETGROUP= TLI= EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED" all
  
  # This is good for many SYSV+BSD hybrids with NIS, probably also for HP-UX 7.x.
  hpux hpux8 hpux9 hpux10:
***************
*** 472,478 ****
  # If your system supports vsyslog(), comment out the following definition.
  # If in doubt leave it in, it won't harm.
  
! VSYSLOG	= -Dvsyslog=myvsyslog
  
  # End of the system dependencies.
  #################################
--- 472,478 ----
  # If your system supports vsyslog(), comment out the following definition.
  # If in doubt leave it in, it won't harm.
  
! #VSYSLOG	= -Dvsyslog=myvsyslog
  
  # End of the system dependencies.
  #################################
***************
*** 491,497 ****
  # Uncomment the next definition to turn on the language extensions
  # (examples: allow, deny, banners, twist and spawn).
  # 
! #STYLE	= -DPROCESS_OPTIONS	# Enable language extensions.
  
  ################################################################
  # Optional: Changing the default disposition of logfile records
--- 491,497 ----
  # Uncomment the next definition to turn on the language extensions
  # (examples: allow, deny, banners, twist and spawn).
  # 
! STYLE	= -DPROCESS_OPTIONS	# Enable language extensions.
  
  ################################################################
  # Optional: Changing the default disposition of logfile records
***************
*** 514,520 ****
  #
  # The LOG_XXX names below are taken from the /usr/include/syslog.h file.
  
! FACILITY= LOG_MAIL	# LOG_MAIL is what most sendmail daemons use
  
  # The syslog priority at which successful connections are logged.
  
--- 514,520 ----
  #
  # The LOG_XXX names below are taken from the /usr/include/syslog.h file.
  
! FACILITY= LOG_AUTHPRIV	# LOG_MAIL is what most sendmail daemons use
  
  # The syslog priority at which successful connections are logged.
  
***************
*** 531,537 ****
  # and with Solaris < 2.4. APPEND_DOT will not work with hostnames taken
  # from /etc/hosts or from NIS maps. It does work with DNS through NIS.
  #
! # DOT= -DAPPEND_DOT
  
  ##################################################
  # Optional: Always attempt remote username lookups
--- 531,537 ----
  # and with Solaris < 2.4. APPEND_DOT will not work with hostnames taken
  # from /etc/hosts or from NIS maps. It does work with DNS through NIS.
  #
! DOT= -DAPPEND_DOT
  
  ##################################################
  # Optional: Always attempt remote username lookups
***************
*** 551,557 ****
  # still do selective username lookups as documented in the hosts_access.5
  # and hosts_options.5 manual pages (`nroff -man' format).
  #
! #AUTH	= -DALWAYS_RFC931
  #
  # The default username lookup timeout is 10 seconds. This may not be long
  # enough for slow hosts or networks, but is enough to irritate PC users.
--- 551,557 ----
  # still do selective username lookups as documented in the hosts_access.5
  # and hosts_options.5 manual pages (`nroff -man' format).
  #
! AUTH	= -DALWAYS_RFC931
  #
  # The default username lookup timeout is 10 seconds. This may not be long
  # enough for slow hosts or networks, but is enough to irritate PC users.
***************
*** 610,616 ****
  # Paranoid mode implies hostname lookup. In order to disable hostname
  # lookups altogether, see the next section.
  
! PARANOID= -DPARANOID
  
  ########################################
  # Optional: turning off hostname lookups
--- 610,616 ----
  # Paranoid mode implies hostname lookup. In order to disable hostname
  # lookups altogether, see the next section.
  
! #PARANOID= -DPARANOID
  
  ########################################
  # Optional: turning off hostname lookups
***************
*** 649,655 ****
  # source-routed traffic in the kernel. Examples: 4.4BSD derivatives,
  # Solaris 2.x, and Linux. See your system documentation for details.
  #
! # KILL_OPT= -DKILL_IP_OPTIONS
  
  ## End configuration options
  ############################
--- 649,655 ----
  # source-routed traffic in the kernel. Examples: 4.4BSD derivatives,
  # Solaris 2.x, and Linux. See your system documentation for details.
  #
! #KILL_OPT= -DKILL_IP_OPTIONS
  
  ## End configuration options
  ############################
***************
*** 659,670 ****
  SHELL	= /bin/sh
  .c.o:;	$(CC) $(CFLAGS) -c $*.c
  
! CFLAGS	= -O -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \
  	$(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \
  	-DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" $(STYLE) $(KILL_OPT) \
  	-DSEVERITY=$(SEVERITY) -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \
  	$(UCHAR) $(TABLES) $(STRINGS) $(TLI) $(EXTRA_CFLAGS) $(DOT) \
! 	$(VSYSLOG) $(HOSTNAME)
  
  LIB_OBJ= hosts_access.o options.o shell_cmd.o rfc931.o eval.o \
  	hosts_ctl.o refuse.o percent_x.o clean_exit.o $(AUX_OBJ) \
--- 659,670 ----
  SHELL	= /bin/sh
  .c.o:;	$(CC) $(CFLAGS) -c $*.c
  
! CFLAGS	= -O2 -pipe -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \
  	$(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \
  	-DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" $(STYLE) $(KILL_OPT) \
  	-DSEVERITY=$(SEVERITY) -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \
  	$(UCHAR) $(TABLES) $(STRINGS) $(TLI) $(EXTRA_CFLAGS) $(DOT) \
! 	$(VSYSLOG)
  
  LIB_OBJ= hosts_access.o options.o shell_cmd.o rfc931.o eval.o \
  	hosts_ctl.o refuse.o percent_x.o clean_exit.o $(AUX_OBJ) \
diff -C 3 -r tcp_wrappers_7.6/safe_finger.c fixed/tcp_wrappers_7.6/safe_finger.c
*** tcp_wrappers_7.6/safe_finger.c	Wed Dec 28 11:42:42 1994
--- fixed/tcp_wrappers_7.6/safe_finger.c	Sun Apr 15 23:16:18 2001
***************
*** 31,37 ****
  
  /* Local stuff */
  
! char    path[] = "PATH=/bin:/usr/bin:/usr/ucb:/usr/bsd:/etc:/usr/etc:/usr/sbin";
  
  #define	TIME_LIMIT	60		/* Do not keep listinging forever */
  #define	INPUT_LENGTH	100000		/* Do not keep listinging forever */
--- 31,37 ----
  
  /* Local stuff */
  
! char    path[] = "PATH=/bin:/usr/bin:/usr/sbin";
  
  #define	TIME_LIMIT	60		/* Do not keep listinging forever */
  #define	INPUT_LENGTH	100000		/* Do not keep listinging forever */