[src/netbsd-8]: src/usr.sbin/inetd Pull up following revision(s) (requested b...

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

details:   https://anonhg.NetBSD.org/src/rev/69026b2907d9
branches:  netbsd-8
changeset: 434344:69026b2907d9
user:      snj <snj%NetBSD.org@localhost>
date:      Sat Oct 21 19:56:06 2017 +0000

description:
Pull up following revision(s) (requested by ozaki-r in ticket #331):
        usr.sbin/inetd/inetd.c: revision 1.124
Don't setup SPs if no policy sepecifier is specified
We expect that SPs are set up iff some policy sepecifier(s) are specified.
Found on investigating an issue reported by Robert Swindells

diffstat:

 usr.sbin/inetd/inetd.c |  21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diffs (42 lines):

diff -r d64750c68353 -r 69026b2907d9 usr.sbin/inetd/inetd.c
--- a/usr.sbin/inetd/inetd.c    Sat Oct 21 19:43:53 2017 +0000
+++ b/usr.sbin/inetd/inetd.c    Sat Oct 21 19:56:06 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: inetd.c,v 1.123 2017/02/15 02:48:31 elric Exp $        */
+/*     $NetBSD: inetd.c,v 1.123.4.1 2017/10/21 19:56:06 snj Exp $      */
 
 /*-
  * Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
 #if 0
 static char sccsid[] = "@(#)inetd.c    8.4 (Berkeley) 4/13/94";
 #else
-__RCSID("$NetBSD: inetd.c,v 1.123 2017/02/15 02:48:31 elric Exp $");
+__RCSID("$NetBSD: inetd.c,v 1.123.4.1 2017/10/21 19:56:06 snj Exp $");
 #endif
 #endif /* not lint */
 
@@ -1088,13 +1088,16 @@
        }
 #endif
 #ifdef IPSEC
-       if (ipsecsetup(sep->se_family, sep->se_fd, sep->se_policy) < 0 &&
-           sep->se_policy) {
-               syslog(LOG_ERR, "%s/%s: ipsec setup failed",
-                   sep->se_service, sep->se_proto);
-               (void)close(sep->se_fd);
-               sep->se_fd = -1;
-               return;
+       /* Avoid setting a policy if a policy specifier doesn't exist. */
+       if (sep->se_policy != NULL) {
+               int e = ipsecsetup(sep->se_family, sep->se_fd, sep->se_policy);
+               if (e < 0) {
+                       syslog(LOG_ERR, "%s/%s: ipsec setup failed",
+                           sep->se_service, sep->se_proto);
+                       (void)close(sep->se_fd);
+                       sep->se_fd = -1;
+                       return;
+               }
        }
 #endif