updated init script, now with more checkpath support

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

3 files changed, 25 insertions, 20 deletions

diff --git a/sys-auth/nss-pam-ldapd/ChangeLog b/sys-auth/nss-pam-ldapd/ChangeLog
index 6c53ec4501e2..5e1f6ecc900b 100644
--- a/sys-auth/nss-pam-ldapd/ChangeLog
+++ b/sys-auth/nss-pam-ldapd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-auth/nss-pam-ldapd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/ChangeLog,v 1.6 2013/01/20 00:44:08 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/ChangeLog,v 1.7 2013/02/07 18:11:37 prometheanfire Exp $
+
+  07 Feb 2013; Matthew Thode <prometheanfire@gentoo.org> files/nslcd-init:
+  updating init scripts for bug 455598
 
   20 Jan 2013; Matthew Thode <prometheanfire@gentoo.org>
   nss-pam-ldapd-0.8.12.ebuild:
diff --git a/sys-auth/nss-pam-ldapd/Manifest b/sys-auth/nss-pam-ldapd/Manifest
index 5fad24af6359..44598bae6cbf 100644
--- a/sys-auth/nss-pam-ldapd/Manifest
+++ b/sys-auth/nss-pam-ldapd/Manifest
@@ -1,29 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX nslcd-init 815 SHA256 cefb4d36434cfe14f30e3da71383b53c28fb830e8a959abf8b18a93d5b8f7a1c SHA512 bb4ea96f297c54b6ffccbbaa8d70d8ef5ed2e372d17df59c472c4db468392f486205a7fa487b7ffc49dd7ae06dd3132889479cb37aaa1e9592b46c77ca36d08f WHIRLPOOL 02c2b6cced89556948830dabc1fa31cf6d9af52ec4337ea2d235c28cd6e4d0c87851ef54fbb72f333ca9c8f0f779bdbf94b319f113c309c83897b5dd8b0a4252
+AUX nslcd-init 867 SHA256 a8cac89f3bbecde9b4267269a19bbd9cba56b452928346c4027052dc46624d5e SHA512 5fdb4dfb678a8733156bd9f99cace12104917cce96b476eccaa3621019c319a2cbb5e0f7789a883e0107bcaad98b9272ffcbfefe33a75173a79bbbb1202c02a8 WHIRLPOOL 795e2ab94174731b2b20ff27cb308fe2eddf9a5eb457f36c7a4a2c2d3d505f014fe71f99379bff3983d9f1253335227f63f36f984e316896f52d3f0539f03715
 AUX nslcd.rc 815 SHA256 7e68c0387282d045016c371c3888946955e7c74281f3d92f677c1f80d39833d9 SHA512 fca3a13f259293adf5fac1f1b574019752103ea83aef261a3a83be81eba59e779399179a82c57e2d504663c455efd2cdd3662ffe12bc2bfdc323f425c58d0906 WHIRLPOOL 2b3ced109aebafff42981b18b142dfed90bc2f1c10f228098f38ab2a1f03402fb79d986cf7a1b309e7649fc91d10c184f3fe5f9caf39933d12bc716de5c6c819
 DIST nss-pam-ldapd-0.8.11.tar.gz 483109 SHA256 9a841f6a46bf9f87213dc806c0f6507ac5016a2ee550d42c3ed9fb280c1e38e6 SHA512 e1ba00e3d11f09b22685dff598a6aa7efe540a9811756332166b52bb17ac8223b0e05308e2aee865a311ae4172f9e3006556ed7387650dddd8ea78503b2d6549 WHIRLPOOL c7eeff75f3fce791144981f446ddbc224ffc800f95f17302dd489cd24f7f0a4093ecbfcbe0ef847cb5beeeb1409edf063214e5a20484674eae83eab574898ec4
 DIST nss-pam-ldapd-0.8.12.tar.gz 484453 SHA256 d4bb255a796d59daa69e8c0aa790d15fb2a22e9706005d26e93ca52cf502ac10 SHA512 84b4b3c69783db28ea45db038985da04809a4cdd2bb8f0c0774c2a0615da98372101894826a28bb972328f8937cd45ae4cfba44f1212cbdc34a71cc1939a71da WHIRLPOOL d7591e272ebc0a7b2a8935b1f70af604c836ce24ba94ed44658b0701e6eb0b6d85d3a048e301ca5192858fd6eab3f20c827f39c5a6f0ccdd836f7e1b76f5c530
 EBUILD nss-pam-ldapd-0.8.11-r1.ebuild 2113 SHA256 86a9583b0ac618b1f9a11e9cd3435e8ed4eacbd328e726c7108a35d2037813e5 SHA512 5efb5650fb75499a70def53d5454167e5ac262a6e74a31acdb2a01a291fe3716a62a7ef15637ec6a3f2cf0bd2ceeb12e6552c4f95813840b6fa09ebb2e9f8b98 WHIRLPOOL 16af7de5c27e1dac2dac939a042757815e10192f4fdc01bd4bde7b3a22d46987209332abaabd7df8f1b6861a9fc1180f536902025973683d317a94c4b2a53e67
 EBUILD nss-pam-ldapd-0.8.11.ebuild 2043 SHA256 68e428161357f3851b9b353e0e743133768662333586f02bcf6abdafa08a94d5 SHA512 741bdc41d9aa37ab0d6314295563b8d80295a00947abcb24941dc89797c555b4f8eb77176f017df91bc10bec32445f6dbd543891c6a7db25db5c11e3036a50bf WHIRLPOOL e74698fb091c9a93290fb3c82ae0349e02145c0db17c2055e1113ceae6492e8f20f2cc220d22470ec915c541b42d238965dd0a879d939f23d19101f5025bd12b
 EBUILD nss-pam-ldapd-0.8.12.ebuild 2135 SHA256 a6924625542b5e230dc5a205b8c4552d2aeba1d14e891ed5cb4af880637374e4 SHA512 496b7c4a72337bdd3588f06c2dffcab5e6e85f10d487bf58d1f350106a8f43d316c2904654375b8a2c40ba77c5fb0c56d487f84e1ab2b0825a2584b6cf495a32 WHIRLPOOL c60e055d91b2231ca4a6bacc19fae071b664a63cf379b92996737d0712bb31efdf153ee930aea49ef0aa4aaec488d1992cc6cb8dbc3efce41488656caba7c4a9
