===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.31
retrieving revision 1.34
diff -u -r1.31 -r1.34
--- openbsd/update_openbsd/update_openbsd	2009/12/10 19:23:11	1.31
+++ openbsd/update_openbsd/update_openbsd	2009/12/31 16:50:20	1.34
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $RedRiver: update_openbsd,v 1.30 2009/12/10 18:21:51 andrew Exp $
+# $RedRiver: update_openbsd,v 1.33 2009/12/31 16:48:19 andrew Exp $
 
 installed_sets() {
     local misc=/usr/share/doc/README
@@ -24,7 +24,7 @@
         fi
     done
 
-    sendmail -d0.1 -bt < /dev/null | grep -q SASL
+    sendmail -d0.1 --badoption </dev/null 2>/dev/null | grep -q SASL
     if [ $? == 0 ]; then 
         echo -n ' sendmail-smtp_auth'
     fi
@@ -193,13 +193,13 @@
 
 follow_symlink () {
     local _file=$1
-    local _next=$( file $_file |
-        grep 'symbolic link' | 
-        sed -e s/^.*\\\`// -e s/\\\'\$// )
-    if [ -h $_next ]; then
-        follow_symlink $_next
+    # This could go circular, but I dunno how to fix that.
+    if [ -h $_file ]; then
+        follow_symlink $( file $_file |
+            grep 'symbolic link' | 
+            sed -e s/^.*\\\`// -e s/\\\'\$// )
     else
-        echo $_next
+        echo $_file
     fi
 }
 
@@ -554,10 +554,10 @@
 
 local _send_dmesg=`dirname $0`/send_dmesg 
 if [ -e "$_send_dmesg" ]; then
-    if[ -e $RELEASEDIR/.send_dmesg ]; then
+    if [ -e $RELEASEDIR/.send_dmesg ]; then
         $_send_dmesg
         rm -f $RELEASEDIR/.send_dmesg
-    else
+    elif [ X"$CUR_VER" != X"$NEW_VER" ]; then
         touch $RELEASEDIR/.send_dmesg
     fi
 fi