Date: Sat, 4 Jul 2015 01:00:38 +0000 (UTC) From: Ryan Steinmetz <zi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r391291 - in head/net/nss-pam-ldapd: . files Message-ID: <201507040100.t6410cqp063841@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zi Date: Sat Jul 4 01:00:38 2015 New Revision: 391291 URL: https://svnweb.freebsd.org/changeset/ports/391291 Log: - Fix rc script when running nslcd on host and within a jail PR: 201298 Submitted by: Kan Sasaki (sasaki@fcc.ad.jp) Modified: head/net/nss-pam-ldapd/Makefile head/net/nss-pam-ldapd/files/nslcd.in Modified: head/net/nss-pam-ldapd/Makefile ============================================================================== --- head/net/nss-pam-ldapd/Makefile Sat Jul 4 00:59:53 2015 (r391290) +++ head/net/nss-pam-ldapd/Makefile Sat Jul 4 01:00:38 2015 (r391291) @@ -3,7 +3,7 @@ PORTNAME= nss-pam-ldapd PORTVERSION= 0.8.14 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= http://arthurdejong.org/nss-pam-ldapd/ \ http://mirrors.rit.edu/zi/ Modified: head/net/nss-pam-ldapd/files/nslcd.in ============================================================================== --- head/net/nss-pam-ldapd/files/nslcd.in Sat Jul 4 00:59:53 2015 (r391290) +++ head/net/nss-pam-ldapd/files/nslcd.in Sat Jul 4 01:00:38 2015 (r391291) @@ -80,10 +80,11 @@ nslcd_stop() nslcd_findpid() { - if ! checkyesno nslcd_supervisor && $(%%PREFIX%%/sbin/nslcd -c && pgrep -F /var/run/nslcd.pid > /dev/null); then + if %%PREFIX%%/sbin/nslcd -c && pgrep -q -F /var/run/nslcd.pid; then mypid=$(cat /var/run/nslcd.pid) - else - mypid=$(pgrep -f "daemon: %%PREFIX%%/sbin/nslcd") + if checkyesno nslcd_supervisor; then + mypid=$(pgrep -f "daemon: %%PREFIX%%/sbin/nslcd\[${mypid}\]") + fi fi }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507040100.t6410cqp063841>