Attachment #2030 for bug #1891




	if (s->ttyfd != -1) {
		fprintf(stderr,
		    "You must change your password now and login again!\n");
#ifdef __linux__
		execl("/bin/sh", "sh", "-c", _PATH_PASSWD_PROG, s->pw->pw_name,
		    (char *)NULL);
#else
#ifdef PASSWD_NEEDS_USERNAME
		execl(_PATH_PASSWD_PROG, "passwd", s->pw->pw_name,
		    (char *)NULL);
#else
		execl(_PATH_PASSWD_PROG, "passwd", (char *)NULL);
#endif
#endif
		perror("passwd");
	} else {
		fprintf(stderr,

Return to bug 1891

Lines 1552-1563 do_pwchange(Session *s) Link Here

(-)openssh-5.8p1/session.c.pwchange (+5 lines)
1552	if (s->ttyfd != -1) {	1552	if (s->ttyfd != -1) {
1553	fprintf(stderr,	1553	fprintf(stderr,
1554	"You must change your password now and login again!\n");	1554	"You must change your password now and login again!\n");
		1555	#ifdef __linux__
		1556	execl("/bin/sh", "sh", "-c", _PATH_PASSWD_PROG, s->pw->pw_name,
		1557	(char *)NULL);
		1558	#else
1555	#ifdef PASSWD_NEEDS_USERNAME	1559	#ifdef PASSWD_NEEDS_USERNAME
1556	execl(_PATH_PASSWD_PROG, "passwd", s->pw->pw_name,	1560	execl(_PATH_PASSWD_PROG, "passwd", s->pw->pw_name,
1557	(char *)NULL);	1561	(char *)NULL);
1558	#else	1562	#else
1559	execl(_PATH_PASSWD_PROG, "passwd", (char *)NULL);	1563	execl(_PATH_PASSWD_PROG, "passwd", (char *)NULL);
1560	#endif	1564	#endif
		1565	#endif
1561	perror("passwd");	1566	perror("passwd");
1562	} else {	1567	} else {
1563	fprintf(stderr,	1568	fprintf(stderr,