From e4aceb74a25384898dcfb13addba5d252561123b Mon Sep 17 00:00:00 2001
From: kzak <kzak@fedoraproject.org>
Date: Feb 09 2006 13:22:25 +0000
Subject: rlogind fix


---

diff --git a/netkit-rsh-0.17-rlogin-linefeed.patch b/netkit-rsh-0.17-rlogin-linefeed.patch
new file mode 100644
index 0000000..f9d2979
--- /dev/null
+++ b/netkit-rsh-0.17-rlogin-linefeed.patch
@@ -0,0 +1,22 @@
+--- netkit-rsh-0.17/rlogind/sockconv.c.linefeed	2006-02-09 14:10:27.000000000 +0100
++++ netkit-rsh-0.17/rlogind/sockconv.c	2006-02-09 14:11:06.000000000 +0100
+@@ -126,16 +126,16 @@
+       }
+       break;
+     case PAM_ERROR_MSG:
+-      fprintf(stderr,"%s\n",msgm[replies]->msg);
++      fprintf(stderr,"%s\r\n",msgm[replies]->msg);
+       string = NULL;
+       
+       break;
+     case PAM_TEXT_INFO:
+-      fprintf(stderr,"%s\n",msgm[replies]->msg);
++      fprintf(stderr,"%s\r\n",msgm[replies]->msg);
+       string = NULL;
+       break;
+     default:
+-      fprintf(stderr, "erroneous conversation (%d)\n"
++      fprintf(stderr, "erroneous conversation (%d)\r\n"
+ 	      ,msgm[replies]->msg_style);
+       drop_reply(reply,replies);
+       return (PAM_CONV_ERR);
diff --git a/rsh.spec b/rsh.spec
index 2b95f5b..ce5a05e 100644
--- a/rsh.spec
+++ b/rsh.spec
@@ -1,7 +1,7 @@
 Summary: Clients for remote access commands (rsh, rlogin, rcp).
 Name: rsh
 Version: 0.17
-Release: 33.2
+Release: 34
 License: BSD
 Group: Applications/Internet
 
@@ -46,6 +46,7 @@ Patch25: netkit-rsh-0.17-checkdir.patch
 Patch26: netkit-rsh-0.17-pam-conv.patch
 Patch27: netkit-rsh-0.17-rcp-largefile.patch
 Patch28: netkit-rsh-0.17-pam-rhost.patch
+Patch29: netkit-rsh-0.17-rlogin-linefeed.patch
 
 %description
 The rsh package contains a set of programs which allow users to run
@@ -106,7 +107,7 @@ from other machines.
 %patch26 -p1 -b .pam-conv
 %patch27 -p1 -b .largefile
 %patch28 -p1 -b .pam-rhost
-
+%patch29 -p1 -b .linefeed
 
 # No, I don't know what this is doing in the tarball.
 rm -f rexec/rexec
@@ -175,10 +176,13 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/*.8*
 
 %changelog
-* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 0.17-33.2
+* Thu Feb  9 2006 Karel Zak <kzak@redhat.com> 0.17-34
+- fix #178916 - Line feeds when password needs changing with rlogin
+
+* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> 0.17-33.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
-* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
+* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com> 0.17-33.1
 - rebuilt
 
 * Mon Nov 28 2005 Karel Zak <kzak@redhat.com> 0.17-33
@@ -324,7 +328,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - expunge all mentions of kerberos authentication or DES encryption using
   kerberos from the man pages
 
-* Thu May 25 2000 Trond Eivind Glomsr�d <teg@redhat.com>
+* Thu May 25 2000 Trond Eivind Glomsrod <teg@redhat.com>
 - switched to xinetd
 
 * Tue Mar  7 2000 Jeff Johnson <jbj@redhat.com>