20000520
- Xauth fix from Markus Friedl <markus.friedl@informatik.uni-erlangen.de>
- Don't touch utmp if USE_UTMPX defined
+ - SunOS 4.x support from Todd C. Miller <Todd.Miller@courtesan.com>
20000518
- Include Andre Lucas' fixprogs script. Forgot to "cvs add" it yesterday
/* Define if you want have trusted HPUX */
#undef HAVE_HPUX_TRUSTED_SYSTEM_PW
+/* Define if you have getpwanam(3) [SunOS 4.x] */
+#undef HAVE_GETPWANAM
+
/* Defined if in_systm.h needs to be included with netinet/ip.h (HPUX - <sigh/>) */
#undef NEED_IN_SYSTM_H
#ifdef HAVE_SHADOW_H
# include <shadow.h>
#endif
+#ifdef HAVE_GETPWANAM
+# include <sys/label.h>
+# include <sys/audit.h>
+# include <pwdadj.h>
+#endif
#if defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT)
# include "md5crypt.h"
#endif /* defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT) */
#ifdef HAVE_SHADOW_H
struct spwd *spw;
#endif
+#ifdef HAVE_GETPWANAM
+ struct passwd_adjunct *spw;
+#endif
#ifdef WITH_AIXAUTHENTICATE
char *authmsg;
char *loginmsg;
pw_password = spw->sp_pwdp;
}
#endif /* defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW) */
+#if defined(HAVE_GETPWANAM) && !defined(DISABLE_SHADOW)
+ if (issecure() && (spw = getpwanam(pw->pw_name)) != NULL)
+ {
+ /* Check for users with no password. */
+ if (strcmp(password, "") == 0 && strcmp(spw->pwa_passwd, "") == 0)
+ return 1;
+
+ pw_password = spw->pwa_passwd;
+ }
+#endif /* defined(HAVE_GETPWANAM) && !defined(DISABLE_SHADOW) */
if (pw_password[0] != '\0')
salt = pw_password;
#include <stdio.h>
#include <string.h>
+#ifdef USER_PROCESS
/*
* find first matching slot in utmp, or "-1" for none
*
#endif
return(-1);
}
+#else
+int find_tty_slot( utp )
+struct utmp * utp;
+{
+ return(ttyslot());
+}
+#endif
#if defined(HAVE_UTMPX_H) && defined(USE_UTMPX)
void
need_dash_r=1
AC_DEFINE(USE_UTMPX)
;;
+*-*-sunos4*)
+ CFLAGS="$CFLAGS -DSUNOS4"
+ AC_CHECK_FUNCS(getpwanam)
+ ;;
*-*-sysv*)
CFLAGS="$CFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib"
# Version of OpenSSH
-%define oversion 2.1.0p1
+%define oversion 2.1.0p2
# Version of ssh-askpass
%define aversion 1.0
Summary: OpenSSH, a free Secure Shell (SSH) implementation
Name: openssh
-Version: 2.1.0p1
+Version: 2.1.0p2
URL: http://www.openssh.com/
Release: 1
Source0: openssh-%{version}.tar.gz