totalsize, ok niels,aaron
- Delay fork (-f option) in ssh until after port forwarded connections
have been initialised. Patch from Jani Hakala <jahakala@cc.jyu.fi>
+ - Added shadow password patch from Thomas Neumann <tom@smart.ruhr.de>
+ - Added ifdefs to auth-passwd.c to exclude it when PAM is enabled
19991112
- Merged changes from OpenBSD CVS
Phil Hands <phil@hands.com> - Debian scripts, assorted patches
Niels Kristian Bech Jensen <nkbj@image.dk> - Makefile patches
Marc G. Fournier <marc.fournier@acadiau.ca> - Solaris patches
+Thomas Neumann <tom@smart.ruhr.de> - Shadow passwords
Miscellania -
#include "ssh.h"
#include "servconf.h"
#include "xmalloc.h"
+#include "config.h"
+
+#ifdef HAVE_SHADOW_H
+#include <shadow.h>
+#endif
+
+#ifndef HAVE_PAM
+/* Don't need anything from here if we are using PAM */
/* Tries to authenticate the user using password. Returns true if
authentication succeeds. */
{
extern ServerOptions options;
char *encrypted_password;
+#ifdef HAVE_SHADOW_H
+ struct spwd *spw;
+#endif
if (pw->pw_uid == 0 && options.permit_root_login == 2)
{
return 1; /* The user has no password and an empty password was tried. */
}
+#ifdef HAVE_SHADOW_H
+ spw = getspnam(pw->pw_name);
+ if (spw == NULL)
+ return(0);
+
+ if ((spw->sp_namp == NULL) || (strcmp(pw->pw_name, spw->sp_namp) != 0))
+ fatal("Shadow lookup returned garbage.");
+
+ if (strlen(spw->sp_pwdp) < 3)
+ return(0);
+
+ /* Encrypt the candidate password using the proper salt. */
+ encrypted_password = crypt(password, spw->sp_pwdp);
+
+ /* Authentication is accepted if the encrypted passwords are identical. */
+ return (strcmp(encrypted_password, spw->sp_pwdp) == 0);
+#else /* !HAVE_SHADOW_H */
+
/* Encrypt the candidate password using the proper salt. */
encrypted_password = crypt(password,
(pw->pw_passwd[0] && pw->pw_passwd[1]) ?
pw->pw_passwd : "xx");
-
/* Authentication is accepted if the encrypted passwords are identical. */
return (strcmp(encrypted_password, pw->pw_passwd) == 0);
+#endif /* !HAVE_SHADOW_H */
}
+
+#endif /* !HAVE_PAM */
AC_CHECK_LIB(pam, pam_authenticate, , )
dnl Checks for header files.
-AC_CHECK_HEADERS(pty.h endian.h paths.h lastlog.h)
+AC_CHECK_HEADERS(pty.h endian.h paths.h lastlog.h shadow.h)
dnl Checks for library functions.
AC_PROG_GCC_TRADITIONAL