#!/bin/sh
+PATH=/bin:/usr/ucb:/usr/bin
+
MR_MKCRED=47836474
-cat /usr/lib/local-aliases >> /u1/usr/lib/aliases.new
-/bin/cp /dev/null /u1/usr/lib/aliases.new.dir
-/bin/cp /dev/null /u1/usr/lib/aliases.new.pag
-/usr/lib/sendmail -bi -oA/u1/usr/lib/aliases.new
+
+cat /usr/lib/aliases.legacy > /usr/lib/aliases.tmp
+cat /usr/lib/aliases.new >> /usr/lib/aliases.tmp
+cat /usr/lib/aliases.local >> /usr/lib/aliases.tmp
+mv aliases.tmp aliases.new
+
+cp /dev/null /usr/lib/aliases.new.dir
+cp /dev/null /usr/lib/aliases.new.pag
+
+/usr/lib/sendmail -bi -oA/usr/lib/aliases.new
if [ $? != 0 ]; then
exit $MR_MKCRED
fi
-kill `/bin/ps ax | /bin/grep "accepting connections" | /bin/grep -v grep | /bin/awk '{print $1}'`
-/bin/mv /u1/usr/lib/aliases /u1/usr/lib/aliases.old
-/bin/mv /u1/usr/lib/aliases.dir /u1/usr/lib/aliases.old.dir
-/bin/mv /u1/usr/lib/aliases.pag /u1/usr/lib/aliases.old.pag
-/bin/mv /u1/usr/lib/aliases.new /u1/usr/lib/aliases
-/bin/mv /u1/usr/lib/aliases.new.dir /u1/usr/lib/aliases.dir
-/bin/mv /u1/usr/lib/aliases.new.pag /u1/usr/lib/aliases.pag
-/usr/lib/sendmail -bd -q30m
+kill `ps ax | grep "sendmail" | egrep -v "grep|mqueue.stall" | awk '{print $1}'`
+sleep 60
+
+mv /usr/lib/aliases /usr/lib/aliases.old
+mv /usr/lib/aliases.dir /usr/lib/aliases.old.dir
+mv /usr/lib/aliases.pag /usr/lib/aliases.old.pag
+mv /usr/lib/aliases.new /usr/lib/aliases
+mv /usr/lib/aliases.new.dir /usr/lib/aliases.dir
+mv /usr/lib/aliases.new.pag /usr/lib/aliases.pag
+
+cd /usr/spool/mqueue
+rm -f xf* tf* lf* nf*
+
+/usr/lib/sendmail -bd
+/usr/lib/sendmail -q20m
-/bin/rm -f $0
+rm -f $0
exit 0
# $Header$