- (dtucker) [configure.ac session.c] Some platforms (eg some SCO) require

   the username to be passed to the passwd command when changing expired
   passwords.  ok djm@

diff --git a/ChangeLog b/ChangeLog
index 86b56d2b3b82d01f99b5349789e25118286d3e30..11c0da61cadfdb3110fc80261f38ba2fae4fc18c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,9 @@
    to resolve it for binaries other than sshd.  ok djm@
  - (dtucker) [configure.ac] Bug #854: prepend pwd to relative --with-ssl-dir
    paths.  ok djm@
+ - (dtucker) [configure.ac session.c] Some platforms (eg some SCO) require
+   the username to be passed to the passwd command when changing expired
+   passwords.  ok djm@
 
 20050208
  - (dtucker) [regress/test-exec.sh] Bug #912: Set _POSIX2_VERSION for the

diff --git a/configure.ac b/configure.ac
index 63e439ba87fa56edec2a55f6d1f12c1d31d06667..a0038ae5471accf52d283d7ee3697d4eef27efcf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -403,6 +403,7 @@ mips-sony-bsd|mips-sony-newsos4)
        AC_DEFINE(BROKEN_SETREGID)
        AC_DEFINE(WITH_ABBREV_NO_TTY)
        AC_DEFINE(BROKEN_UPDWTMPX)
+       AC_DEFINE(PASSWD_NEEDS_USERNAME, 1, [must supply username to passwd])
        AC_CHECK_FUNCS(getluid setluid)
        MANTYPE=man
        TEST_SHELL=ksh

diff --git a/session.c b/session.c
index a50bfcff7f7ab15b751a0d92903aac6a1f6f2239..1896e141feb837e58c5c955e90acc8d70db53e86 100644 (file)
--- a/session.c
+++ b/session.c
@@ -1346,7 +1346,12 @@ do_pwchange(Session *s)
        if (s->ttyfd != -1) {
                fprintf(stderr,
                    "You must change your password now and login again!\n");
+#ifdef PASSWD_NEEDS_USERNAME
+               execl(_PATH_PASSWD_PROG, "passwd", s->pw->pw_name,
+                   (char *)NULL);
+#else
                execl(_PATH_PASSWD_PROG, "passwd", (char *)NULL);
+#endif
                perror("passwd");
        } else {
                fprintf(stderr,