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

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

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

diff --git a/src/util/send-pr/categories b/src/util/send-pr/categories
index c0c8fc402e9fafba4a1e692f30171101be0554db..7700dd2bb795c6ab7c280c9d6dcbbaf6527d9dbc 100644 (file)
--- a/src/util/send-pr/categories
+++ b/src/util/send-pr/categories
@@ -5,6 +5,7 @@ krb5-clients
 krb5-appl
 krb5-doc
 krb5-misc
+krb5-build
 pty
 telnet
 test

diff --git a/src/util/send-pr/send-pr.sh b/src/util/send-pr/send-pr.sh
index 9d1412ce6246081fdd8e384cb63dcdf012c5fb27..88dbe836d96db1554a381fb34f97fe99854b18f9 100644 (file)
--- a/src/util/send-pr/send-pr.sh
+++ b/src/util/send-pr/send-pr.sh
@@ -55,12 +55,17 @@ GNATS_SITE=mit
 
 # What mailer to use.  This must come after the config file, since it is
 # host-dependent.
-MAIL_AGENT="/usr/sbin/sendmail -oi -t"
+MAIL_AGENT="/usr/lib/sendmail -oi -t"
+if [ ! -x $MAIL_AGENT ] ; then
+    ( [-x /usr/lib/sendmail ] && MAIL_AGENT="/usr/lib/sendmail -oi -t" ) || \
+     ( [ -x /usr/sbin/sendmail ] && MAIL_AGENT="/usr/sbin/sendmail -oi -t " ) || \
+     MAIL_AGENT="sendmail -oi -t "
+fi
 
 # How to read the passwd database.
 PASSWD="cat /etc/passwd"
 
-ECHON=bsd
+ECHON=sysv
 
 if [ $ECHON = bsd ] ; then
   ECHON1="echo -n"