diff -urN tcp_wrappers_7.6-ipv6.1.orig/Makefile tcp_wrappers_7.6-ipv6.1/Makefile --- tcp_wrappers_7.6-ipv6.1.orig/Makefile Tue Aug 22 02:59:52 2000 +++ tcp_wrappers_7.6-ipv6.1/Makefile Sat Sep 15 22:21:59 2001 @@ -44,7 +44,7 @@ #REAL_DAEMON_DIR=/usr/etc # # SysV.4 Solaris 2.x OSF AIX -#REAL_DAEMON_DIR=/usr/sbin +REAL_DAEMON_DIR=/usr/sbin # # BSD 4.4 #REAL_DAEMON_DIR=/usr/libexec @@ -192,7 +192,8 @@ # SunOS 5.x is another SYSV4 variant. sunos5: @$(MAKE) REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ - LIBS="-lsocket -lnsl" RANLIB=echo ARFLAGS=rv VSYSLOG= \ + LIBS="-L. -R/usr/local/lib -lsocket -lnsl -lwrap" LD="ld" \ + LDFLAGS="-G -h $(SHLIB)" RANLIB=echo ARFLAGS=rv VSYSLOG= \ NETGROUP=-DNETGROUP AUX_OBJ=setenv.o TLI=-DTLI \ BUGS="$(BUGS) -DSOLARIS_24_GETHOSTBYNAME_BUG" IPV6="$(IPV6)" all @@ -480,7 +481,7 @@ # If your system has IPv6 and supports getipnode* and inet_pton/inet_ntop # uncomment the following (Solaris 8) -# IPV6 = -DHAVE_IPV6 +IPV6 = -DHAVE_IPV6 # If your system does not have getipnodebyname() but uses the obsolete # gethostbyname2() instead, use this (AIX) @@ -669,10 +670,11 @@ # Protection against weird shells or weird make programs. SHELL = /bin/sh -.c.o:; $(CC) $(CFLAGS) -c $*.c +CC = gcc +.c.o:; $(CC) $(CFLAGS) -fpic -c $*.c -CFLAGS = -O -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \ - $(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \ +CFLAGS = -O3 -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) \ @@ -697,8 +699,33 @@ scaffold.h tcpdmatch.8 README.NIS LIB = libwrap.a - -all other: config-check tcpd tcpdmatch try-from safe_finger tcpdchk +SHLIB_NAME = libwrap.so +SHLIB_VERSION = 1 +SHLIB = $(SHLIB_NAME).$(SHLIB_VERSION) +PREFIX = /usr/local +INSTALL = /usr/ucb/install -c + +all other: $(LIB) config-check tcpd tcpdmatch try-from safe_finger tcpdchk + +install: all + mkdir -p $(PREFIX)/include $(PREFIX)/lib $(PREFIX)/bin \ + $(PREFIX)/man/man3 $(PREFIX)/man/man5 $(PREFIX)/man/man8 + $(INSTALL) tcpd.h $(PREFIX)/include + $(INSTALL) $(LIB) $(PREFIX)/lib + $(INSTALL) $(SHLIB) $(PREFIX)/lib + rm -f $(PREFIX)/lib/$(SHLIB_NAME) + ln -s $(PREFIX)/lib/$(SHLIB) $(PREFIX)/lib/$(SHLIB_NAME) + $(INSTALL) -s safe_finger $(PREFIX)/bin + $(INSTALL) -s tcpd $(PREFIX)/bin + $(INSTALL) -s tcpdchk $(PREFIX)/bin + $(INSTALL) -s tcpdmatch $(PREFIX)/bin + $(INSTALL) -s try-from $(PREFIX)/bin + $(INSTALL) hosts_access.3 $(PREFIX)/man/man3 + $(INSTALL) hosts_access.5 $(PREFIX)/man/man5 + $(INSTALL) hosts_options.5 $(PREFIX)/man/man5 + $(INSTALL) tcpd.8 $(PREFIX)/man/man8 + $(INSTALL) tcpdchk.8 $(PREFIX)/man/man8 + $(INSTALL) tcpdmatch.8 $(PREFIX)/man/man8 # Invalidate all object files when the compiler options (CFLAGS) have changed. @@ -717,27 +744,32 @@ $(AR) $(ARFLAGS) $(LIB) $(LIB_OBJ) -$(RANLIB) $(LIB) -tcpd: tcpd.o $(LIB) - $(CC) $(CFLAGS) -o $@ tcpd.o $(LIB) $(LIBS) +$(SHLIB): $(LIB_OBJ) + rm -f $(SHLIB) + $(LD) $(LDFLAGS) -o $(SHLIB) $(LIB_OBJ) + ln -sf $(SHLIB) $(SHLIB_NAME) + +tcpd: tcpd.o $(SHLIB) + $(CC) $(CFLAGS) -o $@ tcpd.o $(LIBS) -miscd: miscd.o $(LIB) - $(CC) $(CFLAGS) -o $@ miscd.o $(LIB) $(LIBS) +miscd: miscd.o $(SHLIB) + $(CC) $(CFLAGS) -o $@ miscd.o $(LIBS) -safe_finger: safe_finger.o $(LIB) - $(CC) $(CFLAGS) -o $@ safe_finger.o $(LIB) $(LIBS) +safe_finger: safe_finger.o $(SHLIB) + $(CC) $(CFLAGS) -o $@ safe_finger.o $(LIBS) TCPDMATCH_OBJ = tcpdmatch.o fakelog.o inetcf.o scaffold.o -tcpdmatch: $(TCPDMATCH_OBJ) $(LIB) - $(CC) $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) $(LIB) $(LIBS) +tcpdmatch: $(TCPDMATCH_OBJ) $(SHLIB) + $(CC) $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) $(LIBS) -try-from: try-from.o fakelog.o $(LIB) - $(CC) $(CFLAGS) -o $@ try-from.o fakelog.o $(LIB) $(LIBS) +try-from: try-from.o fakelog.o $(SHLIB) + $(CC) $(CFLAGS) -o $@ try-from.o fakelog.o $(LIBS) TCPDCHK_OBJ = tcpdchk.o fakelog.o inetcf.o scaffold.o -tcpdchk: $(TCPDCHK_OBJ) $(LIB) - $(CC) $(CFLAGS) -o $@ $(TCPDCHK_OBJ) $(LIB) $(LIBS) +tcpdchk: $(TCPDCHK_OBJ) $(SHLIB) + $(CC) $(CFLAGS) -o $@ $(TCPDCHK_OBJ) $(LIBS) shar: $(KIT) @shar $(KIT) @@ -753,7 +785,7 @@ clean: rm -f tcpd miscd safe_finger tcpdmatch tcpdchk try-from *.[oa] core \ - cflags + cflags $(SHLIB) $(SHLIB_NAME) tidy: clean chmod -R a+r . diff -urN tcp_wrappers_7.6-ipv6.1.orig/options.c tcp_wrappers_7.6-ipv6.1/options.c --- tcp_wrappers_7.6-ipv6.1.orig/options.c Mon Feb 12 01:01:32 1996 +++ tcp_wrappers_7.6-ipv6.1/options.c Sat Sep 15 22:19:25 2001 @@ -125,6 +125,9 @@ 0, }; +int allow_severity = SEVERITY; +int deny_severity = LOG_WARNING; + /* process_options - process access control options */ void process_options(options, request)