Changes for OS X including new file for "inetd" type operation

Makefile.in

@@ -87,34 +87,6 @@ install-daemon:
 install:
 	cd $(SRC_BASE); $(MAKE) $@
 
-install-inetd:
-	@if test $(SRC_INETD) = unknown; then \
-		echo No inetd file to install; \
-		exit 1; \
-	fi
-	@if test $(INETD_TYPE) = inetd; then \
-		$(EGREP) -q "^\W*nrpe\s+" $(INETD_DIR)/$(INETD_FILE) 2>/dev/null || \
-		   cat startup/$(SRC_INETD) >> $(INETD_DIR)/$(INETD_FILE); \
-	elif test $(INETD_TYPE) = systemd; then \
-		SRC_INETD_FILE=`echo "$(SRC_INETD)" | sed -e 's/socket/socket-svc/'`; \
-		echo $(INSTALL) -m 644 startup/$$SRC_INETD_FILE $(INETD_DIR)/$(INIT_FILE); \
-		$(INSTALL) -m 644 startup/$$SRC_INETD_FILE $(INETD_DIR)/$(INIT_FILE); \
-	elif test $(INETD_TYPE) = smf10 -o $(INETD_TYPE) = smf11; then \
-		echo $(INSTALL) -m 775 -g sys -d $(INETD_DIR);\
-		$(INSTALL) -m 775 -g sys -d $(INETD_DIR);\
-		echo $(INSTALL) -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
-		$(INSTALL) -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
-		$(INSTALL) -m 775 -d $(INETD_DIR);\
-		echo svccfg import $(INETD_DIR)/$(INETD_FILE); \
-		svccfg import $(INETD_DIR)/$(INETD_FILE); \
-		echo "*** Run 'svcadm enable nrpe' to start it"; \
-	else\
-		echo $(INSTALL) -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
-		$(INSTALL) -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
-	fi
-	@$(EGREP) -q "^nrpe[\t ]+@nrpe_port@/tcp" /etc/services || \
-		echo "***** MAKE SURE 'nrpe @nrpe_port@/tcp' IS IN YOUR /etc/services FILE"
-
 install-init:
 	@if test $(SRC_INIT) = unknown; then \
 		echo No init file to install; \
@@ -148,6 +120,8 @@ install-init:
 				echo "nrpe@bsd_enable@=YES" >> /etc/rc.conf;\
 				echo "nrpe_configfile=$(CFGDIR)/nrpe.cfg" >> /etc/rc.conf;\
 			fi;\
+		elif test $(INIT_TYPE) = launchd; then\
+			launchctl load $(INIT_DIR)/$(INIT_FILE); \
 		else\
 			if test -f /sbin/chkconfig ; then \
 			    /sbin/chkconfig nrpe on;\
@@ -157,6 +131,37 @@ install-init:
 		fi;\
 	fi
 
+install-inetd:
+	@if test $(SRC_INETD) = unknown; then \
+		echo No inetd file to install; \
+		exit 1; \
+	fi
+	@if test $(INETD_TYPE) = inetd; then \
+		$(EGREP) -q "^\W*nrpe\s+" $(INETD_DIR)/$(INETD_FILE) 2>/dev/null || \
+		   cat startup/$(SRC_INETD) >> $(INETD_DIR)/$(INETD_FILE); \
+	elif test $(INETD_TYPE) = systemd; then \
+		SRC_INETD_FILE=`echo "$(SRC_INETD)" | sed -e 's/socket/socket-svc/'`; \
+		echo $(INSTALL) -m 644 startup/$$SRC_INETD_FILE $(INETD_DIR)/$(INIT_FILE); \
+		$(INSTALL) -m 644 startup/$$SRC_INETD_FILE $(INETD_DIR)/$(INIT_FILE); \
+	elif test $(INETD_TYPE) = smf10 -o $(INETD_TYPE) = smf11; then \
+		echo $(INSTALL) -m 775 -g sys -d $(INETD_DIR);\
+		$(INSTALL) -m 775 -g sys -d $(INETD_DIR);\
+		echo $(INSTALL) -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
+		$(INSTALL) -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
+		$(INSTALL) -m 775 -d $(INETD_DIR);\
+		echo svccfg import $(INETD_DIR)/$(INETD_FILE); \
+		svccfg import $(INETD_DIR)/$(INETD_FILE); \
+		echo "*** Run 'svcadm enable nrpe' to start it"; \
+	elif test $(INIT_TYPE) = launchd; then\
+		$(INSTALL) -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
+		launchctl load $(INETD_DIR)/$(INETD_FILE); \
+	else\
+		echo $(INSTALL) -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
+		$(INSTALL) -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
+	fi
+	@$(EGREP) -q "^nrpe[\t ]+@nrpe_port@/tcp" /etc/services || \
+		echo "***** MAKE SURE 'nrpe @nrpe_port@/tcp' IS IN YOUR /etc/services FILE"
+
 install-config:
 	$(INSTALL) -m 775 $(NAGIOS_INSTALL_OPTS) -d $(CFGDIR)
 	$(INSTALL) -m 644 $(NRPE_INSTALL_OPTS) sample-config/nrpe.cfg $(CFGDIR)
