Remove a data-dependent case of segmentation fault in in.fingerd.

3 files changed, 17 insertions, 14 deletions

diff --git a/net/icsi-finger/Makefile b/net/icsi-finger/Makefile
index e81db3d3051..e1d84cde688 100644
--- a/net/icsi-finger/Makefile
+++ b/net/icsi-finger/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2011/11/15 13:04:46 is Exp $
+# $NetBSD: Makefile,v 1.19 2011/11/22 09:04:49 is Exp $
 #
 
 DISTNAME=	icsi-finger-1.0.27
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.icsi.berkeley.edu/pub/ai/stolcke/software/
 EXTRACT_SUFX=	.tar.Z
diff --git a/net/icsi-finger/distinfo b/net/icsi-finger/distinfo
index 8873c797dbb..fcd1c491374 100644
--- a/net/icsi-finger/distinfo
+++ b/net/icsi-finger/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2011/11/15 13:04:46 is Exp $
+$NetBSD: distinfo,v 1.13 2011/11/22 09:04:49 is Exp $
 
 SHA1 (icsi-finger-1.0.27.tar.Z) = 41f03c42269a402169000a6b08ba8c6330256861
 RMD160 (icsi-finger-1.0.27.tar.Z) = 92839362b6d4b1893958ca0909654f070e734aa4
@@ -12,7 +12,7 @@ SHA1 (patch-af) = 96d691992eecbf08118a924218570325a52603b1
 SHA1 (patch-ah) = d61e893ce11a3957bbe138abc9a247b0d4b51a0e
 SHA1 (patch-ai) = 01b48ecef2c1fe191780c9a8dee61f2951ee9c10
 SHA1 (patch-aj) = 53adee387e703fcff2b8f5dba4ae593712acb2ad
-SHA1 (patch-ak) = df08b988feebd818b2ebebe0756feb0463dfffda
+SHA1 (patch-ak) = 32f76a2e2a683225da8511aa0fcca4b709adf6a5
 SHA1 (patch-al) = 1abcd4a364d66b19e30e38422f3fda5a9cc233b3
 SHA1 (patch-am) = 50b7cc7eaa30eaab2a26a849a875322c5344a74a
 SHA1 (patch-an) = c5e4a49e7abd2b14513be38d3d06280117730e09
diff --git a/net/icsi-finger/patches/patch-ak b/net/icsi-finger/patches/patch-ak
index 6b6d465331d..e22c5fb2e42 100644
--- a/net/icsi-finger/patches/patch-ak
+++ b/net/icsi-finger/patches/patch-ak
@@ -1,9 +1,4 @@
-$NetBSD: patch-ak,v 1.3 2011/11/15 13:04:46 is Exp $
-
-- use standard includes
-- 64-bit time_t fixes
-- remove union wait
-- replace mktemp() by mkstemp()
+$NetBSD: patch-ak,v 1.4 2011/11/22 09:04:49 is Exp $
 
 --- src/in.fingerd.c.orig	1996-01-10 19:26:24.000000000 +0000
 +++ src/in.fingerd.c
@@ -32,7 +27,15 @@ $NetBSD: patch-ak,v 1.3 2011/11/15 13:04:46 is Exp $
      }
    else
      {
-@@ -1262,7 +1260,7 @@ show_unlogged_packet (packet, stream)
+@@ -888,7 +886,6 @@ finger_clients (user, options, stream)
+       else
+ 	{
+ 	  status = "";
+-	  idle_time = "";
+ 	}
+     
+ 
+@@ -1262,7 +1259,7 @@ show_unlogged_packet (packet, stream)
  
    /* In SunOS4 getpwnam() seems to call ctime(), so we move this call down
     * here to be sure the intended result doesn't get overwritten. */
@@ -41,7 +44,7 @@ $NetBSD: patch-ak,v 1.3 2011/11/15 13:04:46 is Exp $
    the_time[strlen(the_time) - 1] = '\0';	/* delete newline */
  
    if (*(packet->real_name))
-@@ -1406,14 +1404,7 @@ run_target_script(script, target, cd, in
+@@ -1406,14 +1403,7 @@ run_target_script(script, target, cd, in
    char *arg;
  {
    int pid;
@@ -56,7 +59,7 @@ $NetBSD: patch-ak,v 1.3 2011/11/15 13:04:46 is Exp $
  
    if (access (script, X_OK) >= 0)
      {
-@@ -1528,6 +1519,7 @@ maybe_user_script (entry, stream, packet
+@@ -1528,6 +1518,7 @@ maybe_user_script (entry, stream, packet
    FILE *long_output;
    int result;
    extern char *mktemp();
@@ -64,7 +67,7 @@ $NetBSD: patch-ak,v 1.3 2011/11/15 13:04:46 is Exp $
  
  #ifndef FINGERRC
    return (0);
-@@ -1571,8 +1563,9 @@ maybe_user_script (entry, stream, packet
+@@ -1571,8 +1562,9 @@ maybe_user_script (entry, stream, packet
    /* Collect regular long finger output in file */
    strcpy (temp_file, TEMPFILE);