[src/trunk]: src/usr.sbin/inetd PR/56963: Mark Davies: inetd not configured f...

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

details:   https://anonhg.NetBSD.org/src/rev/be94fd4a7dcd
branches:  trunk
changeset: 368879:be94fd4a7dcd
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Aug 10 08:37:53 2022 +0000

description:
PR/56963: Mark Davies: inetd not configured for rpc
Move RPC includes to inetd.h

diffstat:

 usr.sbin/inetd/inetd.c |  12 ++----------
 usr.sbin/inetd/inetd.h |  14 +++++++++++++-
 usr.sbin/inetd/parse.c |   8 ++------
 3 files changed, 17 insertions(+), 17 deletions(-)

diffs (90 lines):

diff -r 16f64b37a679 -r be94fd4a7dcd usr.sbin/inetd/inetd.c
--- a/usr.sbin/inetd/inetd.c    Wed Aug 10 03:35:38 2022 +0000
+++ b/usr.sbin/inetd/inetd.c    Wed Aug 10 08:37:53 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: inetd.c,v 1.140 2022/08/10 03:35:38 dholland Exp $     */
+/*     $NetBSD: inetd.c,v 1.141 2022/08/10 08:37:53 christos 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.140 2022/08/10 03:35:38 dholland Exp $");
+__RCSID("$NetBSD: inetd.c,v 1.141 2022/08/10 08:37:53 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -193,14 +193,6 @@
 #include <sys/socket.h>
 #include <sys/queue.h>
 
-#include <net/if.h>
-
-#ifdef RPC
-#include <rpc/rpc.h>
-#include <rpc/rpcb_clnt.h>
-#include <netconfig.h>
-#endif
-
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
diff -r 16f64b37a679 -r be94fd4a7dcd usr.sbin/inetd/inetd.h
--- a/usr.sbin/inetd/inetd.h    Wed Aug 10 03:35:38 2022 +0000
+++ b/usr.sbin/inetd/inetd.h    Wed Aug 10 08:37:53 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: inetd.h,v 1.5 2021/10/12 22:51:28 rillig Exp $ */
+/*     $NetBSD: inetd.h,v 1.6 2022/08/10 08:37:53 christos Exp $       */
 
 /*-
  * Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -73,6 +73,18 @@
 #include <netdb.h>
 #include <stdbool.h>
 
+#ifndef NO_RPC
+#define RPC
+#endif
+
+#include <net/if.h>
+
+#ifdef RPC
+#include <rpc/rpc.h>
+#include <rpc/rpcb_clnt.h>
+#include <netconfig.h>
+#endif
+
 
 #include "pathnames.h"
 
diff -r 16f64b37a679 -r be94fd4a7dcd usr.sbin/inetd/parse.c
--- a/usr.sbin/inetd/parse.c    Wed Aug 10 03:35:38 2022 +0000
+++ b/usr.sbin/inetd/parse.c    Wed Aug 10 08:37:53 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: parse.c,v 1.4 2022/08/10 03:35:38 dholland Exp $       */
+/*     $NetBSD: parse.c,v 1.5 2022/08/10 08:37:53 christos Exp $       */
 
 /*-
  * Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
 #if 0
 static char sccsid[] = "@(#)inetd.c    8.4 (Berkeley) 4/13/94";
 #else
-__RCSID("$NetBSD: parse.c,v 1.4 2022/08/10 03:35:38 dholland Exp $");
+__RCSID("$NetBSD: parse.c,v 1.5 2022/08/10 08:37:53 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -91,10 +91,6 @@
 #include <syslog.h>
 #include <unistd.h>
 
-#ifdef RPC
-#include <rpc/rpc.h>
-#endif
-
 #include "inetd.h"
 
 static void    config(void);