[src/trunk]: src/external/bsd/blacklist/diff fix fd leak

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/11201223e639
branches:  trunk
changeset: 343239:11201223e639
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Jan 26 02:54:25 2016 +0000

description:
fix fd leak

diffstat:

 external/bsd/blacklist/diff/proftpd.diff |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (42 lines):

diff -r 494433fa4233 -r 11201223e639 external/bsd/blacklist/diff/proftpd.diff
--- a/external/bsd/blacklist/diff/proftpd.diff  Tue Jan 26 01:09:56 2016 +0000
+++ b/external/bsd/blacklist/diff/proftpd.diff  Tue Jan 26 02:54:25 2016 +0000
@@ -1,15 +1,14 @@
---- Make.rules.in.orig 2016-01-22 17:33:49.000000000 -0500
-+++ Make.rules.in      2016-01-22 17:33:41.000000000 -0500
+--- Make.rules.in.orig 2015-05-27 20:25:54.000000000 -0400
++++ Make.rules.in      2016-01-25 21:48:47.000000000 -0500
 @@ -110,3 +110,8 @@
+ 
  FTPWHO_OBJS=ftpwho.o scoreboard.o misc.o
  BUILD_FTPWHO_OBJS=utils/ftpwho.o utils/scoreboard.o utils/misc.o
- 
++
 +CPPFLAGS+=-DHAVE_BLACKLIST
 +LIBS+=-lblacklist
 +OBJS+= pfilter.o
 +BUILD_OBJS+= src/pfilter.o
-+
-
 --- /dev/null  2016-01-22 17:30:55.000000000 -0500
 +++ include/pfilter.h  2016-01-22 16:18:33.000000000 -0500
 @@ -0,0 +1,3 @@
@@ -81,7 +80,7 @@
    /* Child is running here */
 --- /dev/null  2016-01-22 17:30:55.000000000 -0500
 +++ src/pfilter.c      2016-01-22 16:37:55.000000000 -0500
-@@ -0,0 +1,40 @@
+@@ -0,0 +1,41 @@
 +#include "pfilter.h"
 +#include "conf.h"
 +#include "privs.h"
@@ -95,7 +94,8 @@
 +pfilter_init(void)
 +{
 +#ifdef HAVE_BLACKLIST
-+      blstate = blacklist_open();
++      if (blstate == NULL)
++              blstate = blacklist_open();
 +#endif
 +}
 +