View | Details | Raw Unified | Return to bug 633 | Differences between
and this patch

Collapse All | Expand All

(-)configure.ac (-1 lines)
Lines 170-176 main() { if (NSVersionOfRunTimeLibrary(" Link Here
170
	AC_DEFINE(USE_PIPES)
170
	AC_DEFINE(USE_PIPES)
171
	AC_DEFINE(LOGIN_NO_ENDOPT)
171
	AC_DEFINE(LOGIN_NO_ENDOPT)
172
	AC_DEFINE(LOGIN_NEEDS_UTMPX)
172
	AC_DEFINE(LOGIN_NEEDS_UTMPX)
173
	AC_DEFINE(DISABLE_SHADOW)
174
	AC_DEFINE(DISABLE_UTMP)
173
	AC_DEFINE(DISABLE_UTMP)
175
	AC_DEFINE(LOCKED_PASSWD_STRING, "*")
174
	AC_DEFINE(LOCKED_PASSWD_STRING, "*")
176
	AC_DEFINE(SPT_TYPE,SPT_PSTAT)
175
	AC_DEFINE(SPT_TYPE,SPT_PSTAT)
(-)openbsd-compat/xcrypt.c (-4 / +7 lines)
Lines 104-113 shadow_pw(struct passwd *pw) Link Here
104
104
105
	if (spw != NULL)
105
	if (spw != NULL)
106
		pw_password = spw->ufld.fd_encrypt;
106
		pw_password = spw->ufld.fd_encrypt;
107
# elsif defined(__hpux) && !defined(HAVE_SECUREWARE)
107
# elsif defined(__hpux) && !defined(HAVE_SECUREWARE) && defined(DISABLE_SHADOW)
108
	struct pr_passwd *spw;
108
        if (iscomsec()) {
109
        if (iscomsec() && (spw = getprpwnam(pw->pw_name)) != NULL)
109
		struct pr_passwd *spw;
110
                pw_password = spw->ufld.fd_encrypt;
110
111
		if ((spw = getprpwnam(pw->pw_name)) != NULL)
112
			pw_password = spw->ufld.fd_encrypt;
113
	}
111
# endif
114
# endif
112
115
113
	return pw_password;
116
	return pw_password;

Return to bug 633