Module Name: src
Committed By: christos
Date: Wed Aug 10 08:37:53 UTC 2022
Modified Files:
src/usr.sbin/inetd: inetd.c inetd.h parse.c
Log Message:
PR/56963: Mark Davies: inetd not configured for rpc
Move RPC includes to inetd.h
To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 src/usr.sbin/inetd/inetd.c
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/inetd/inetd.h
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/inetd/parse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/inetd/inetd.c
diff -u src/usr.sbin/inetd/inetd.c:1.140 src/usr.sbin/inetd/inetd.c:1.141
--- src/usr.sbin/inetd/inetd.c:1.140 Tue Aug 9 23:35:38 2022
+++ src/usr.sbin/inetd/inetd.c Wed Aug 10 04:37:53 2022
@@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#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 @@ __RCSID("$NetBSD: inetd.c,v 1.140 2022/0
#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>
Index: src/usr.sbin/inetd/inetd.h
diff -u src/usr.sbin/inetd/inetd.h:1.5 src/usr.sbin/inetd/inetd.h:1.6
--- src/usr.sbin/inetd/inetd.h:1.5 Tue Oct 12 18:51:28 2021
+++ src/usr.sbin/inetd/inetd.h Wed Aug 10 04:37:53 2022
@@ -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"
Index: src/usr.sbin/inetd/parse.c
diff -u src/usr.sbin/inetd/parse.c:1.4 src/usr.sbin/inetd/parse.c:1.5
--- src/usr.sbin/inetd/parse.c:1.4 Tue Aug 9 23:35:38 2022
+++ src/usr.sbin/inetd/parse.c Wed Aug 10 04:37:53 2022
@@ -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 @@ __RCSID("$NetBSD: parse.c,v 1.4 2022/08/
#include <syslog.h>
#include <unistd.h>
-#ifdef RPC
-#include <rpc/rpc.h>
-#endif
-
#include "inetd.h"
static void config(void);
