Attachment 385 Details for Bug 633 – Remove DISABLE_SHADOW for HP-UX 11.x, fix brackets.

[patch] Remove DISABLE_SHADOW for HP-UX 11.x, fix brackets.

openssh-hpux-iscomsec.patch (text/plain), 1.46 KB, created by Darren Tucker on 2003-09-05 19:49:01 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2003-09-05 19:49:01 AEST

Size: 1.46 KB

patch

obsolete

>Index: configure.ac
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/configure.ac,v
>retrieving revision 1.143
>diff -u -p -r1.143 configure.ac
>--- configure.ac	26 Aug 2003 01:58:16 -0000	1.143
>+++ configure.ac	5 Sep 2003 08:43:41 -0000
>@@ -170,7 +170,6 @@ main() { if (NSVersionOfRunTimeLibrary("
> 	AC_DEFINE(USE_PIPES)
> 	AC_DEFINE(LOGIN_NO_ENDOPT)
> 	AC_DEFINE(LOGIN_NEEDS_UTMPX)
>-	AC_DEFINE(DISABLE_SHADOW)
> 	AC_DEFINE(DISABLE_UTMP)
> 	AC_DEFINE(LOCKED_PASSWD_STRING, "*")
> 	AC_DEFINE(SPT_TYPE,SPT_PSTAT)
>Index: openbsd-compat/xcrypt.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/openbsd-compat/xcrypt.c,v
>retrieving revision 1.3
>diff -u -p -r1.3 xcrypt.c
>--- openbsd-compat/xcrypt.c	11 Aug 2003 13:00:34 -0000	1.3
>+++ openbsd-compat/xcrypt.c	5 Sep 2003 09:20:03 -0000
>@@ -104,10 +104,13 @@ shadow_pw(struct passwd *pw)
> 
> 	if (spw != NULL)
> 		pw_password = spw->ufld.fd_encrypt;
>-# elsif defined(__hpux) && !defined(HAVE_SECUREWARE)
>-	struct pr_passwd *spw;
>-        if (iscomsec() && (spw = getprpwnam(pw->pw_name)) != NULL)
>-                pw_password = spw->ufld.fd_encrypt;
>+# elsif defined(__hpux) && !defined(HAVE_SECUREWARE) && defined(DISABLE_SHADOW)
>+        if (iscomsec()) {
>+		struct pr_passwd *spw;
>+
>+		if ((spw = getprpwnam(pw->pw_name)) != NULL)
>+			pw_password = spw->ufld.fd_encrypt;
>+	}
> # endif
> 
> 	return pw_password;

Actions: View | Diff

Attachments on bug 633: 383 | 385 | 386