- upgrade to 2.6.1

- rename in.identd to identd
- fix paths in manpage
This commit is contained in:
Torsten Blum 1995-07-27 20:30:09 +00:00
parent db7baad584
commit 12b03cb3ff
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=2009
7 changed files with 96 additions and 152 deletions

View file

@ -1,12 +1,12 @@
# New ports collection makefile for: pidentd
# Version required: 2.5.1
# Version required: 2.6.1
# Date created: 19 Oct 1994
# Whom: torstenb
#
# $Id: Makefile,v 1.6 1995/05/06 00:49:36 torstenb Exp $
# $Id: Makefile,v 1.7 1995/07/13 01:15:51 asami Exp $
#
DISTNAME= pidentd-2.5.1
DISTNAME= pidentd-2.6.1
CATEGORIES+= security networking
MASTER_SITES= ftp://ftp.lysator.liu.se/pub/ident/servers/ \
ftp://ftp.fu-berlin.de/unix/security/ident/servers/

View file

@ -1 +1 @@
MD5 (pidentd-2.5.1.tar.gz) = 400667ce64745ee35d8e13896b0735d4
MD5 (pidentd-2.6.1.tar.gz) = ef76a28e5efa13280069044a1f64b5f8

View file

@ -1,24 +1,24 @@
*** Makefile.orig Thu Oct 20 17:08:27 1994
--- Makefile Wed Nov 9 21:16:56 1994
*** Makefile.orig Mon Jun 5 19:49:08 1995
--- Makefile Thu Jul 27 21:10:17 1995
***************
*** 14,20 ****
# on the command line (like "make DESTROOT=/usr/wheel sunos4")
*** 15,21 ****
#
TAR=tar
MAKE=make
! DESTROOT=/usr/local
DESTDIR=$(DESTROOT)/sbin
MANROOT=$(DESTROOT)/man
MANDIR=$(MANROOT)/man8
--- 14,20 ----
# on the command line (like "make DESTROOT=/usr/wheel sunos4")
--- 15,21 ----
#
TAR=tar
MAKE=make
! DESTROOT=${PREFIX}
DESTDIR=$(DESTROOT)/sbin
MANROOT=$(DESTROOT)/man
MANDIR=$(MANROOT)/man8
***************
*** 43,49 ****
*** 44,50 ****
CFLAGS=-O
@ -26,7 +26,7 @@
@echo "Please specify the type of system you wish to build for."
@echo "Valid systems are:"
@echo ""
--- 43,51 ----
--- 44,52 ----
CFLAGS=-O
@ -36,22 +36,20 @@
@echo "Please specify the type of system you wish to build for."
@echo "Valid systems are:"
@echo ""
*** src/Makefile.ORIG Fri Oct 14 17:17:36 1994
--- src/Makefile Sat Mar 4 22:50:09 1995
***************
*** 11,17 ****
*** 387,393 ****
foo:
@echo 'Nono! Don't type "make" in this directory, use the one above!'
!
in.identd: identd.o $(COBJS) idecrypt itest
$(CC) $(LDFLAGS) -o in.identd identd.o $(COBJS) $(LIBS)
@mv in.identd ..
--- 11,17 ----
install: in.identd
cp identd.8 $(MANDIR)/identd.8
! cp in.identd $(DESTDIR)/in.identd
foo:
@echo 'Nono! Don't type "make" in this directory, use the one above!'
!
in.identd: identd.o $(COBJS) idecrypt itest
$(CC) $(LDFLAGS) -o in.identd identd.o $(COBJS) $(LIBS)
@mv in.identd ..
tests:
(cd testdir ; make)
--- 389,395 ----
install: in.identd
cp identd.8 $(MANDIR)/identd.8
! cp in.identd $(DESTDIR)/identd
tests:
(cd testdir ; make)

View file

@ -1,124 +1,67 @@
*** src/kernel/freebsd.c.orig Fri Oct 21 01:07:37 1994
--- src/kernel/freebsd.c Sun Apr 16 21:21:02 1995
*** identd.8.orig Thu Jul 27 21:18:14 1995
--- identd.8 Thu Jul 27 21:16:53 1995
***************
*** 53,58 ****
--- 53,61 ----
#include "identd.h"
#include "error.h"
+ #ifdef INPLOOKUP_SETLOCAL
+ #define _HAVE_OLD_INPCB
+ #endif
extern void *calloc();
extern void *malloc();
*** 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> ]
***************
*** 76,82 ****
--- 79,89 ----
static int nfile;
+ #ifdef _HAVE_OLD_INPCB
static struct inpcb tcb;
+ #else
+ static struct inpcbhead tcb;
+ #endif
int k_open()
{
*** 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
***************
*** 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)
*** 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).

View file

@ -1 +1 @@
pidentd - a RFC1413 identification server, version 2.5.1
pidentd - a RFC1413 identification server, version 2.6.1

View file

@ -1,2 +1,2 @@
sbin/in.identd
sbin/identd
man/man8/identd.8.gz

View file

@ -1,7 +1,10 @@
#!/bin/sh
#
# $Id: configure,v 1.1.1.1 1994/10/23 01:27:56 torstenb Exp $
# $Id: configure,v 1.2 1994/11/10 05:54:55 gpalmer Exp $
#
mv ${WRKSRC}/src/paths.h ${WRKSRC}/src/paths.h.bak
sed <${WRKSRC}/src/paths.h.bak >${WRKSRC}/src/paths.h s+!!PREFIX!!+$PREFIX+g
mv ${WRKSRC}/identd.8 ${WRKSRC}/identd.8.bak
sed <${WRKSRC}/identd.8.bak >${WRKSRC}/identd.8 s+!!PREFIX!!+$PREFIX+g