[rsh] Remove unneeded setpwent/endpwent calls.

Adam Tkac atkac at fedoraproject.org
Wed Oct 26 15:52:46 UTC 2011


commit 78673969b6b21fba860ec2f29d863ab7c2842cb9
Author: Adam Tkac <atkac at redhat.com>
Date:   Wed Oct 26 17:51:37 2011 +0200

    Remove unneeded setpwent/endpwent calls.
    
    Signed-off-by: Adam Tkac <atkac at redhat.com>

 netkit-rsh-0.17-rh710987.patch |   19 +++++++++++++++++++
 rsh.spec                       |    7 ++++++-
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/netkit-rsh-0.17-rh710987.patch b/netkit-rsh-0.17-rh710987.patch
new file mode 100644
index 0000000..c614cc9
--- /dev/null
+++ b/netkit-rsh-0.17-rh710987.patch
@@ -0,0 +1,19 @@
+diff -up netkit-rsh-0.17/rshd/rshd.c.rh710987 netkit-rsh-0.17/rshd/rshd.c
+--- netkit-rsh-0.17/rshd/rshd.c.rh710987	2011-10-26 17:49:22.559772285 +0200
++++ netkit-rsh-0.17/rshd/rshd.c	2011-10-26 17:49:29.229771822 +0200
+@@ -487,7 +487,6 @@ doit(struct sockaddr_storage *fromp, soc
+ 	hostname = findhostname((struct sockaddr *)fromp, fromlen,
+ 		remuser, locuser, cmdbuf);
+ 
+-	setpwent();
+ 	pwd = doauth(remuser, hostname, locuser);
+ 	if (pwd == NULL) {
+ 		if (log_audit(remuser, -1, hostname, 0) > 0) {
+@@ -600,7 +599,6 @@ doit(struct sockaddr_storage *fromp, soc
+ 			putenv(env[i]);
+ #endif
+ 
+-	endpwent();
+ 	if (paranoid) {
+ 	    syslog(LOG_INFO|LOG_AUTH, "%s@%s as %s: cmd='%s'",
+ 		   remuser, hostname, locuser, cmdbuf);
diff --git a/rsh.spec b/rsh.spec
index 851fc4d..8ad2921 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: 65%{?dist}
+Release: 66%{?dist}
 License: BSD
 Group: Applications/Internet
 
@@ -77,6 +77,7 @@ Patch38: netkit-rsh-0.17-rh448904.patch
 Patch39: netkit-rsh-0.17-rh461903.patch
 Patch40: netkit-rsh-0.17-rh473492.patch
 Patch41: netkit-rsh-0.17-rh650119.patch
+Patch42: netkit-rsh-0.17-rh710987.patch
 
 %description
 The rsh package contains a set of programs which allow users to run
@@ -143,6 +144,7 @@ from other machines
 %patch39 -p1 -b .rh461903
 %patch40 -p1 -b .rh473492
 %patch41 -p1 -b .rh650119
+%patch42 -p1 -b .rh710987
 
 # No, I don't know what this is doing in the tarball.
 rm -f rexec/rexec
@@ -212,6 +214,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/*.8*
 
 %changelog
+* Wed Oct 26 2011 Adam Tkac <atkac redhat com> - 0.17-66
+- remove unneeded setpwent/endpwent calls
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.17-65
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list