Remove comments about default daemon_flags; most are empty, those

that aren't are redundant because they can be found in the rc.d(8)
scripts themselves, and they risk getting out of sync.
While here, sort the daemons alphabetically.
No functional change.

Triggered by a much smaller nameserver-only patch from stephan@.
OK ajacoutot@ rpe@ stephan@ and looks good to sthen@.

diff --git a/etc/rc.conf b/etc/rc.conf
index b52590e..66c687a 100644 (file)
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -1,4 +1,4 @@
-#      $OpenBSD: rc.conf,v 1.201 2015/05/02 09:35:44 ajacoutot Exp $
+#      $OpenBSD: rc.conf,v 1.202 2015/05/04 22:25:17 schwarze Exp $
 
 # DO NOT EDIT THIS FILE!!
 #
@@ -10,73 +10,77 @@
 #
 # DO NOT EDIT THIS FILE!!
 
-# set these to "NO" to turn them off.  otherwise, they're used as flags
-ldpd_flags=NO          # for normal use: ""
-ripd_flags=NO          # for normal use: ""
-mrouted_flags=NO       # for normal use: "", if activated
-                       # be sure to enable multicast_router below.
-dvmrpd_flags=NO                # for normal use: ""
-ospfd_flags=NO         # for normal use: ""
-ospf6d_flags=NO                # for normal use: ""
-bgpd_flags=NO          # for normal use: ""
-rarpd_flags=NO         # for normal use: "-a"
-bootparamd_flags=NO    # for normal use: ""
-rbootd_flags=NO                # for normal use: ""
-sshd_flags=            # for normal use: ""
-nsd_flags=NO           # for normal use: "-c /var/nsd/etc/nsd.conf"
-unbound_flags=NO       # for normal use: "-c /var/unbound/etc/unbound.conf"
-ldattach_flags=NO      # for normal use: "[options] linedisc cua-device"
-ntpd_flags=NO          # for normal use: ""
-isakmpd_flags=NO       # for normal use: ""
-iked_flags=NO          # for normal use: ""
-sasyncd_flags=NO       # for normal use: ""
-mopd_flags=NO          # for normal use: "-a"
-apmd_flags=NO          # for normal use: ""
-dhcpd_flags=NO         # for normal use: ""
+# Set these variables to "NO" to turn the respective service off.
+# Set them to "" to run them with the default flags.
+# Otherwise, these variables override the default flags.
+apmd_flags=NO
+bgpd_flags=NO
+bootparamd_flags=NO
+cron_flags=
+dhcpd_flags=NO
 dhcrelay_flags=NO      # for normal use: "-i interface [server]"
+dvmrpd_flags=NO
+ftpd_flags=NO          # set to NO if ftpd is running out of inetd
+ftpproxy_flags=NO
+hostapd_flags=NO
+hotplugd_flags=NO
+httpd_flags=NO
+identd_flags=NO
+ifstated_flags=NO
+iked_flags=NO
+inetd_flags=NO
+isakmpd_flags=NO
+iscsid_flags=NO
+ldapd_flags=NO
+ldattach_flags=NO      # for normal use: "[options] linedisc cua-device"
+ldomd_flags=NO
+ldpd_flags=NO
+lpd_flags=NO           # for normal use: "" (or "-l" for debugging)
+mopd_flags=NO
+mrouted_flags=NO       # be sure to enable multicast_router below
+npppd_flags=NO
+nsd_flags=NO
+ntpd_flags=NO
+ospfd_flags=NO
+ospf6d_flags=NO
+pflogd_flags=          # add more flags, e.g. "-s 256"
+rarpd_flags=NO
+rbootd_flags=NO
+relayd_flags=NO
+ripd_flags=NO
+route6d_flags=NO       # be sure to set net.inet6.ip6.forwarding=1
 rtadvd_flags=NO                # for normal use: list of interfaces
                        # be sure to set net.inet6.ip6.forwarding=1