@@ -187,10 +192,10 @@ distclean: clean
 	rm -f config.log config.status config.cache sample-config/nrpe.cfg $(SRC_INCLUDE)/config.h
 	rm -f startup/bsd-init startup/debian-init startup/default-init startup/default-inetd
 	rm -f startup/default-service startup/default-socket startup/default-socket-svc
-	rm -f startup/default-xinetd startup/mac-org.plist startup/newbsd-init
-	rm -f startup/openbsd-init startup/openrc-conf startup/openrc-init
-	rm -f startup/rh-upstart-init startup/solaris-init.xml startup/solaris-inetd.xml
-	rm -f startup/tmpfile.conf startup/upstart-init
+	rm -f startup/default-xinetd startup/mac-init.plist startup/mac-inetd.plist
+	rm -f startup/newbsd-init startup/openbsd-init startup/openrc-conf
+	rm -f startup/openrc-init startup/rh-upstart-init startup/solaris-init.xml
+	rm -f startup/solaris-inetd.xml startup/tmpfile.conf startup/upstart-init
 	rm -f Makefile
 
 devclean: distclean

build-aux/ax_nagios_get_files

@@ -54,11 +54,7 @@ AC_MSG_CHECKING(for which init file to use )
 AS_CASE([$init_type],
 
 	[sysv],
-#		if test $dist_type = debian; then
-#			src_init=debian-init
-#		else
-			src_init=default-init,
-#		fi,
+		src_init=default-init,
 
 	[systemd],
 		src_tmpfile=tmpfile.conf
@@ -96,8 +92,7 @@ AS_CASE([$init_type],
 		fi,
 
 	[launchd],
-		src_init="mac-org.plist"
-		src_inetd="mac-org.plist",
+		src_init="mac-init.plist"
 
 	[*],
 		src_init="unknown"
@@ -118,6 +113,9 @@ if test x$src_inetd = x; then
 		[systemd],
 			src_inetd=default-socket,
 
+		[launchd],
+			src_inetd="mac-inetd.plist",
+
 		[*],
 			src_inetd="unknown"
 	)

configure

@@ -3789,13 +3789,8 @@ $as_echo_n "checking for which init file to use ... " >&6; }
 
 case $init_type in #(
   sysv) :
-    #		if test $dist_type = debian; then
-#			src_init=debian-init
-#		else
-			src_init=default-init ;; #(
-  #		fi,
-
-	systemd) :
+    src_init=default-init ;; #(
+  systemd) :
     src_tmpfile=tmpfile.conf
 		src_init=default-service ;; #(
   bsd) :
@@ -3825,13 +3820,12 @@ case $init_type in #(
 			src_init=upstart-init
 		fi ;; #(
   launchd) :
-    src_init="mac-org.plist"
-		src_inetd="mac-org.plist" ;; #(
+    src_init="mac-init.plist"
+
+	* ;; #(
   *) :
     src_init="unknown"
- ;; #(
-  *) :
-     ;;
+ ;;
 esac
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $src_init" >&5
 $as_echo "$src_init" >&6; }