-MISC ChangeLog 2420 SHA256 3017413d21ca6acfe65c1b423619c2d5dbc497a0869030ca7f30360580312ae4 SHA512 ad714de5041ed61a4a1744b8821c421c8b5250b4aa1f569f7d78f2936ce9cac5486b041a0936aa1280f7dc4c079b2c230418d307fc92a8078a41995ccd97da76 WHIRLPOOL ba74f3250b0e971b8c6bc8713a0464a1788836aeac7a6e3d44727870306f19bcb945f53d8e7e0ac9a8ce3760cd5d16cda935a7e46d25806144f5e8b1bdbecb34
+MISC ChangeLog 2535 SHA256 5a7e3ee0434551c1031a09ea94ac913de2e7d7c13bf98e8bf531022aacd98bc9 SHA512 6ea65f9c0c2a3b96a4722e0c9585132ca9e3913360881017bb9000e0f21c3714ac315e21467a99fc727a6b45eccbff45a0d9e664e42c91fa4900a86d6782e1d3 WHIRLPOOL 49e1d34dbab72ea47bb5378edd678433adc9691b11774bbeef8d6d4bfcbd3595476d86227b75a858ca63c5809fe807ae3a733b699b8516083f3e7cbd4adf63b1
 MISC metadata.xml 241 SHA256 58c2206a9844c7fbfd2ffb5ae2431a552d3d1207dc96aaa94f16ce2c501be545 SHA512 0b22f6d58064e531024e724baccdeda7dc8b411d69f09037f920e86456d7d0c80c06511532eb2fd8bc79b264bbe64033de0012d763e56e070242f571d31d05d3 WHIRLPOOL 3e40e102aca8949ae9993e872ed0bc4f0070256c400f28e4f1e6e2855e19ea9c22f0c7a3022f24b333a6dcadf659ebf6e0228c7a853c9f33d07dc82a641e946a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ+z3eAAoJECRx6z5ArFrDHjcQAOCFGypXkL6eSgsksxoz+MZh
