rpms/rarpd/devel rarpd-fd-leak.patch,NONE,1.1 rarpd.spec,1.12,1.13

[fedora-cvs-commits at redhat.com]

Author: pknirsch

Update of /cvs/dist/rpms/rarpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16873

Modified Files:
	rarpd.spec 
Added Files:
	rarpd-fd-leak.patch 
Log Message:
- Fix for leak socket descriptors (#162000)


rarpd-fd-leak.patch:
 rarpd.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE rarpd-fd-leak.patch ---
--- rarpd/rarpd.c.leak	2005-04-25 08:13:26.000000000 -0400
+++ rarpd/rarpd.c	2005-04-27 13:28:22.000000000 -0400
@@ -210,6 +210,7 @@
 			}
 		}
 	}
+	close(fd);
 }
 
 void configure()
@@ -228,12 +229,13 @@
 	d = opendir(tftp_dir);
 	if (d == NULL) {
 		syslog(LOG_ERR, "opendir: %m");
-		return 0;
+		goto done_bootable;
 	}
 	while ((dent = readdir(d)) != NULL) {
 		if (strncmp(dent->d_name, name, 8) == 0)
 			break;
 	}
+done_bootable:
 	closedir(d);
 	return dent != NULL;
 }


Index: rarpd.spec
===================================================================
RCS file: /cvs/dist/rpms/rarpd/devel/rarpd.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rarpd.spec	2 Mar 2005 16:39:49 -0000	1.12
+++ rarpd.spec	14 Jul 2005 10:25:32 -0000	1.13
@@ -1,13 +1,14 @@
 Summary: The RARP daemon.
 Name: rarpd
 Version: ss981107
-Release: 20
+Release: 21
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.inr.ac.ru/ip-routing/dhcp.bootp.rarp/rarpd-%{version}.tar.gz
 Patch0: rarpd-%{version}.patch
 Patch1: rarpd-norun.patch
 Patch2: rarpd-initscript.patch
+Patch3: rarpd-fd-leak.patch
 Prereq: /sbin/chkconfig
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 
@@ -27,6 +28,7 @@
 %patch0 -p1 -b .ss981107
 %patch1 -p1 -b .norun
 %patch2 -p1 -b .initscript
+%patch3 -p1 -b .fd-leak
 
 %build
 %ifarch s390 s390x
@@ -72,6 +74,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Thu Jul 14 2005 Phil Knirsch <pknirsch at redhat.com> ss981107-21
+- Fix for leak socket descriptors (#162000)
+
 * Wed Mar 02 2005 Phil Knirsch <pknirsch at redhat.com> ss981107-20
 - bump release and rebuild with gcc 4