Date: Sat, 4 Jul 2015 12:48:53 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r391305 - in head/net/nss-pam-ldapd: . files Message-ID: <201507041248.t64Cmrlv086963@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Sat Jul 4 12:48:52 2015 New Revision: 391305 URL: https://svnweb.freebsd.org/changeset/ports/391305 Log: - use NSLCD_PIDFILE from Makefile instead hard coding PID Approved by: zi@ (via PM) 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 12:34:49 2015 (r391304) +++ head/net/nss-pam-ldapd/Makefile Sat Jul 4 12:48:52 2015 (r391305) @@ -66,7 +66,8 @@ CONFIGURE_ARGS+= --with-ldap-conf-file=$ PLIST_SUB+= CONFIG="${CONFIG_FILE}" \ PAM_LDAP_SHMAJOR="${PAM_LDAP_SHMAJOR}" \ NSS_LDAP_SHMAJOR="${NSS_LDAP_SHMAJOR}" -SUB_LIST+= CONFIG_FILE="${PREFIX}/etc/${CONFIG_FILE}" +SUB_LIST+= CONFIG_FILE="${PREFIX}/etc/${CONFIG_FILE}" \ + NSLCD_PIDFILE="${NSLCD_PIDFILE}" .if empty(PORT_OPTIONS:MKERBEROS) CONFIGURE_ARGS+= --disable-kerberos Modified: head/net/nss-pam-ldapd/files/nslcd.in ============================================================================== --- head/net/nss-pam-ldapd/files/nslcd.in Sat Jul 4 12:34:49 2015 (r391304) +++ head/net/nss-pam-ldapd/files/nslcd.in Sat Jul 4 12:48:52 2015 (r391305) @@ -80,8 +80,8 @@ nslcd_stop() nslcd_findpid() { - if %%PREFIX%%/sbin/nslcd -c && pgrep -q -F /var/run/nslcd.pid; then - mypid=$(cat /var/run/nslcd.pid) + if %%PREFIX%%/sbin/nslcd -c && pgrep -q -F %%NSLCD_PIDFILE%%; then + mypid=$(cat %%NSLCD_PIDFILE%%) if checkyesno nslcd_supervisor; then mypid=$(pgrep -f "daemon: %%PREFIX%%/sbin/nslcd\[${mypid}\]") fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507041248.t64Cmrlv086963>