$NetBSD: patch-aa,v 1.6 2005/06/17 15:24:55 hira Exp $ --- nidentd.orig 2002-05-04 14:53:01.000000000 +0200 +++ nidentd 2004-11-02 20:12:43.000000000 +0200 @@ -2,8 +2,8 @@ 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="/usr/pkg/etc/nidentd.nat" +v_fake_conf="/usr/pkg/etc/nidentd.fake" # Protocol independent @@ -39,8 +39,8 @@ then 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 }'` + masqip=`$v_ipnat -l | grep "MAP" | grep " $qlport " | grep " $qrport" | awk '{ print $2 }' | tr -c -d '.1234567890'` + hostn=`grep ^"$masqip:" $v_nat_conf | awk -F: '{ print $2 }'` if [ $hostn ] then printf "$qlport , $qrport : USERID : UNIX : $hostn\r\n"