fb633eaa14
remaining patches into distinct patchfiles. Thanks to
Dmitry V. Levin for identifying them!
Drop ia64 specific patches and specfile fragments
92 lines
2.3 KiB
Diff
92 lines
2.3 KiB
Diff
diff -Nrup a/nscd/nscd.conf b/nscd/nscd.conf
|
|
--- a/nscd/nscd.conf 2012-06-05 07:42:49.000000000 -0600
|
|
+++ b/nscd/nscd.conf 2012-06-07 12:15:21.818318670 -0600
|
|
@@ -33,7 +33,7 @@
|
|
# logfile /var/log/nscd.log
|
|
# threads 4
|
|
# max-threads 32
|
|
-# server-user nobody
|
|
+ server-user nscd
|
|
# stat-user somebody
|
|
debug-level 0
|
|
# reload-count 5
|
|
diff -Nrup a/nscd/nscd.init b/nscd/nscd.init
|
|
--- a/nscd/nscd.init 2012-06-05 07:42:49.000000000 -0600
|
|
+++ b/nscd/nscd.init 2012-06-07 12:15:21.818318670 -0600
|
|
@@ -9,6 +9,7 @@
|
|
# slow naming services like NIS, NIS+, LDAP, or hesiod.
|
|
# processname: /usr/sbin/nscd
|
|
# config: /etc/nscd.conf
|
|
+# config: /etc/sysconfig/nscd
|
|
#
|
|
### BEGIN INIT INFO
|
|
# Provides: nscd
|
|
@@ -28,20 +29,8 @@
|
|
# Source function library.
|
|
. /etc/init.d/functions
|
|
|
|
-# nscd does not run on any kernel lower than 2.2.0 because of threading
|
|
-# problems, so we require that in first place.
|
|
-case $(uname -r) in
|
|
- 2.[2-9].*)
|
|
- # this is okay
|
|
- ;;
|
|
- [3-9]*)
|
|
- # these are of course also okay
|
|
- ;;
|
|
- *)
|
|
- #this is not
|
|
- exit 1
|
|
- ;;
|
|
-esac
|
|
+# Source an auxiliary options file if we have one, and pick up NSCD_OPTIONS.
|
|
+[ -r /etc/sysconfig/nscd ] && . /etc/sysconfig/nscd
|
|
|
|
RETVAL=0
|
|
prog=nscd
|
|
@@ -50,7 +39,7 @@ start () {
|
|
[ -d /var/run/nscd ] || mkdir /var/run/nscd
|
|
[ -d /var/db/nscd ] || mkdir /var/db/nscd
|
|
echo -n $"Starting $prog: "
|
|
- daemon /usr/sbin/nscd
|
|
+ daemon /usr/sbin/nscd $NSCD_OPTIONS
|
|
RETVAL=$?
|
|
echo
|
|
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
|
|
@@ -83,11 +72,11 @@ restart() {
|
|
# See how we were called.
|
|
case "$1" in
|
|
start)
|
|
- start
|
|
+ [ -e /var/lock/subsys/nscd ] || start
|
|
RETVAL=$?
|
|
;;
|
|
stop)
|
|
- stop
|
|
+ [ ! -e /var/lock/subsys/nscd ] || stop
|
|
RETVAL=$?
|
|
;;
|
|
status)
|
|
@@ -99,14 +88,17 @@ case "$1" in
|
|
RETVAL=$?
|
|
;;
|
|
try-restart | condrestart)
|
|
- [ -e /var/lock/subsys/nscd ] && restart
|
|
+ [ ! -e /var/lock/subsys/nscd ] || restart
|
|
RETVAL=$?
|
|
;;
|
|
force-reload | reload)
|
|
echo -n $"Reloading $prog: "
|
|
- killproc /usr/sbin/nscd -HUP
|
|
- RETVAL=$?
|
|
- echo
|
|
+ RETVAL=0
|
|
+ /usr/sbin/nscd -i passwd || RETVAL=$?
|
|
+ /usr/sbin/nscd -i group || RETVAL=$?
|
|
+ /usr/sbin/nscd -i hosts || RETVAL=$?
|
|
+ /usr/sbin/nscd -i services || RETVAL=$?
|
|
+ echo
|
|
;;
|
|
*)
|
|
echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
|