X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/6cd7ecf598093782b6f27ce5147770d4af8e1f57..4216c7743192cbd41d7995c2fe5386a9df1cf2f5:/gen/aliases.sh

diff --git a/gen/aliases.sh b/gen/aliases.sh
index d6c2f8af..ee77c568 100644
--- a/gen/aliases.sh
+++ b/gen/aliases.sh
@@ -1,25 +1,27 @@
 #!/bin/sh
-SMS_MKCRED=47836474
-if [ `hostname`x != MITx ]; then
-	/bin/diff /usr/lib/aliases /usr/lib/aliases.new > /tmp/aliasdiff
-	fi
-/bin/cp /dev/null /usr/lib/aliases.new.dir
-/bin/cp /dev/null /usr/lib/aliases.new.pag
-/usr/lib/sendmail -bi -oA/usr/lib/aliases.new
+PATH=/bin:/usr/ucb:/usr/bin
+root=/usr/local/sendmail
+
+MR_MKCRED=47836474
+
+cat $root/etc/aliases.legacy > $root/etc/aliases.tmp
+cat $root/etc/aliases.new >> $root/etc/aliases.tmp
+cat $root/etc/aliases.local >> $root/etc/aliases.tmp
+mv $root/etc/aliases.tmp $root/etc/aliases.new
+
+cp /dev/null $root/etc/aliases.new.db
+
+$root/sbin/sendmail -bi -oA$root/etc/aliases.new -C$root/etc/sendmail.cf
 if [ $? != 0 ]; then
-	exit $SMS_MKCRED
-	fi
-if [ `hostname`x = MITx ]; then
-	kill `/bin/ps ax | /bin/grep "accepting connections" | /bin/grep -v grep | /bin/awk '{print $1}'`
-	/bin/mv /usr/lib/aliases /usr/lib/aliases.old
-	/bin/mv /usr/lib/aliases.dir /usr/lib/aliases.old.dir
-	/bin/mv /usr/lib/aliases.pag /usr/lib/aliases.old.pag
-	/bin/mv /usr/lib/aliases.new /usr/lib/aliases
-	/bin/mv /usr/lib/aliases.new.dir /usr/lib/aliases.dir
-	/bin/mv /usr/lib/aliases.new.pag /usr/lib/aliases.pag
-	/usr/lib/sendmail -bd -q30m
-	fi
-/bin/rm -f $0
+    exit $MR_MKCRED
+fi
+
+mv $root/etc/aliases $root/etc/aliases.old
+mv $root/etc/aliases.db $root/etc/aliases.old.db
+mv $root/etc/aliases.new $root/etc/aliases
+mv $root/etc/aliases.new.db $root/etc/aliases.db
+
+rm -f $0
 exit 0
 
 # $Header$