From: Frank Lahm <franklahm@googlemail.com>
Date: Sat, 18 Jun 2011 10:42:53 +0000 (+0200)
Subject: Merge branch 'master' of ssh://netatalk.git.sourceforge.net/gitroot/netatalk/netatalk
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=a6101f0b0ee85861d969058c914f16a09246c8ed;hp=3b630e09af7523213bb5ee703271ede481615eb1

Merge branch 'master' of ssh://netatalk.git.sourceforge.net/gitroot/netatalk/netatalk
---

diff --git a/NEWS b/NEWS
index 20c32f55..60acfbcd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
 * NEW: afpd: FCE event notifications
 * NEW: afpd: new option "-mimicmodel" for specifying Bonjour model registration
+* FIX: suse: initscript return better status
 
 Changes in 2.2beta4
 ===================
diff --git a/distrib/initscripts/rc.atalk.suse.tmpl b/distrib/initscripts/rc.atalk.suse.tmpl
index d99d429e..f392d51c 100755
--- a/distrib/initscripts/rc.atalk.suse.tmpl
+++ b/distrib/initscripts/rc.atalk.suse.tmpl
@@ -110,14 +110,16 @@ case "$1" in
 	;;
     stop)
 	echo -n "Shutting down netatalk"
-	killproc -TERM :SBINDIR:/papd
+	if test -x :SBINDIR:/papd ; then
+	    killproc -TERM :SBINDIR:/papd
+	fi
 	if test -x :SBINDIR:/timelord ; then
-	  killproc -TERM :SBINDIR:/timelord
+	    killproc -TERM :SBINDIR:/timelord
 	fi
-	killproc -TERM :SBINDIR:/atalkd
-	if [ x"${CNID_METAD_RUN}" = x"yes" -a -x :SBINDIR:/cnid_metad ] ; then
-	    killproc -TERM :SBINDIR:/cnid_metad
+	if test -x :SBINDIR:/atalkd ; then
+	    killproc -TERM :SBINDIR:/atalkd
 	fi
+	killproc -TERM :SBINDIR:/cnid_metad
 	killproc -TERM :SBINDIR:/afpd
 
 	rc_status -v
@@ -129,18 +131,22 @@ case "$1" in
 	;;
     status)
 	echo "Checking for netatalk services"
-	checkproc :SBINDIR:/papd && echo -n "papd: OK	" || echo -n "papd: No process	"
-	checkproc :SBINDIR:/afpd && echo -n " afpd: OK	" || echo -n " afpd: No process	"
-	if test -x :SBINDIR:/timelord ; then
-	  checkproc :SBINDIR:/timelord && echo -n " timelord: OK	" || echo -n " timelord: No process	"
+	if [ x"${ATALKD_RUN}" = x"yes" -a -x :SBINDIR:/atalkd ] ; then
+	    checkproc :SBINDIR:/atalkd && echo -n "atalkd: OK	" || echo -n "atalkd: No process	"
 	fi
-	if [ x"${CNID_METAD_RUN}" = x"yes" -a -x :SBINDIR:/cnid_metad ] ; then
-	    checkproc :SBINDIR:/cnid_metad && echo -n " cnid_metad: OK	" || echo -n " cnid_metad: No process"
+	if [ x"${PAPD_RUN}" = x"yes" -a -x :SBINDIR:/papd ] ; then
+	    checkproc :SBINDIR:/papd && echo -n "papd: OK	" || echo -n "papd: No process	"
 	fi
-checkproc :SBINDIR:/atalkd && echo "atalkd: OK" || echo "atalkd: No process"
-	# assume that atalkd is the "main" process ...
-	checkproc :SBINDIR:/atalkd
-	rc_status
+	if [ x"${TIMELORD_RUN}" = x"yes" -a -x :SBINDIR:/timelord ] ; then
+	    checkproc :SBINDIR:/timelord && echo -n   " timelord: OK	" || echo -n " timelord: No process	"
+	fi
+	if [ x"${CNID_METAD_RUN}" = x"yes" ] ; then
+	    checkproc :SBINDIR:/cnid_metad && echo -n " cnid_metad: OK	" || echo -n " cnid_metad: No process	"
+	fi
+	checkproc :SBINDIR:/afpd && echo "afpd: OK" || echo "afpd: No process"
+	# assume that afpd is the "main" process ...
+	checkproc :SBINDIR:/afpd
+	rc_status -v
 	;;
     *)
 	echo "Usage: $0 {start|stop|restart|status}"
diff --git a/macros/summary.m4 b/macros/summary.m4
index 7673d482..7f567ca5 100644
--- a/macros/summary.m4
+++ b/macros/summary.m4
@@ -63,6 +63,7 @@ dnl	fi
 	AC_MSG_RESULT([         force volume uid/gid:    $netatalk_cv_force_uidgid])
 	AC_MSG_RESULT([         Apple 2 boot support:    $compile_a2boot])
 	AC_MSG_RESULT([         ACL support:             $with_acl_support])
+	AC_MSG_RESULT([         LDAP support:            $with_ldap])
 	if test x"$use_pam_so" = x"yes" -a x"$netatalk_cv_install_pam" = x"no"; then
 		AC_MSG_RESULT([])
 		AC_MSG_WARN([ PAM support was configured for your system, but the netatalk PAM configuration file])