-M02CFze7mhzN84dWTd+hk5Bg8MFyPyg1x17WE/H/qbxCzNHMu9Wdb2Yp/1U5dCOe
-sgx6lvnDTcBibTDTUaNtiNPTA59222oNcdJaBzQmvw7SkTTtxXtEd58OBU+QBd4a
-A0sCYpyA3Vke65VcahO0cIFwypAqDc6Cz36KEUPNdGpcMGlJFyErs4athOPoY53g
-Qx+UaV6DzEmEyR0HPNbTTvpEW9+TXgb/DFde7JoUlfCgVVeXSzeWaBUxfiwdEvOe
-XFcF1lkxyFwrZSsPyH3Xcnk3ZsjNraIZ94NfBC9osMZATHJovMAIEX4m2XDNe3PQ
-/BDDU/OEI8QuUYh3bfw9sPSzFlED3KdqWCwoKATXFjOMvwVi81PrIcHAaWMxC5Cy
-XtopogO8nLb3HdtbQpJXet+w5fdr9YyrrpQeUsHLyAC+oGkz7kwelXxR/aq59F7L
-Sy9wwgidLIIB3ZViuNzW2hFOWMBswwDXrUGmo3fE6ySBEqzLj/ti/8OLPO+QvnFW
-VxzLvGq8FaRZO2tPqTwMol16mxNQ2mSIIJimBgRcv3O8tCaWUcvcQAYv+JJcQm1J
-6jvISpbzmX0H6qD3E8TBDILy+yiFbRDZykr1t4aL85UCfL9JKHZ760DShhdUYupz
-6ytE0NSDyjlioa1q+cIK
-=vx03
+iQIcBAEBCAAGBQJRE+qNAAoJECRx6z5ArFrD4f8P/09BnUInGaU99lvgsGuFzEzX
+3SfR7lhJo2X/COfKm+DJD1Mpu8NRPOop5kS9CnKOyQAJ4FL6QLxQUpoAk1PHGutg
+ro528m8xirRgvOxFumYZyoZwJ31cbkwAvrUpCvZCKEJDmJArENRjjXBSp0f91YZc
+HFnKtcJ7tKwKXohfydx3dN8ijEoviUTRCJrbhaaLPBtCHAQcL+eRSlIAdSVmbkcq
+xDE6fq/hIHkL0hAqDyHp6lmhlo7UnvyIjpqQcDHl/I2XzzI/ZcizvIdddWTPQWRW
+HE/ySH3GzyInaZjWS4GIExj7gVMXDHzOWRz6M1UmExdeseKrRhHrj+hkju17/iif
+QmxgHeXuP9a0uPJXzGHcDLZsFNPoaFms6iUur/32KS8D3yKt6cFFOhOJ5sKwG4OE
+BhckUry3mJ81d9O9Ko9QiIHRa7kQyoy6dt5nazidyKgyAcLr/bTvL49L8aIRo13z
+votQNO6pmEmQEtwVpKj2lGnVYnBW/z6h/9Otjpd62D6rjgkpDYafqIh3sWaOJhMF
+zdnEQ5Oznw/Tm/96kZGRtmjUjyU+cUreiAIpBWDmWD0eGU+MDxKJPYcz75lLhS3n
+rLBrxXzSuPhbRCoWJX3T0OHYsun/apY3N4hkzeTQGi3ByimprlaBDDapwhYQp0XY
+zzUBYTy08wLAB2+1ib2v
+=HW6P
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/nss-pam-ldapd/files/nslcd-init b/sys-auth/nss-pam-ldapd/files/nslcd-init
index 208f970890a1..67f266527302 100644
--- a/sys-auth/nss-pam-ldapd/files/nslcd-init
+++ b/sys-auth/nss-pam-ldapd/files/nslcd-init
@@ -1,9 +1,10 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/files/nslcd-init,v 1.1 2012/07/24 07:16:14 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/files/nslcd-init,v 1.2 2013/02/07 18:11:37 prometheanfire Exp $
 
 extra_commands="checkconfig"
+cfg="/etc/nslcd.conf"
 
 depend() {
 	need net	
@@ -11,8 +12,8 @@ depend() {
 }
 
 checkconfig() {
-	if [ ! -f /etc/nslcd.conf ] ; then
-		eerror "Please create /etc/nslcd.conf"
+	if [ ! -f "$cfg" ] ; then
+		eerror "Please create $cfg"
 		eerror "Example config: /usr/share/nss-ldapd/nslcd.conf"
 		return 1
 	fi
@@ -20,6 +21,7 @@ checkconfig() {
 }
 
 start() {
+    checkpath -q -d /var/run/nslcd -o nslcd:nslcd
 	checkconfig || return $?
 
 	ebegin "Starting nslcd"