From 51a52b718408fc5db12cdc7788325cb53350bb59 Mon Sep 17 00:00:00 2001
From: hubertf <hubertf@pkgsrc.org>
Date: Tue, 7 Oct 2003 19:35:34 +0000
Subject: Bump to 1.0nb1: Fix bug in handling of masquerading. Original patch
by Simas Mockevicius <symka@vejas.lt>
---
net/nidentd/patches/patch-aa | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
(limited to 'net/nidentd/patches')
diff --git a/net/nidentd/patches/patch-aa b/net/nidentd/patches/patch-aa
index 6d6da9f2e03..abcc7112f94 100644
--- a/net/nidentd/patches/patch-aa
+++ b/net/nidentd/patches/patch-aa
@@ -1,17 +1,24 @@
-$NetBSD: patch-aa,v 1.3 2002/05/05 23:51:28 hubertf Exp $
+$NetBSD: patch-aa,v 1.4 2003/10/07 19:35:34 hubertf Exp $
---- nidentd.orig Mon May 6 00:37:54 2002
+--- nidentd.orig Sat May 4 14:53:01 2002
+++ nidentd
-@@ -1,9 +1,9 @@
- #!/bin/sh
+@@ -2,8 +2,8 @@
--v_lsof="/usr/pkg/sbin/lsof -P -n -Di"
-+v_lsof="@LOCALBASE@/sbin/lsof -P -n -Di"
+ v_lsof="/usr/pkg/sbin/lsof -P -n -Di"
v_ipnat="/usr/sbin/ipnat -l"
-v_nat_conf="/usr/local/etc/nidentd.nat"
-v_fake_conf="/usr/local/etc/nidentd.fake"
-+v_nat_conf="@LOCALBASE@/etc/nidentd.nat"
-+v_fake_conf="@LOCALBASE@/etc/nidentd.fake"
++v_nat_conf="/usr/pkg/etc/nidentd.nat"
++v_fake_conf="/usr/pkg/etc/nidentd.fake"
# Protocol independent
+@@ -40,7 +40,7 @@ if [ -n $qlport ] && [ -n $qrport ] && [
+ if [ $qlport -eq $lport ] && [ $qrport -eq $rport ]
+ then
+ masqip=`$v_ipnat -l | grep -e "MAP" -e " $qlport " -e " $qrport" | awk '{ print $2 }' | tr -c -d '.1234567890'`
+- hostn=`grep ^$masqip $v_nat_conf | awk -F: '{ print $2 }'`
++ hostn=`grep ^"$masqip:" $v_nat_conf | awk -F: '{ print $2 }'`
+ if [ $hostn ]
+ then
+ printf "$qlport , $qrport : USERID : UNIX : $hostn\r\n"
--
cgit v1.2.3