From 3f220f286369614abdafe5e63660f8c40453a721 Mon Sep 17 00:00:00 2001
From: Jan F <jfch@kerberos.example.com>
Date: Mar 31 2011 19:48:35 +0000
Subject: resolve warnings in port_linux.c


---

diff --git a/openssh-5.8p1-pwchange.patch b/openssh-5.8p1-pwchange.patch
new file mode 100644
index 0000000..07971c2
--- /dev/null
+++ b/openssh-5.8p1-pwchange.patch
@@ -0,0 +1,21 @@
+diff -up openssh-5.8p1/session.c.pwchange openssh-5.8p1/session.c
+--- openssh-5.8p1/session.c.pwchange	2011-03-31 17:54:18.637695183 +0200
++++ openssh-5.8p1/session.c	2011-03-31 17:56:12.281684766 +0200
+@@ -1552,12 +1552,17 @@ do_pwchange(Session *s)
+ 	if (s->ttyfd != -1) {
+ 		fprintf(stderr,
+ 		    "You must change your password now and login again!\n");
++#ifdef __linux__
++		execl("/bin/sh", "sh", "-c", "passwd", 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,
diff --git a/openssh.spec b/openssh.spec
index 7a275ef..a6616e0 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -152,6 +152,8 @@ Patch34: openssh-5.8p1-kuserok.patch
 #http://cvsweb.netbsd.org/cgi-bin/cvsweb.cgi/src/crypto/dist/ssh/Attic/sftp-glob.c.diff?r1=1.13&r2=1.13.12.1&f=h
 Patch35: openssh-5.8p1-glob.patch
 #?
+Patch36: openssh-5.8p1-pwchange.patch
+#?
 Patch50: openssh-5.8p1-fips.patch
 #https://bugzilla.mindrot.org/show_bug.cgi?id=1789
 Patch51: openssh-5.5p1-x11.patch