fd leak in cfexecd

[Michael Santos]

Anyone else seeing fd leaks in cfexecd?

Version: cfengine 2.0.8p1, db 4.1.25, openssl 0.96g+patches

Platforms: Solaris 8, NetBSD 1.5.4, Linux (Redhat 7.2/Debian Woody).

e.g.,

--cut
# uname -sr
SunOS 5.8

# pfiles $(pgrep cfexecd)
18675:  /usr/pkg/sbin/cfexecd
  Current rlimit: 1024 file descriptors
   0: S_IFCHR mode:0666 dev:194,0 ino:439367 uid:0 gid:3 rdev:13,2
      O_RDWR
   1: S_IFCHR mode:0666 dev:194,0 ino:439367 uid:0 gid:3 rdev:13,2
      O_RDWR
   2: S_IFCHR mode:0666 dev:194,0 ino:439367 uid:0 gid:3 rdev:13,2
      O_RDWR
   3: S_IFDOOR mode:0444 dev:257,0 ino:59149 uid:0 gid:0 size:0
      O_RDONLY|O_LARGEFILE FD_CLOEXEC  door to nscd[631]
   4: S_IFREG mode:0600 dev:194,6 ino:439438 uid:0 gid:1 size:896
      O_RDONLY
   5: S_IFSOCK mode:0666 dev:252,0 ino:38748 uid:0 gid:0 size:0
      O_RDWR
        sockname: AF_INET x.x.x.35  port: 42835
        peername: AF_INET y.y.y.9  port: 25
  <...>
  24: S_IFREG mode:0600 dev:194,6 ino:439468 uid:0 gid:1 size:896
      O_RDONLY
  25: S_IFSOCK mode:0666 dev:252,0 ino:44010 uid:0 gid:0 size:0
      O_RDWR
        sockname: AF_INET x.x.x.35  port: 51681
        peername: AF_INET y.y.y.9  port: 25
--cut

Patch below.

Thanks,
-- 
Michael Santos <address@hidden>
Unix Administrator/MIST Inc.


--- src/cfexecd.c-orig  2003-10-28 11:20:43.000000000 -0500
+++ src/cfexecd.c       2003-10-28 13:59:39.000000000 -0500
@@ -923,4 +923,6 @@
 Dialogue(sd,"QUIT\r\n");
 Debug("Done sending mail\n");
+fclose(fp);
+close(sd);
 return;