From 99490bbb6893d9e915dd18181c611e98b96a5270 Mon Sep 17 00:00:00 2001
From: ratchov <>
Date: Fri, 23 Apr 2010 06:29:36 +0000
Subject: [PATCH] start ``aucat -l'' from /etc/rc, unless aucat_flags=NO, which
 is the default setting in rc.conf.

ok deraadt
---
 src/etc/rc      | 6 +++++-
 src/etc/rc.conf | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/etc/rc b/src/etc/rc
index 66735407..622a6a21 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.335 2010/01/04 18:03:30 deraadt Exp $
+#	$OpenBSD: rc,v 1.336 2010/04/23 06:29:36 ratchov Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -764,6 +764,10 @@ echo '.'
 
 mixerctl_conf
 
+if [ X"${aucat_flags}" != X"NO" ]; then
+	aucat -l ${aucat_flags}
+fi
+
 # KerberosV master KDC
 if [ X"${krb5_master_kdc}" = X"YES" ]; then
 	echo 'KerberosV master KDC'
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index f61ad4f8..39fc8c31 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.134 2009/10/17 20:40:17 nicm Exp $
+#	$OpenBSD: rc.conf,v 1.135 2010/04/23 06:29:36 ratchov Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 ripd_flags=NO		# for normal use: ""
@@ -42,6 +42,7 @@ ifstated_flags=NO	# for normal use: ""
 relayd_flags=NO		# for normal use: ""
 snmpd_flags=NO		# for normal use: ""
 smtpd_flags=NO		# for normal use: ""
+aucat_flags=NO		# for normal use: ""
 
 # use -u to disable chroot, see httpd(8)
 httpd_flags=NO		# for normal use: "" (or "-DSSL" after reading ssl(8))