diff -c -P --recursive --exclude=COPYRIGHT --exclude=COPYING netstd.orig/pidentd-2.6.1.orig/Makefile netstd/pidentd-2.6.1/Makefile
*** netstd.orig/pidentd-2.6.1.orig/Makefile	Sat Jul 29 10:13:33 1995
--- netstd/pidentd-2.6.1/Makefile	Sat Jul 29 12:02:09 1995
***************
*** 15,21 ****
  #
  TAR=tar
  MAKE=make
! DESTROOT=/usr/local
  DESTDIR=$(DESTROOT)/sbin
  MANROOT=$(DESTROOT)/man
  MANDIR=$(MANROOT)/man8
--- 15,21 ----
  #
  TAR=tar
  MAKE=make
! DESTROOT=/usr
  DESTDIR=$(DESTROOT)/sbin
  MANROOT=$(DESTROOT)/man
  MANDIR=$(MANROOT)/man8
***************
*** 37,48 ****
  # ftp.funet.fi in pub/crypt/libdes.
  #
  # GDEFS=-DINCLUDE_EXTENSIONS -DINCLUDE_PROXY -DINCLUDE_CRYPT
! GDEFS=-DINCLUDE_EXTENSIONS
  
  # GLIBS=-lident -ldes
  GLIBS=
  
! CFLAGS=-O
  
  all:
  	@echo "Please specify the type of system you wish to build for."
--- 37,48 ----
  # ftp.funet.fi in pub/crypt/libdes.
  #
  # GDEFS=-DINCLUDE_EXTENSIONS -DINCLUDE_PROXY -DINCLUDE_CRYPT
! GDEFS=-DINCLUDE_EXTENSIONS -DSTRONG_LOG
  
  # GLIBS=-lident -ldes
  GLIBS=
  
! CFLAGS=-O2 -fomit-frame-pointer -pipe -m486
  
  all:
  	@echo "Please specify the type of system you wish to build for."
***************
*** 97,103 ****
  #
  linux:
  	@echo "Building for Linux 0.99.13q or later ..."
! 	@(cd src ; $(MAKE) CC="$(CC)" LDFLAGS="$(LDFLAGS)" LIBS="$(GLIBS)" CFLAGS="$(CFLAGS) -DLINUX -DNO_KVM $(GDEFS)" KSRC=linux in.identd)
  
  
  #
--- 97,103 ----
  #
  linux:
  	@echo "Building for Linux 0.99.13q or later ..."
! 	@(cd src ; $(MAKE) CC="$(CC)" LDFLAGS="$(LDFLAGS)" LIBS="$(GLIBS)" CFLAGS="$(CFLAGS) -Wall -DLINUX -DNO_KVM $(GDEFS)" KSRC=linux in.identd)
  
  
  #
***************
*** 385,393 ****
  	@echo "systems are supported."
  	@exit 1
  
! install: in.identd
! 	cp identd.8  $(MANDIR)/identd.8
! 	cp in.identd $(DESTDIR)/in.identd
  
  tests:
  	(cd testdir ; make)
--- 385,393 ----
  	@echo "systems are supported."
  	@exit 1
  
! install: linux
! 	install -s -o root -g root -m 0755 in.identd ${DEBDIR}$(DESTDIR)/identd
! 	install -o root -g root -m 0644 identd.8 ${DEBDIR}$(MANDIR)/identd.8
  
  tests:
  	(cd testdir ; make)
diff -c -P --recursive --exclude=COPYRIGHT --exclude=COPYING netstd.orig/pidentd-2.6.1.orig/identd.8 netstd/pidentd-2.6.1/identd.8
*** netstd.orig/pidentd-2.6.1.orig/identd.8	Thu Feb  4 17:33:54 1993
--- netstd/pidentd-2.6.1/identd.8	Tue Sep 12 18:04:35 1995
***************
*** 189,195 ****
  flag makes
  .B identd
  check for a file ".noident" in each homedirectory for a user which the
! daemon is about to return the user name for. It that file exists then the
  daemon will give the error
  .B HIDDEN-USER
  instead of the normal USERID response. 
--- 189,195 ----
  flag makes
  .B identd
  check for a file ".noident" in each homedirectory for a user which the
! daemon is about to return the user name for. If that file exists then the
  daemon will give the error
  .B HIDDEN-USER
  instead of the normal USERID response. 
***************
*** 234,252 ****
  mode of operation.
  .SH EXAMPLES
  Assuming the server is located in
! .B /usr/etc/in.identd
  one can put either:
  .PP
! ident stream tcp wait sys /usr/etc/in.identd in.identd -w -t120
  .PP
  or:
  .PP
! ident stream tcp nowait sys /usr/etc/in.identd in.identd -i
  .PP
  into the
  .B /etc/inetd.conf
  file. User "sys" should have enough rights to READ the kernel
! but NOT to write to it.
  .PP
  To start it using the
  .B -b
--- 234,255 ----
  mode of operation.
  .SH EXAMPLES
  Assuming the server is located in
