--- krb5-1.3.6-orig/src/util/send-pr/send-pr.sh	1997-03-20 03:13:56 +0300

+++ krb5-1.3.6/src/util/send-pr/send-pr.sh	2005-01-22 19:33:37 +0300

@@ -62,14 +62,17 @@

   fi

 done

+NISCAT=/usr/bin/niscat

+YPCAT=/usr/bin/ypcat

+DOMAINNAME=/bin/domainname

 # How to read the passwd database.

 PASSWD="cat /etc/passwd"

-if test -f /bin/domainname && test -n "`/bin/domainname`"; then

-  if test -f /usr/bin/niscat && 

-     /usr/bin/niscat passwd.org_dir > /dev/null 2>&1; then

-    PASSWD="/usr/bin/niscat passwd.org_dir"

-  elif test -f /usr/bin/ypcat && /usr/bin/ypcat passwd > /dev/null 2>&1; then

-    PASSWD="/usr/bin/ypcat passwd"

+if test -f $DOMAINNAME && test -n "`$DOMAINNAME`"; then

+  if test -f $NISCAT && 

+     $NISCAT passwd.org_dir > /dev/null 2>&1; then

+    PASSWD="$NISCAT passwd.org_dir"

+  elif test -f $YPCAT && $YPCAT passwd > /dev/null 2>&1; then

+    PASSWD="$YPCAT passwd"

   fi

 fi

@@ -96,9 +99,9 @@

   fi

 fi

-TEMP=$TMPDIR/p$$

-BAD=$TMPDIR/pbad$$

-REF=$TMPDIR/pf$$

+TEMP=`mktemp -t p.XXXXXX` || exit 1

+BAD=`mktemp -t pbad.XXXXXX` || exit 1

+REF=`mktemp -t pf.XXXXXX` || exit 1

 # find a user name

 if [ "$LOGNAME" = "" ]; then

@@ -122,9 +125,10 @@

 else

   # Must use temp file due to incompatibilities in quoting behavior

   # and to protect shell metacharacters in the expansion of $LOGNAME

-  $PASSWD | grep "^$LOGNAME:" | awk -F: '{print $5}' | sed -e 's/,.*//' > $TEMP

-  ORIGINATOR="`cat $TEMP`"

-  rm -f $TEMP

+  TEMP2=`mktemp -t plogname.XXXXXX` || exit 1

+  $PASSWD | grep "^$LOGNAME:" | awk -F: '{print $5}' | sed -e 's/,.*//' > $TEMP2

+  ORIGINATOR="`cat $TEMP2`"

+  rm -f $TEMP2

 fi

 if [ -n "$ORGANIZATION" ]; then

@@ -280,7 +284,7 @@

 # Catch some signals. ($xs kludge needed by Sun /bin/sh)

 xs=0

 trap 'rm -f $REF $TEMP; exit $xs' 0

-trap 'echo "$COMMAND: Aborting ..."; rm -f $REF $TEMP; xs=1; exit' 1 2 3 13 15

+trap 'echo "$COMMAND: Aborting ..."; rm -f "$REF" "$BAD" "$TEMP"; xs=1; exit' 1 2 3 13 15

 # If they told us to use a specific file, then do so.

 if [ -n "$IN_FILE" ]; then