===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.32
retrieving revision 1.36
diff -u -r1.32 -r1.36
--- openbsd/update_openbsd/update_openbsd	2009/12/10 19:34:39	1.32
+++ openbsd/update_openbsd/update_openbsd	2010/06/17 21:35:47	1.36
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $RedRiver: update_openbsd,v 1.31 2009/12/10 19:23:11 andrew Exp $
+# $AFresh1: update_openbsd,v 1.35 2010/02/10 20:57:07 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
 }
 
@@ -540,7 +540,7 @@
 
 else
     echo Instructions for updating to the new version available from 
-    if [ X"snapshots" != X"$FORCE_DIR" ]; then
+    if [ X"snapshots" == X"$FORCE_DIR" ]; then
         echo "  http://www.openbsd.org/faq/current.html"
     else
         echo "  http://www.openbsd.org/faq/upgrade${FILE_VER}.html"