! .B /usr/sbin/identd
  one can put either:
  .PP
! ident stream tcp wait sys /usr/sbin/identd identd -w -t120
  .PP
  or:
  .PP
! ident stream tcp nowait sys /usr/sbin/identd identd -i
  .PP
  into the
  .B /etc/inetd.conf
  file. User "sys" should have enough rights to READ the kernel
! but NOT to write to it. If you want to use a tcp_wrapper for
! the identd service please make sure that it don't use the
! RFC931/1413 identd service itself (it will cause an infinite
! identd/inetd loop).
  .PP
  To start it using the
  .B -b
***************
*** 254,260 ****
  .B /etc/rc.local
  file:
  .PP
! /usr/etc/in.identd -b -u2 -g2
  .PP
  This will make it run in the background as user 2, group 2 (user "sys",
  group "kmem" on SunOS 4.1.1).
--- 257,263 ----
  .B /etc/rc.local
  file:
  .PP
! /usr/sbin/identd -b -u2 -g2
  .PP
  This will make it run in the background as user 2, group 2 (user "sys",
  group "kmem" on SunOS 4.1.1).
diff -c -P --recursive --exclude=COPYRIGHT --exclude=COPYING netstd.orig/pidentd-2.6.1.orig/src/identd.c netstd/pidentd-2.6.1/src/identd.c
*** netstd.orig/pidentd-2.6.1.orig/src/identd.c	Sat Jul 29 10:14:17 1995
--- netstd/pidentd-2.6.1/src/identd.c	Sun Jun 11 14:58:04 1995
***************
*** 62,68 ****
  extern int errno;
  #endif
  
! #ifdef SOLARIS
  #  include <unistd.h>
  #  include <stdlib.h>
  #  include <string.h>
--- 62,68 ----
  extern int errno;
  #endif
  
! #if defined(SOLARIS) || defined(__linux__)
  #  include <unistd.h>
  #  include <stdlib.h>
  #  include <string.h>
diff -c -P --recursive --exclude=COPYRIGHT --exclude=COPYING netstd.orig/pidentd-2.6.1.orig/src/kernel/linux.c netstd/pidentd-2.6.1/src/kernel/linux.c
*** netstd.orig/pidentd-2.6.1.orig/src/kernel/linux.c	Sat Jul 29 10:14:46 1995
--- netstd/pidentd-2.6.1/src/kernel/linux.c	Sun Jun 11 15:03:50 1995
***************
*** 28,33 ****
--- 28,34 ----
  {
      FILE *fp;
      long dummy;
+     int idummy;
      char buf[512];
      struct in_addr myladdr, myraddr;
      int mylport, myrport;
***************
*** 48,54 ****
      while (fgets(buf, sizeof(buf)-1, fp))
      {
  	if (sscanf(buf,"%d: %lX:%x %lX:%x %x %lX:%lX %x:%lX %lx %d",
! 		   &dummy, &myladdr, &mylport, &myraddr, &myrport,
  		   &dummy, &dummy, &dummy, &dummy, &dummy, &dummy,
  		   uid) == 12)
  	{
--- 49,55 ----
      while (fgets(buf, sizeof(buf)-1, fp))
      {
  	if (sscanf(buf,"%d: %lX:%x %lX:%x %x %lX:%lX %x:%lX %lx %d",
! 		   &idummy, &myladdr, &mylport, &myraddr, &myrport,
  		   &dummy, &dummy, &dummy, &dummy, &dummy, &dummy,
  		   uid) == 12)
  	{
diff -c -P --recursive --exclude=COPYRIGHT --exclude=COPYING netstd.orig/pidentd-2.6.1.orig/src/parse.c netstd/pidentd-2.6.1/src/parse.c
*** netstd.orig/pidentd-2.6.1.orig/src/parse.c	Sat Jul 29 10:14:32 1995
--- netstd/pidentd-2.6.1/src/parse.c	Sat Jul 29 10:31:08 1995
***************
*** 38,44 ****
  extern int errno;
  #endif
  
! #ifdef SOLARIS
  #  include <string.h>
  #  include <stdlib.h>
  #endif
--- 38,44 ----
  extern int errno;
  #endif
  
! #if defined(SOLARIS) || defined(__linux__)
  #  include <string.h>
  #  include <stdlib.h>
  #endif
***************
*** 207,213 ****
        if (rcode <= 0)
        {
  #ifdef STRONG_LOG
! 	  if (syslog(flag)
  	      syslog(LOG_NOTICE, "from: %s (%s) INVALID REQUEST",
  		     inet_ntoa(*faddr), gethost(faddr));
  #endif
--- 207,213 ----
        if (rcode <= 0)
        {
  #ifdef STRONG_LOG
! 	  if (syslog_flag)
  	      syslog(LOG_NOTICE, "from: %s (%s) INVALID REQUEST",
  		     inet_ntoa(*faddr), gethost(faddr));
  #endif
