D9056.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D9056.id.diff
View Options

	Index: head/usr.sbin/inetd/Makefile
	===================================================================
	--- head/usr.sbin/inetd/Makefile
	+++ head/usr.sbin/inetd/Makefile
	@@ -16,7 +16,12 @@
	CFLAGS+= -DINET6
	.endif

	-LIBADD= util wrap
	+LIBADD= util
	+
	+.if ${MK_TCP_WRAPPERS} != "no"
	+CFLAGS+= -DLIBWRAP
	+LIBADD+= wrap
	+.endif

	# XXX for src/release/picobsd
	.if !defined(RELEASE_CRUNCH)
	Index: head/usr.sbin/inetd/inetd.c
	===================================================================
	--- head/usr.sbin/inetd/inetd.c
	+++ head/usr.sbin/inetd/inetd.c
	@@ -336,9 +336,11 @@
	#ifdef LOGIN_CAP
	login_cap_t *lc = NULL;
	#endif
	+#ifdef LIBWRAP
	struct request_info req;
	int denied;
	char *service = NULL;
	+#endif
	struct sockaddr_storage peer;
	int i;
	struct addrinfo hints, *res;
	@@ -748,6 +750,7 @@
	_exit(0);
	}
	}
	+#ifdef LIBWRAP
	if (ISWRAP(sep)) {
	inetd_setproctitle("wrapping", ctrl);
	service = sep->se_server_name ?
	@@ -776,6 +779,7 @@
	(whichaf(&req) == AF_INET6) ? "6" : "");
	}
	}
	+#endif
	if (sep->se_bi) {
	(*sep->se_bi->bi_fn)(ctrl, sep);
	} else {