Author: Mattia Monga <monga@debian.org>
--- a/configure.in
+++ b/configure.in
@@ -419,7 +419,7 @@
 	    SSLDIR=/usr
 	fi
 	EXTRA_LIBS="$EXTRA_LIBS -L$SSLDIR/lib -lssl -lcrypto"
-	IMAPFLAGS="SSLTYPE=unix SSLDIR=$SSLDIR"
+	IMAPFLAGS="SSLTYPE=nopwd SSLDIR=$SSLDIR"
 	AC_SUBST(SSLDIR)
     else
 
@@ -699,7 +699,7 @@
 	SHLIB_SUFFIX=".so"
 	OSTYPE=sg6
 	;;
-    Linux*)
+    Linux*|GNU*)
 	SHLIB_CFLAGS="-fPIC"
 	SHLIB_LD_LIBS=""
 	SHLIB_SUFFIX=".so"
@@ -710,7 +710,7 @@
 	fi
 	AC_CHECK_LIB(pam, pam_start, have_pam=yes, have_pam=no, -lpam_misc)
 	if test "$have_pam" = yes ; then
-	    	OSTYPE=lnp
+	    	OSTYPE=ldb
 		EXTRA_LIBS="$EXTRA_LIBS -L$SSLDIR/lib -lpam -lpam_misc"
 	else
 		if test "$have_libcrypt" = yes ; then