--- openssh-3.7.1p2/configure	Tue Sep 23 11:55:43 2003
+++ openssh/configure	Thu Sep 25 14:55:34 2003
@@ -3587,10 +3587,6 @@
 EOF
 
 	cat >>confdefs.h <<\EOF
-#define DISABLE_SHADOW 1
-EOF
-
-	cat >>confdefs.h <<\EOF
 #define DISABLE_UTMP 1
 EOF
 
@@ -3687,10 +3683,6 @@
 EOF
 
 	cat >>confdefs.h <<\EOF
-#define DISABLE_SHADOW 1
-EOF
-
-	cat >>confdefs.h <<\EOF
 #define DISABLE_UTMP 1
 EOF
 
@@ -3784,10 +3776,6 @@
 
 	cat >>confdefs.h <<\EOF
 #define LOGIN_NEEDS_UTMPX 1
-EOF
-
-	cat >>confdefs.h <<\EOF
-#define DISABLE_SHADOW 1
 EOF
 
 	cat >>confdefs.h <<\EOF
--- openssh-3.7.1p2/openbsd-compat/xcrypt.c	Sun Sep  7 01:43:42 2003
+++ openssh/openbsd-compat/xcrypt.c	Thu Sep 25 14:55:34 2003
@@ -104,10 +104,6 @@
 
 	if (spw != NULL)
 		pw_password = spw->ufld.fd_encrypt;
-# elif defined(__hpux) && !defined(HAVE_SECUREWARE)
-	struct pr_passwd *spw;
-        if (iscomsec() && (spw = getprpwnam(pw->pw_name)) != NULL)
-                pw_password = spw->ufld.fd_encrypt;
 # endif
 
 	return pw_password;
