GNU bug report logs - #26651
[PATCH] gnu: nss-pam-ldap: Look for nslcd.conf in global /etc/ directory.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Ricardo Wurmus <ricardo.wurmus <at> mdc-berlin.de>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#26651: closed ([PATCH] gnu: nss-pam-ldap: Look for nslcd.conf
 in global /etc/ directory.)
Date: Wed, 26 Apr 2017 11:12:02 +0000

[Message part 1 (text/plain, inline)]

Your message dated Wed, 26 Apr 2017 13:11:35 +0200
with message-id <87o9vjqv88.fsf <at> mdc-berlin.de>
and subject line Re: bug#26651: [PATCH] gnu: nss-pam-ldap: Look for nslcd.conf in global /etc/ directory.
has caused the debbugs.gnu.org bug report #26651,
regarding [PATCH] gnu: nss-pam-ldap: Look for nslcd.conf in global /etc/ directory.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
26651: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=26651
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Ricardo Wurmus <ricardo.wurmus <at> mdc-berlin.de>
To: <guix-patches <at> gnu.org>
Cc: Ricardo Wurmus <ricardo.wurmus <at> mdc-berlin.de>
Subject: [PATCH] gnu: nss-pam-ldap: Look for nslcd.conf in global /etc/
 directory.
Date: Tue, 25 Apr 2017 14:25:31 +0200

* gnu/packages/openldap.scm (nss-pam-ldapd)[arguments]: Set
"--with-ldap-conf-file" to look for global configuration file; add build phase
to install example configuration file in the package output directory.
---
 gnu/packages/openldap.scm | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm
index b67510647..61f7a9469 100644
--- a/gnu/packages/openldap.scm
+++ b/gnu/packages/openldap.scm
@@ -94,8 +94,23 @@
      `(#:configure-flags
        (list (string-append "--with-pam-seclib-dir="
                             (assoc-ref %outputs "out") "/lib/security/")
-             (string-append "--with-ldap-conf-file="
-                            (assoc-ref %outputs "out") "/etc/nslcd.conf"))))
+             ;; nslcd cannot be convinced to look at run-time for its
+             ;; configuration file at a location that differs from the
+             ;; configured location.
+             "--with-ldap-conf-file=/etc/nslcd.conf")
+       #:phases
+       (modify-phases %standard-phases
+         ;; This is necessary because we tell nslcd with configure flags that
+         ;; it should look for its configuration file at /etc/nslcd.conf.  The
+         ;; build system tries to install a default configuration to that very
+         ;; location.
+         (add-after 'unpack 'override-nslcd.conf-install-path
+           (lambda* (#:key outputs #:allow-other-keys)
+             (substitute* "Makefile.in"
+               (("\\$\\(DESTDIR\\)\\$\\(NSLCD_CONF_PATH\\)")
+                (string-append (assoc-ref outputs "out")
+                               "/etc/nslcd.conf.example")))
+             #t)))))
     (inputs
      `(("linux-pam" ,linux-pam)
        ("openldap" ,openldap)
-- 
2.11.1

[Message part 3 (message/rfc822, inline)]

From: Ricardo Wurmus <ricardo.wurmus <at> mdc-berlin.de>
To: Kei Kebreau <kei <at> openmailbox.org>
Cc: 26651-done <at> debbugs.gnu.org
Subject: Re: bug#26651: [PATCH] gnu: nss-pam-ldap: Look for nslcd.conf in
 global /etc/ directory.
Date: Wed, 26 Apr 2017 13:11:35 +0200

Kei Kebreau <kei <at> openmailbox.org> writes:

> Ricardo Wurmus <ricardo.wurmus <at> mdc-berlin.de> writes:
>
>> * gnu/packages/openldap.scm (nss-pam-ldapd)[arguments]: Set
>> "--with-ldap-conf-file" to look for global configuration file; add build phase
>> to install example configuration file in the package output directory.

[…]

> LGTM.

Thanks.  Pushed with a minor change in the summary.
(Commit 289a89801afaeee0522777078258ce103d0452e8)

-- 
Ricardo Wurmus

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.