From feab9b84d0605120052fd0f6a61a5b200363c6d7 Mon Sep 17 00:00:00 2001
From: ajacoutot <>
Date: Wed, 21 Dec 2011 09:26:29 +0000
Subject: [PATCH] Move mandatory flags from daemon_flags to daemon.

ok sthen@
---
 src/etc/rc.d/ftpd   | 5 ++---
 src/etc/rc.d/identd | 6 +++---
 src/etc/rc.d/popa3d | 5 ++---
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/etc/rc.d/ftpd b/src/etc/rc.d/ftpd
index d998345b..449bc6d9 100644
--- a/src/etc/rc.d/ftpd
+++ b/src/etc/rc.d/ftpd
@@ -1,9 +1,8 @@
 #!/bin/sh
 #
-# $OpenBSD: ftpd,v 1.2 2011/09/19 20:42:24 ajacoutot Exp $
+# $OpenBSD: ftpd,v 1.3 2011/12/21 09:26:29 ajacoutot Exp $
 
-daemon="/usr/libexec/ftpd"
-daemon_flags="-D"
+daemon="/usr/libexec/ftpd -D"
 
 . /etc/rc.d/rc.subr
 
diff --git a/src/etc/rc.d/identd b/src/etc/rc.d/identd
index 83ac229c..e9c4305e 100644
--- a/src/etc/rc.d/identd
+++ b/src/etc/rc.d/identd
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
-# $OpenBSD: identd,v 1.2 2011/09/19 20:42:24 ajacoutot Exp $
+# $OpenBSD: identd,v 1.3 2011/12/21 09:26:29 ajacoutot Exp $
 
-daemon="/usr/libexec/identd"
-daemon_flags="-b -elo"
+daemon="/usr/libexec/identd -b"
+daemon_flags="-elo"
 
 . /etc/rc.d/rc.subr
 
diff --git a/src/etc/rc.d/popa3d b/src/etc/rc.d/popa3d
index 86cf0f82..e86ceee9 100644
--- a/src/etc/rc.d/popa3d
+++ b/src/etc/rc.d/popa3d
@@ -1,9 +1,8 @@
 #!/bin/sh
 #
-# $OpenBSD: popa3d,v 1.2 2011/09/19 20:42:24 ajacoutot Exp $
+# $OpenBSD: popa3d,v 1.3 2011/12/21 09:26:29 ajacoutot Exp $
 
-daemon="/usr/sbin/popa3d"
-daemon_flags="-D"
+daemon="/usr/sbin/popa3d -D"
 
 . /etc/rc.d/rc.subr