head	1.9;
access;
symbols
	RELEASE_5_2_1:1.8
	RELEASE_5_2_0:1.8
	RELEASE_4_9_0:1.8
	RELEASE_5_1_0:1.8
	RELEASE_4_8_0:1.8
	RELEASE_5_0_0:1.8
	RELEASE_4_7_0:1.8
	RELEASE_4_6_2:1.8
	RELEASE_4_6_1:1.8
	RELEASE_4_6_0:1.8
	RELEASE_5_0_DP1:1.8
	RELEASE_4_5_0:1.8
	RELEASE_4_4_0:1.8
	RELEASE_4_3_0:1.8
	RELEASE_4_2_0:1.8
	RELEASE_4_1_1:1.8
	RELEASE_4_1_0:1.8
	RELEASE_3_5_0:1.8
	RELEASE_4_0_0:1.8
	RELEASE_3_4_0:1.8
	RELEASE_3_3_0:1.8
	RELEASE_3_2_0:1.8
	RELEASE_3_1_0:1.8
	RELEASE_2_2_8:1.8
	RELEASE_3_0_0:1.8
	RELEASE_2_2_7:1.7
	RELEASE_2_2_6:1.7
	RELEASE_2_2_5:1.7
	RELEASE_2_2_1:1.7
	RELEASE_2_2_2:1.7;
locks; strict;
comment	@# @;


1.9
date	2004.03.06.09.33.13;	author dinoex;	state dead;
branches;
next	1.8;

1.8
date	98.10.10.06.09.50;	author steve;	state Exp;
branches;
next	1.7;

1.7
date	96.11.05.16.41.44;	author peter;	state Exp;
branches;
next	1.6;

1.6
date	96.08.16.18.31.02;	author peter;	state Exp;
branches;
next	1.5;

1.5
date	96.02.09.12.01.29;	author adam;	state Exp;
branches;
next	1.4;

1.4
date	95.07.27.20.30.03;	author torstenb;	state Exp;
branches;
next	1.3;

1.3
date	95.05.06.00.53.16;	author torstenb;	state Exp;
branches;
next	1.2;

1.2
date	95.04.11.15.42.06;	author ache;	state Exp;
branches;
next	1.1;

1.1
date	95.04.11.14.27.41;	author ache;	state Exp;
branches;
next	;


desc
@@


1.9
log
@- update to 3.0.16
- use PLIST_FILES
- add missing manpage idecrypt.8
@
text
@--- identd.man.orig	Mon Jul 28 23:01:22 1997
+++ identd.man	Tue Sep 29 18:40:47 1998
@@@@ -4,9 +4,9 @@@@
 .\"
 .TH IDENTD 8 "27 May 1992"
 .SH NAME
-identd, in.identd \- TCP/IP IDENT protocol server
+identd \- TCP/IP IDENT protocol server
 .SH SYNOPSIS
-.B xDESTDIRx/[in.]identd
+.B !!PREFIX!!/sbin/identd
 .RB [ \-i | \-w | \-b ]
 .RB [ \-t<seconds> ]
 .RB [ \-u<uid> ]
@@@@ -205,7 +205,7 @@@@
 If the
 .I keyfile
 is not specified, it defaults to
-.BR /etc/identd.key .
+.BR !!PREFIX!!/etc/identd.key .
 .PP
 The
 .B \-n
@@@@ -322,14 +322,14 @@@@
 mode of operation.
 .SH EXAMPLES
 Assuming the server is located in
-.B /usr/etc/in.identd
+.B !!PREFIX!!/sbin/identd
 one can put either:
 .PP
-ident stream tcp wait sys /usr/etc/in.identd in.identd -w -t120
+ident stream tcp wait sys !!PREFIX!!/sbin/identd identd -w -t120
 .PP
 or:
 .PP
-ident stream tcp nowait sys /usr/etc/in.identd in.identd -i
+ident stream tcp nowait sys !!PREFIX!!/sbin/identd identd -i
 .PP
 into the
 .B /etc/inetd.conf
@@@@ -342,7 +342,7 @@@@
 .B /etc/rc.local
 file:
 .PP
