This commit was generated by cvs2svn to compensate for changes in r10013,

which included commits to RCS files with non-trunk default branches.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10014 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/util/send-pr/send-pr.sh b/src/util/send-pr/send-pr.sh
index 0bd58fc62466b7961c03add724327d81a489e001..e15ea5dfece3e6e9c26458934d3eeb5386761ce8 100644 (file)
--- a/src/util/send-pr/send-pr.sh
+++ b/src/util/send-pr/send-pr.sh
@@ -55,22 +55,30 @@ GNATS_SITE=mit
 
 # What mailer to use.  This must come after the config file, since it is
 # host-dependent.
-MAIL_AGENT="/usr/lib/sendmail -oi -t"
-if [ ! -r `echo $MAIL_AGENT|sed 's/ .*//'` ] ; then
-    ( [ -r /usr/lib/sendmail ] && MAIL_AGENT="/usr/lib/sendmail -oi -t" ) || \
-     ( [ -r /usr/sbin/sendmail ] && MAIL_AGENT="/usr/sbin/sendmail -oi -t " ) || \
-     MAIL_AGENT="sendmail -oi -t "
-fi
+for dir in /usr/lib /usr/sbin /usr/ucblib; do
+  if test -f $dir/sendmail; then
+    MAIL_AGENT="$dir/sendmail -oi -t"
+    break
+  fi
+done
 
 # 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"
+  fi
+fi
 
-ECHON=sysv
+# Figure out how to do "echo -n"
 
-if [ $ECHON = bsd ] ; then
+if test "`echo -n foo`" = foo; then
   ECHON1="echo -n"
   ECHON2=
-elif [ $ECHON = sysv ] ; then
+elif test "`echo 'foo\c'`" = foo; then
   ECHON1=echo
   ECHON2='\c'
 else