-route6d_flags=NO       # for normal use: ""
-                       # be sure to set net.inet6.ip6.forwarding=1
-lpd_flags=NO           # for normal use: "" (or "-l" for debugging)
-sensorsd_flags=NO      # for normal use: ""
-hotplugd_flags=NO      # for normal use: ""
-watchdogd_flags=NO     # for normal use: ""
-ftpproxy_flags=NO      # for normal use: ""
-hostapd_flags=NO       # for normal use: ""
-httpd_flags=NO         # for normal use: ""
-ifstated_flags=NO      # for normal use: ""
-relayd_flags=NO                # for normal use: ""
-snmpd_flags=NO         # for normal use: ""
-smtpd_flags=           # for normal use: ""
-sndiod_flags=          # for normal use: ""
-ldapd_flags=NO         # for normal use: ""
-npppd_flags=NO         # for normal use: ""
-inetd_flags=NO         # for normal use: ""
-portmap_flags=NO       # for normal use: ""
-                       # Note: inetd(8) rpc services need portmap too
-amd_flags=NO           # for normal use: "" and see amd_master below
-tftpd_flags=NO         # for normal use: "[chroot dir]"
-tftpproxy_flags=NO     # for normal use: ""
-ldomd_flags=NO         # for normal use: ""
-identd_flags=NO                # for normal use: "-e"
-cron_flags=            # for normal use: ""
-iscsid_flags=NO                # for normal use: ""
-
-slowcgi_flags=NO       # for normal use: ""
-
-spamd_flags=NO         # for normal use: "" and see spamd(8)
-spamd_black=NO         # set to YES to run spamd without greylisting
+sasyncd_flags=NO
+sensorsd_flags=NO
+slowcgi_flags=NO
+smtpd_flags=
+sndiod_flags=
+snmpd_flags=NO
+spamd_flags=NO         # also see spamd_black below
 spamlogd_flags=                # use eg. "-i interface" and see spamlogd(8)
+sshd_flags=
+syslogd_flags=         # add more flags, e.g. "-u -a /chroot/dev/log"
+tftpd_flags=NO
+tftpproxy_flags=NO
+unbound_flags=NO
+watchdogd_flags=NO
+wsmoused_flags=NO      # for enabling console mouse support (i386 alpha amd64)
+                       # for ps/2 or usb mice: "", serial: "-p /dev/cua00"
+xdm_flags=NO           # on some architectures, you must also
+                       # disable console getty in /etc/ttys
 
-# Set to NO if ftpd is running out of inetd
-ftpd_flags=NO          # for non-inetd use: ""
-
-# On some architectures, you must also disable console getty in /etc/ttys
-xdm_flags=NO           # for normal use: ""
-
-# For enabling console mouse support (i386 alpha amd64)
-wsmoused_flags=NO      # for ps/2 or usb mice: "", serial: "-p /dev/cua00"
+# services related to RPC, NFS, and YP
+amd_flags=NO           # also see amd_master below
+lockd_flags=NO
+mountd_flags=NO
+nfsd_flags=NO
+portmap_flags=NO       # note: inetd(8) rpc services need portmap too
+statd_flags=NO
+ypbind_flags=NO
+ypldap_flags=NO
+yppasswdd_flags=NO     # "-d /etc/yp" if passwd files are in /etc/yp
+ypserv_flags=NO
 
 # set the following to "YES" to turn them on
 pf=YES                 # Packet filter / NAT
@@ -90,18 +94,9 @@ multicast_host=NO    # Route all multicast packets to a single interface
 multicast_router=NO    # A multicast routing daemon will be run, e.g. mrouted
 
 # miscellaneous other flags
-savecore_flags=                        # "-z" to compress
-ypbind_flags=NO                        # for normal use: ""
-ypserv_flags=NO                        # add more flags, eg. -1 for YP v1, -d for DNS etc
-ypldap_flags=NO                        # for normal use: ""
-yppasswdd_flags=NO             # "-d /etc/yp" if passwd files are in /etc/yp
-nfsd_flags=NO                  # for normal use: "-tun 4" and see nfsd(8)
-mountd_flags=NO                        # for normal use: ""
-lockd_flags=NO                 # for normal use: ""
-statd_flags=NO                 # for normal use: ""
 amd_master=/etc/amd/master     # AMD 'master' map
-syslogd_flags=                 # add more flags, e.g. "-u -a /chroot/dev/log"
-pflogd_flags=                  # add more flags, e.g. "-s 256"
+savecore_flags=                        # "-z" to compress
+spamd_black=NO                 # set to YES to run spamd without greylisting
 shlib_dirs=                    # extra directories for ldconfig, separated
                                # by space