svn commit: r254440 - head/usr.sbin/rwhod

[Hiroki Sato]

Author: hrs
Date: Sat Aug 17 07:12:52 2013
New Revision: 254440
URL: http://svnweb.freebsd.org/changeset/base/254440

Log:
  Unbreak rwhod(8):
  
  - It did not work with GENERIC kernel after r250603 because
    options PROCDESC was required for pdfork(2).  It now just uses fork(2)
    instead when this syscall is not available.
  
  - Fix verify().  This function was broken in r250602 because the outermost
    "()" was removed from the condition !(isalnum() || ispunct()).
    It prevented hostnames including "-", for example.

Modified:
  head/usr.sbin/rwhod/rwhod.c

Modified: head/usr.sbin/rwhod/rwhod.c
==============================================================================
--- head/usr.sbin/rwhod/rwhod.c	Sat Aug 17 07:10:01 2013	(r254439)
+++ head/usr.sbin/rwhod/rwhod.c	Sat Aug 17 07:12:52 2013	(r254440)
@@ -274,6 +274,15 @@ main(int argc, char *argv[])
 		exit(1);
 	if (!quiet_mode) {
 		pid_child_receiver = pdfork(&fdp, 0);
+		if (pid_child_receiver == -1) {
+			if (errno != ENOSYS) {
+				syslog(LOG_ERR, "pdfork: %m");
+				exit(1);
+			} else {
+				pid_child_receiver = fork();
+				fdp = -1;
+			}
+		}
 		if (pid_child_receiver == 0) {
 			receiver_process();
 		} else if (pid_child_receiver > 0) {
@@ -328,7 +337,7 @@ verify(char *name, int maxlen)
 
 	size = 0;
 	while (*name != '\0' && size < maxlen - 1) {
-		if (!isascii(*name) || !isalnum(*name) || ispunct(*name))
+		if (!isascii(*name) || !(isalnum(*name) || ispunct(*name)))
 			return (0);
 		name++;
 		size++;