-/usr/etc/in.identd -b -u2 -g2
+!!PREFIX!!/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).
--- idecrypt.man.orig	Tue Sep 29 19:00:01 1998
+++ idecrypt.man	Tue Sep 29 19:01:05 1998
@@@@ -14,7 +14,7 @@@@
 .PP
 .B idecrypt
 reads up to 1024 lines from the
-.B /etc/identd.key
+.B !!PREFIX!!/etc/identd.key
 file, converting each line to a DES key using
 .BR des_string_to_key (3).
 It then reads standard input, searching for encrypted tokens
@@@@ -51,7 +51,7 @@@@
 the remote IP address and the remote port number.
 .SH EXAMPLE
 Suppose that the local host has IP address 10.2.3.4, the local
-.B /etc/identd.key
+.B !!PREFIX!!/etc/identd.key
 file contains
 .PP
 foobar
@@@@ -74,7 +74,7 @@@@
 If the administrator of the remote host later provides the administrator
 of the local host with a copy of the encrypted token, and if
 the secret key has not been removed from the local
-.B /etc/identd.key
+.B !!PREFIX!!/etc/identd.key
 file, then the administrator of the local host can run
 .B idecrypt
 and can provide the encrypted token in standard input.
@


1.8
log
@The location of identd.key is in ${PREFIX}/etc.

PR:		8091
Submitted by:	Sheldon Hearn <axl@@iafrica.com>
@
text
@@


1.7
log
@Fix bug in man page path substitution.
(it used to come out as /usr/local/identd)
@
text
@d1 2
a2 2
--- identd.man.orig	Mon Aug 12 04:58:37 1996
+++ identd.man	Sat Aug 17 01:43:42 1996
d15 9
d51 29
@


1.6
log
@Update from 2.7b3 -> 2.7b4, the author included our patch.

.. however, he also changed the top level Makefile to use $PREFIX for
something completely different (and incompatable) to what we use it for.
@
text
@d11 1
a11 1
+.B !!PREFIX!!/identd
@


1.5
log
@update to latest version. old version was gone from the master site.
some FreeBSD patches now in the main distribution.
Reviewed by:torstenb
@
text
@d1 41
a41 67
*** identd.man.orig	Thu Jul 27 21:18:14 1995
--- identd.man	Thu Jul 27 21:16:53 1995
***************
*** 6,12 ****
  .SH NAME
  identd, in.identd \- TCP/IP IDENT protocol server
  .SH SYNOPSIS
! .B /usr/sbin/in.identd
  .RB [ \-i | \-w | \-b ]
  .RB [ \-t<seconds> ]
  .RB [ \-u<uid> ]
--- 6,12 ----
  .SH NAME
  identd, in.identd \- TCP/IP IDENT protocol server
  .SH SYNOPSIS
! .B !!PREFIX!!/sbin/identd
  .RB [ \-i | \-w | \-b ]
  .RB [ \-t<seconds> ]
  .RB [ \-u<uid> ]
***************
*** 234,247 ****
  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
--- 234,247 ----
  mode of operation.
  .SH EXAMPLES
  Assuming the server is located in
! .B !!PREFIX!!/sbin/identd
  one can put either:
  .PP
! ident stream tcp wait sys !!PREFIX!!/sbin/identd identd -w -t120
  .PP
  or:
  .PP
! ident stream tcp nowait sys !!PREFIX!!/sbin/identd identd -i
  .PP
  into the
  .B /etc/inetd.conf
***************
*** 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).
--- 254,260 ----
  .B /etc/rc.local
  file:
  .PP
! !!PREFIX!!/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).
@


1.4
log
@- upgrade to 2.6.1
- rename in.identd to identd
- fix paths in manpage
@
text
@d1 2
a2 2
*** identd.8.orig	Thu Jul 27 21:18:14 1995
--- identd.8	Thu Jul 27 21:16:53 1995
@


1.3
log
@add a #ifdef to detect new inpcb style
@
text
@d1 2
a2 2
*** src/kernel/freebsd.c.orig	Fri Oct 21 01:07:37 1994
--- src/kernel/freebsd.c	Sun Apr 16 21:21:02 1995
d4 16
a19 11
*** 53,58 ****
--- 53,61 ----
  #include "identd.h"
  #include "error.h"
  
+ #ifdef INPLOOKUP_SETLOCAL
+ #define	_HAVE_OLD_INPCB
+ #endif
  
  extern void *calloc();
  extern void *malloc();
