From: Kei Kebreau <kei@openmailbox.org>
To: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Cc: 26651@debbugs.gnu.org
Subject: bug#26651: [PATCH] gnu: nss-pam-ldap: Look for nslcd.conf in global /etc/ directory.
Date: Tue, 25 Apr 2017 15:19:54 -0400 [thread overview]
Message-ID: <87fugwnvl1.fsf@openmailbox.org> (raw)
In-Reply-To: <20170425122531.2522-1-ricardo.wurmus@mdc-berlin.de> (Ricardo Wurmus's message of "Tue, 25 Apr 2017 14:25:31 +0200")
[-- Attachment #1: Type: text/plain, Size: 1917 bytes --]
Ricardo Wurmus <ricardo.wurmus@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.
> ---
> 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)
LGTM.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
next prev parent reply other threads:[~2017-04-25 19:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-25 12:25 bug#26651: [PATCH] gnu: nss-pam-ldap: Look for nslcd.conf in global /etc/ directory Ricardo Wurmus
2017-04-25 19:19 ` Kei Kebreau [this message]
2017-04-26 11:11 ` Ricardo Wurmus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87fugwnvl1.fsf@openmailbox.org \
--to=kei@openmailbox.org \
--cc=26651@debbugs.gnu.org \
--cc=ricardo.wurmus@mdc-berlin.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.