@@ -3848,6 +3842,8 @@ if test x$src_inetd = x; then
     src_inetd=default-xinetd ;; #(
   systemd) :
     src_inetd=default-socket ;; #(
+  launchd) :
+    src_inetd="mac-inetd.plist" ;; #(
   *) :
     src_inetd="unknown"
 	 ;; #(
@@ -4954,7 +4950,7 @@ fi
 
 ac_config_headers="$ac_config_headers include/config.h"
 
-ac_config_files="$ac_config_files Makefile src/Makefile nrpe.spec uninstall sample-config/nrpe.cfg startup/bsd-init startup/debian-init startup/default-init startup/default-inetd startup/default-service startup/default-socket startup/default-socket-svc startup/default-xinetd startup/mac-org.plist startup/newbsd-init startup/openbsd-init startup/openrc-conf startup/openrc-init startup/solaris-init.xml startup/solaris-inetd.xml startup/tmpfile.conf startup/upstart-init startup/rh-upstart-init"
+ac_config_files="$ac_config_files Makefile src/Makefile nrpe.spec uninstall sample-config/nrpe.cfg startup/bsd-init startup/debian-init startup/default-init startup/default-inetd startup/default-service startup/default-socket startup/default-socket-svc startup/default-xinetd startup/mac-init.plist startup/mac-inetd.plist startup/newbsd-init startup/openbsd-init startup/openrc-conf startup/openrc-init startup/solaris-init.xml startup/solaris-inetd.xml startup/tmpfile.conf startup/upstart-init startup/rh-upstart-init"
 
 
 ac_ext=c
@@ -8397,7 +8393,8 @@ do
     "startup/default-socket") CONFIG_FILES="$CONFIG_FILES startup/default-socket" ;;
     "startup/default-socket-svc") CONFIG_FILES="$CONFIG_FILES startup/default-socket-svc" ;;
     "startup/default-xinetd") CONFIG_FILES="$CONFIG_FILES startup/default-xinetd" ;;
-    "startup/mac-org.plist") CONFIG_FILES="$CONFIG_FILES startup/mac-org.plist" ;;
+    "startup/mac-init.plist") CONFIG_FILES="$CONFIG_FILES startup/mac-init.plist" ;;
+    "startup/mac-inetd.plist") CONFIG_FILES="$CONFIG_FILES startup/mac-inetd.plist" ;;
     "startup/newbsd-init") CONFIG_FILES="$CONFIG_FILES startup/newbsd-init" ;;
     "startup/openbsd-init") CONFIG_FILES="$CONFIG_FILES startup/openbsd-init" ;;
     "startup/openrc-conf") CONFIG_FILES="$CONFIG_FILES startup/openrc-conf" ;;

configure.ac

@@ -117,7 +117,8 @@ AC_CONFIG_FILES([Makefile
 	startup/default-socket
 	startup/default-socket-svc
 	startup/default-xinetd
-	startup/mac-org.plist
+	startup/mac-init.plist
+	startup/mac-inetd.plist
 	startup/newbsd-init
 	startup/openbsd-init
 	startup/openrc-conf

startup/mac-inetd.plist.in

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple/DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Label</key>
+	<string>org.nagios.nrpe</string>
+	<key>UserName</key>
+	<string>@nrpe_user@</string>
+	<key>GroupName</key>
+	<string>@nrpe_group@</string>
+	<key>Program</key>
+	<string>@sbindir@/nrpe</string>
+	<key>ProgramArguments</key>
+	<array>
+		<string>nrpe</string>
+		<string>-c</string>
+		<string>@pkgsysconfdir@/nrpe.cfg</string>
+		<string>-i</string>
+	</array>
+	<key>Sockets</key>
+	<dict>
+		<key>Listeners</key>
+		<dict>
+			<key>SockServiceName</key>
+			<string>5666</string>
+			<key>SockType</key>
+			<string>stream</string>
+			<key>SockFamily</key>
+			<string>IPv4</string>
+		</dict>
+	</dict>
+	<key>inetdCompatibility</key>
+	<dict>
+		<key>Wait</key>
+		<false/>
+	</dict>
+	<key>ProcessType</key>
+	<string>Background</string>
+</dict>
+</plist>