d21 30
a50 13
*** 76,82 ****
--- 79,89 ----
  
  static int nfile;
  
+ #ifdef _HAVE_OLD_INPCB
  static struct inpcb tcb;
+ #else
+ static struct inpcbhead tcb;
+ #endif
  
  int k_open()
  {
d52 16
a67 95
*** 127,148 ****
  ** Returns NULL if no match.
  */
  static struct socket *
      getlist(pcbp, faddr, fport, laddr, lport)
    struct inpcb *pcbp;
    struct in_addr *faddr;
    int fport;
    struct in_addr *laddr;
    int lport;
  {
    struct inpcb *head;
  
    if (!pcbp)
      return NULL;
  
!   
    head = pcbp->inp_prev;
    do 
    {
      if ( pcbp->inp_faddr.s_addr == faddr->s_addr &&
  	 pcbp->inp_laddr.s_addr == laddr->s_addr &&
  	 pcbp->inp_fport        == fport &&
--- 134,173 ----
  ** Returns NULL if no match.
  */
  static struct socket *
+ #ifdef _HAVE_OLD_INPCB
      getlist(pcbp, faddr, fport, laddr, lport)
    struct inpcb *pcbp;
+ #else
+     getlist(pcbhead, faddr, fport, laddr, lport)
+   struct inpcbhead *pcbhead;
+ #endif
    struct in_addr *faddr;
    int fport;
    struct in_addr *laddr;
    int lport;
  {
+ #ifdef _HAVE_OLD_INPCB
    struct inpcb *head;
+ #else
+   struct inpcb *head, pcbp;
+ #endif
  
+ #ifdef _HAVE_OLD_INPCB
    if (!pcbp)
      return NULL;
+ #else
+   head = pcbhead->lh_first;
+   if (!head)
+     return NULL;
+ #endif
+  
  
! #ifdef _HAVE_OLD_INPCB
    head = pcbp->inp_prev;
+ #endif
    do 
    {
+ #ifdef _HAVE_OLD_INPCB
      if ( pcbp->inp_faddr.s_addr == faddr->s_addr &&
  	 pcbp->inp_laddr.s_addr == laddr->s_addr &&
  	 pcbp->inp_fport        == fport &&
***************
*** 153,158 ****
--- 178,193 ----
  		  pcbp,
  		  sizeof(struct inpcb),
  		  "tcblist"));
+ #else
+     if (!getbuf((long) head, &pcbp, sizeof(struct inpcb), "tcblist"))
+        break;
+     if (pcbp.inp_faddr.s_addr == faddr->s_addr &&
+ 	pcbp.inp_fport        == fport &&
+ 	pcbp.inp_lport        == lport )
+ 	return(pcbp.inp_socket);
+     head = pcbp.inp_list.le_next;
+   } while (head != NULL);
+ #endif
  
    return NULL;
  }
***************
*** 186,192 ****
--- 221,229 ----
    if (!getbuf(nl[N_TCB].n_value, &tcb, sizeof(tcb), "tcb"))
      return -1;
    
+ #ifdef _HAVE_OLD_INPCB
    tcb.inp_prev = (struct inpcb *) nl[N_TCB].n_value;
+ #endif
    sockp = getlist(&tcb, faddr, fport, laddr, lport);
   
    if (!sockp)
@


1.2
log
@Fix inpcb handling
@
text
@d1 2
a2 2
*** freebsd.c.orig	Fri Oct 21 03:07:37 1994
--- src/kernel/freebsd.c	Tue Apr 11 19:30:45 1995
d4 11
a14 12
*** 1,5 ****
  /*
! ** kernel/other.c	Low level kernel access functions for FreeBSD 2.x
  **
  ** This program is in the public domain and may be used freely by anyone
  ** who wants to. 
--- 1,5 ----
  /*
! ** kernel/other.c	Low level kernel access functions for FreeBSD 2.1
  **
  ** This program is in the public domain and may be used freely by anyone
  ** who wants to. 
d17 1
d21 5
a25 9
! static struct inpcb tcb;
  
  int k_open()
  {
--- 76,82 ----
  
  static int nfile;
  
! static struct inpcbhead tcb;
d30 1
a30 1
*** 127,158 ****
d34 2
a35 2
!     getlist(pcbp, faddr, fport, laddr, lport)
!   struct inpcb *pcbp;
d41 1
a41 1
!   struct inpcb *head;
d43 1
a43 1
!   if (!pcbp)
d46 2
a47 2
-   
-   head = pcbp->inp_prev;
d50 4
a53 14
!     if ( pcbp->inp_faddr.s_addr == faddr->s_addr &&
! 	 pcbp->inp_laddr.s_addr == laddr->s_addr &&
! 	 pcbp->inp_fport        == fport &&
! 	 pcbp->inp_lport        == lport )
!        return pcbp->inp_socket;
!   } while (pcbp->inp_next != head &&
! 	   getbuf((long) pcbp->inp_next,
! 		  pcbp,
! 		  sizeof(struct inpcb),
! 		  "tcblist"));
  
    return NULL;
  }
--- 127,159 ----
d57 7
a63 2
!     getlist(pcbphead, faddr, fport, laddr, lport)
!   struct inpcbhead *pcbphead;
d69 5
a73 1
!   struct inpcb *head, pcbp;
d75 2
a76 2
!   head = pcbphead->lh_first;
!   if (!head)
d78 10
a87 1
  
d90 20
a109 12
!     if (!getbuf((long) head,
! 	   &pcbp,
! 	   sizeof(struct inpcb),
! 	   "tcblist"))
! 	break;
!     if ( pcbp.inp_faddr.s_addr == faddr->s_addr &&
! 	 pcbp.inp_laddr.s_addr == laddr->s_addr &&
! 	 pcbp.inp_fport        == fport &&
! 	 pcbp.inp_lport        == lport )
!        return pcbp.inp_socket;
!     head = pcbp.inp_list.le_next;
!   } while (head != NULL);
d114 2
a115 2
*** 185,192 ****
    /* -------------------- TCP PCB LIST -------------------- */
d118 4
a121 2
-   
-   tcb.inp_prev = (struct inpcb *) nl[N_TCB].n_value;
a124 1
--- 186,191 ----
@


1.1
log
@Fix for new inpcb style.
Submitted by: tri@@pooh.tky.hut.fi
@
text
@d1 2
a2 2
*** src/kernel/freebsd.c.orig	Fri Oct 21 03:07:37 1994
--- src/kernel/freebsd.c	Tue Apr 11 18:17:25 1995
d17 10
a26 2
*** 77,82 ****
--- 77,83 ----
d29 1
a29 2
  static struct inpcb tcb;
+ static struct inpcb *dummy_tcb;
d34 14
a47 1
*** 140,146 ****
d50 2
a51 2
    
!   head = pcbp->inp_prev;
d54 28
a81 2
      if ( pcbp->inp_faddr.s_addr == faddr->s_addr &&
--- 141,147 ----
a83 2
    
!   head = *(pcbp->inp_list.le_prev);
d86 15
a100 20
      if ( pcbp->inp_faddr.s_addr == faddr->s_addr &&
***************
*** 148,155 ****
  	 pcbp->inp_fport        == fport &&
  	 pcbp->inp_lport        == lport )
         return pcbp->inp_socket;
!   } while (pcbp->inp_next != head &&
! 	   getbuf((long) pcbp->inp_next,
  		  pcbp,
  		  sizeof(struct inpcb),
  		  "tcblist"));
--- 149,156 ----
  	 pcbp->inp_fport        == fport &&
  	 pcbp->inp_lport        == lport )
         return pcbp->inp_socket;
!   } while (pcbp->inp_list.le_next != head &&
! 	   getbuf((long) pcbp->inp_list.le_next,
  		  pcbp,
  		  sizeof(struct inpcb),
  		  "tcblist"));
d106 2
a107 11
!   
!   tcb.inp_prev = (struct inpcb *) nl[N_TCB].n_value;
    sockp = getlist(&tcb, faddr, fport, laddr, lport);
   
    if (!sockp)
--- 186,193 ----
    /* -------------------- TCP PCB LIST -------------------- */
    if (!getbuf(nl[N_TCB].n_value, &tcb, sizeof(tcb), "tcb"))
      return -1;
!   dummy_tcb = ((struct inpcb *) nl[N_TCB].n_value);
!   tcb.inp_list.le_prev = &dummy_tcb;
d111 1
@
