packages: pdns-recursor/pdns-recursor.init, pdns-recursor/pdns-recursor.con...

[kosmo]

Author: kosmo                        Date: Sat Jan  9 22:10:40 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed two stupid bugs.

---- Files affected:
packages/pdns-recursor:
   pdns-recursor.init (1.1 -> 1.2) , pdns-recursor.conf (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/pdns-recursor/pdns-recursor.init
diff -u packages/pdns-recursor/pdns-recursor.init:1.1 packages/pdns-recursor/pdns-recursor.init:1.2
--- packages/pdns-recursor/pdns-recursor.init:1.1	Sat Jan  9 22:23:27 2010
+++ packages/pdns-recursor/pdns-recursor.init	Sat Jan  9 23:10:35 2010
@@ -57,7 +57,8 @@
 		msg_already_running "PowerDNS Recursor"
 	else
 		msg_starting "PowerDNS Recursor (Powered DNS Recursing server)"
-		daemon /usr/sbin/pdns_recursor --daemon --quiet
+		daemon /usr/sbin/pdns_recursor --daemon --quiet \
+						--config-dir=/etc/pdns-recursor
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/pdns_recursor
 	fi
@@ -88,7 +89,8 @@
 		msg_already_running "PowerDNS Recursor"
 	else
 		show "PowerDNS Recursor in foreground (testing mode)"
-		/usr/sbin/pdns_recursor --daemon=no --quiet=no
+		/usr/sbin/pdns_recursor --daemon=no --quiet=no \
+						--config-dir=/etc/pdns-recursor
 	fi
 	;;
   show)

================================================================
Index: packages/pdns-recursor/pdns-recursor.conf
diff -u packages/pdns-recursor/pdns-recursor.conf:1.1 packages/pdns-recursor/pdns-recursor.conf:1.2
--- packages/pdns-recursor/pdns-recursor.conf:1.1	Sat Jan  9 22:23:27 2010
+++ packages/pdns-recursor/pdns-recursor.conf	Sat Jan  9 23:10:35 2010
@@ -160,14 +160,14 @@
 # server-id=
 
 #################################
-# setgid	If set, change group id to this gid for more security
+# setuid	If set, change user id to this uid for more security
 #
-setgid=pdns-recursor
+setuid=pdns-recursor
 
 #################################
-# setuid	If set, change user id to this uid for more security
+# setgid	If set, change group id to this gid for more security
 #
-setuid=djbdns
+setgid=djbdns
 
 #################################
 # single-socket	If set, only use a single socket for outgoing queries
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pdns-recursor/pdns-recursor.init?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pdns-recursor/pdns-recursor.conf?r1=1.1&r2=1.2&f=u