rpms/rsh/FC-6 netkit-rsh-0.17-pam_env.patch, NONE, 1.1 rsh.spec, 1.32, 1.33

[fedora-cvs-commits at redhat.com]

Author: atkac

Update of /cvs/dist/rpms/rsh/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv9972/rsh/FC-6

Modified Files:
	rsh.spec 
Added Files:
	netkit-rsh-0.17-pam_env.patch 
Log Message:
rhs now loads pam_env.conf (#218024)


netkit-rsh-0.17-pam_env.patch:
 rshd.c |   14 ++++++++++++++
 1 files changed, 14 insertions(+)

--- NEW FILE netkit-rsh-0.17-pam_env.patch ---
--- netkit-rsh-0.17/rshd/rshd.c.pam_env	2006-12-12 12:32:31.000000000 +0100
+++ netkit-rsh-0.17/rshd/rshd.c	2006-12-12 12:48:21.000000000 +0100
@@ -375,6 +375,10 @@
 	const char *hostname;
 	u_short port;
 	int pv[2], pid, ifd;
+#ifdef USE_PAM
+        char** env;
+        int i;
+#endif
 
 	signal(SIGINT, SIG_DFL);
 	signal(SIGQUIT, SIG_DFL);
@@ -522,6 +526,16 @@
 	shellname = strrchr(theshell, '/');
 	if (shellname) shellname++;
 	else shellname = theshell;
+#ifdef USE_PAM
+        env = pam_getenvlist(pamh);
+        if (NULL != env) {
+            for(i = 0; env[i]; i++) {
+                putenv(env[i]);
+                free(env[i]);
+            }
+            free(env);
+          }
+#endif
 
 	endpwent();
 	if (paranoid) {


Index: rsh.spec
===================================================================
RCS file: /cvs/dist/rpms/rsh/FC-6/rsh.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- rsh.spec	24 Oct 2006 09:41:57 -0000	1.32
+++ rsh.spec	13 Dec 2006 10:07:31 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: Clients for remote access commands (rsh, rlogin, rcp).
 Name: rsh
 Version: 0.17
-Release: 37%{?dist}
+Release: 38%{?dist}
 License: BSD
 Group: Applications/Internet
 
@@ -50,6 +50,7 @@
 Patch28: netkit-rsh-0.17-pam-rhost.patch
 Patch29: netkit-rsh-0.17-rlogin-linefeed.patch
 Patch30: netkit-rsh-0.17-ipv6.patch
+Patch31: netkit-rsh-0.17-pam_env.patch
 
 %description
 The rsh package contains a set of programs which allow users to run
@@ -112,6 +113,7 @@
 %patch28 -p1 -b .pam-rhost
 %patch29 -p1 -b .linefeed
 %patch30 -p1 -b .ipv6
+%patch31 -p1 -b .pam_env
 
 # No, I don't know what this is doing in the tarball.
 rm -f rexec/rexec
@@ -180,6 +182,9 @@
 %{_mandir}/man8/*.8*
 
 %changelog
+* Wed Dec 13 2006 Adam Tkac <atkac redhat com> 0.17-38.fc6
+- rsh now loads oprions from pam_env.conf file correctly
+
 * Tue Oct 24 2006 Adam Tkac <atkac at redhat.com> 0.17-37
 - added xinetd dependency to rsh-server