Index: fetchmail-5.6.0/configure
diff -u fetchmail-5.6.0/configure:1.1.1.1 fetchmail-5.6.0/configure:1.2
--- fetchmail-5.6.0/configure:1.1.1.1	Mon Feb 26 15:20:11 2001
+++ fetchmail-5.6.0/configure	Fri May  4 16:51:29 2001
@@ -4872,14 +4872,7 @@
 fi
 rm -f conftest*
 
-# Find the right directory to put the root-mode PID file in
-for dir in "/var/run" "/etc"
-do
-	if test -d $dir 
-	then
-		break;
-	fi
-done
+dir="/etc"
 echo "$ac_t""root-mode pid file will go in $dir" 1>&6
 cat >> confdefs.h <<EOF
 #define PID_DIR "$dir"
Index: fetchmail-5.6.0/configure.in
diff -u fetchmail-5.6.0/configure.in:1.1.1.1 fetchmail-5.6.0/configure.in:1.3
--- fetchmail-5.6.0/configure.in:1.1.1.1	Mon Feb 26 15:20:11 2001
+++ fetchmail-5.6.0/configure.in	Fri May  4 16:51:29 2001
@@ -203,14 +203,7 @@
   [AC_DEFINE(SYS_SIGLIST_DECLARED) AC_MSG_RESULT(yes)],
   AC_MSG_RESULT(no))
 
-# Find the right directory to put the root-mode PID file in
-for dir in "/var/run" "/etc"
-do
-	if test -d $dir 
-	then
-		break;
-	fi
-done
+dir="/etc"
 AC_MSG_RESULT(root-mode pid file will go in $dir)
 AC_DEFINE_UNQUOTED(PID_DIR, "$dir")
 
@@ -590,7 +583,7 @@
 	# and let VPATH do all the dirty work when we build remotely
 	echo "You can ignore any makedepend error messages:";
 	echo timestamp > stamp-h;
-	(cd $srcdir; makedepend -f - *.c) >>Makefile])
+	])
 
 dnl Local Variables:
 dnl comment-start: "dnl "
Index: fetchmail-5.6.0/fetchmailconf
diff -u fetchmail-5.6.0/fetchmailconf:1.1.1.1 fetchmail-5.6.0/fetchmailconf:1.2
--- fetchmail-5.6.0/fetchmailconf:1.1.1.1	Mon Feb 26 15:20:11 2001
+++ fetchmail-5.6.0/fetchmailconf	Mon Feb 26 15:30:13 2001
@@ -110,7 +110,7 @@
 	    ('plugin',   'String'),
 	    ('plugout',  'String'),
 	    ('netsec',   'String'),
-	    ('principal',   'String')),
+	    ('principal',   'String'))
 
     def dump(self, folded):
 	res = ""
Index: fetchmail-5.6.0/imap.c
diff -u fetchmail-5.6.0/imap.c:1.1.1.1 fetchmail-5.6.0/imap.c:1.2
--- fetchmail-5.6.0/imap.c:1.1.1.1	Mon Feb 26 15:20:12 2001
+++ fetchmail-5.6.0/imap.c	Mon Feb 26 15:27:30 2001
@@ -827,13 +827,11 @@
     strcat (buf1, "\r\n");
     SockWrite (sock, buf1, strlen (buf1));
 
-    if ((result = gen_recv (sock, buf1, sizeof (buf1))))
-	return result;
-
-    if (strstr (buf1, "OK")) {
-        return PS_SUCCESS;
+    result = imap_ok (sock, NULL);
+    if (result == PS_SUCCESS) {
+        return result;
     } else {
-	return PS_AUTHFAIL;
+        return PS_AUTHFAIL;
     }
 }