nss-pam-ldapd branch master updated. 0.9.3-9-gd6163e2
[
Date Prev][
Date Next]
[
Thread Prev][
Thread Next]
nss-pam-ldapd branch master updated. 0.9.3-9-gd6163e2
- From: Commits of the nss-pam-ldapd project <nss-pam-ldapd-commits [at] lists.arthurdejong.org>
- To: nss-pam-ldapd-commits [at] lists.arthurdejong.org
- Reply-to: nss-pam-ldapd-users [at] lists.arthurdejong.org
- Subject: nss-pam-ldapd branch master updated. 0.9.3-9-gd6163e2
- Date: Sun, 4 May 2014 23:29:34 +0200 (CEST)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nss-pam-ldapd".
The branch, master has been updated
via d6163e23de9dfe4490c9b06d52e91dc0eb71aec9 (commit)
via f6f373008a6ddc40233eceb4ece024396f49c746 (commit)
via ed79110fc32aba70cf1d65979a6419abc2272625 (commit)
from 18d05b01dc6a53481b67839ca0332f56bf456f1e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://arthurdejong.org/git/nss-pam-ldapd/commit/?id=d6163e23de9dfe4490c9b06d52e91dc0eb71aec9
commit d6163e23de9dfe4490c9b06d52e91dc0eb71aec9
Author: Arthur de Jong <arthur@arthurdejong.org>
Date: Sun May 4 16:26:31 2014 +0200
Use FreeBSD lib directory and SONAME on Dragonfly
diff --git a/configure.ac b/configure.ac
index 16e9701..96ae06f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -275,7 +275,7 @@ if test "x$PAM_SECLIB_DIR" = "xauto"
then
case "$target_os" in
solaris*) PAM_SECLIB_DIR="/usr/lib/security" ;;
- freebsd*) PAM_SECLIB_DIR="/usr/lib" ;;
+ freebsd*|dragonfly*) PAM_SECLIB_DIR="/usr/lib" ;;
*) PAM_SECLIB_DIR="/lib/security" ;;
esac
fi
@@ -294,7 +294,7 @@ if test "x$NSS_LDAP_SONAME" = "xauto"
then
case "$target_os" in
solaris*) NSS_LDAP_SONAME="nss_ldap.so.1" ;;
- freebsd*) NSS_LDAP_SONAME="nss_ldap.so.1" ;;
+ freebsd*|dragonfly*) NSS_LDAP_SONAME="nss_ldap.so.1" ;;
*) NSS_LDAP_SONAME="libnss_ldap.so.2" ;;
esac
fi
http://arthurdejong.org/git/nss-pam-ldapd/commit/?id=f6f373008a6ddc40233eceb4ece024396f49c746
commit f6f373008a6ddc40233eceb4ece024396f49c746
Author: Arthur de Jong <arthur@arthurdejong.org>
Date: Sun May 4 16:23:26 2014 +0200
Small documentation improvements
This includes a number of minor changes to the documentation. This also
documents the children search scope (related to 2caeef4).
diff --git a/README b/README
index 62184b9..1395d95 100644
--- a/README
+++ b/README
@@ -344,9 +344,9 @@ group membership
Currently, two ways of specifying group membership are supported. The first,
by using the memberUid attribute, is the simplest and by far the fastest
-(takes the least number of lookups). The attribute values are user names with
-the format as the uid attribute for posixAccount entries and are returned
-without further processing.
+(takes the least number of lookups). The attribute values are user names (same
+as the uid attribute for posixAccount entries) and are returned without
+further processing.
The second method is to use DN values in the member attribute (attribute names
can be changed by using the attribute mapping options as described in the
diff --git a/man/nslcd.conf.5.xml b/man/nslcd.conf.5.xml
index 5a7ce26..ca9ba20 100644
--- a/man/nslcd.conf.5.xml
+++ b/man/nslcd.conf.5.xml
@@ -372,7 +372,7 @@
<varlistentry id="scope"> <!-- since 0.3 -->
<term><option>scope</option>
<optional><replaceable>MAP</replaceable></optional>
-
sub<optional>tree</optional>|one<optional>level</optional>|base</term>
+
sub<optional>tree</optional>|one<optional>level</optional>|base|children</term>
<listitem>
<para>
Specifies the search scope (subtree, onelevel, base or children).
@@ -825,14 +825,13 @@
<para>
If this option is set, on start-up and whenever a connection to the
<acronym>LDAP</acronym> server is re-established after an error
- the specified cache is flushed.
+ the specified caches are flushed.
</para>
<para>
If <replaceable>DB</replaceable> is one of the nsswitch maps,
<command>nscd</command> is contacted to flush its cache for the
specified database.
- </para>
- <para> <!-- since 0.9.1 -->
+ <!-- since 0.9.1 -->
If <replaceable>DB</replaceable> is <literal>nfsidmap</literal>,
<command>nfsidmap</command> is contacted to clear its cache.
</para>
@@ -851,7 +850,7 @@
<optional><replaceable>TIME</replaceable></optional></term>
<listitem>
<para>
- Configure the time entries are kept in the specified cache.
+ Configure the time entries are kept in the specified internal cache.
</para>
<para>
The first <replaceable>TIME</replaceable> value specifies the time
http://arthurdejong.org/git/nss-pam-ldapd/commit/?id=ed79110fc32aba70cf1d65979a6419abc2272625
commit ed79110fc32aba70cf1d65979a6419abc2272625
Author: Arthur de Jong <arthur@arthurdejong.org>
Date: Sun May 4 16:19:07 2014 +0200
Log daemonising failures
This also clears errno in the main function to ensure that no incorrect
errno value is logged on errors.
diff --git a/nslcd/daemonize.c b/nslcd/daemonize.c
index 342c61c..0d96f73 100644
--- a/nslcd/daemonize.c
+++ b/nslcd/daemonize.c
@@ -34,6 +34,7 @@
#endif /* HAVE_PTHREAD_H */
#include "daemonize.h"
+#include "log.h"
/* the write end of a pipe that is used to signal the fact that the child
process has finished initialising (see daemonize_daemon() and
@@ -80,7 +81,10 @@ static int read_response(int fd, char *buffer, size_t bufsz)
else if ((errno == EINTR) || (errno == EAGAIN))
continue; /* ignore these errors and try again */
else
+ {
+ log_log(LOG_ERR, "read_response(): read() failed: %s", strerror(errno));
return -1;
+ }
}
return r;
}
@@ -123,17 +127,22 @@ int daemonize_daemon(void)
int i;
/* set up a pipe for communication */
if (pipe(pipefds) < 0)
+ {
+ log_log(LOG_ERR, "pipe() failed: %s", strerror(errno));
return -1;
+ }
/* set O_NONBLOCK on the write end to ensure that a call to
daemonize_ready() will not lock the application */
if ((i = fcntl(pipefds[1], F_GETFL, 0)) < 0)
{
+ log_log(LOG_ERR, "fcntl() failed: %s", strerror(errno));
close(pipefds[0]);
close(pipefds[1]);
return -1;
}
if (fcntl(pipefds[1], F_SETFL, i | O_NONBLOCK) < 0)
{
+ log_log(LOG_ERR, "fcntl() failed: %s", strerror(errno));
close(pipefds[0]);
close(pipefds[1]);
return -1;
@@ -147,6 +156,7 @@ int daemonize_daemon(void)
break;
case -1:
/* we are the parent, but have an error */
+ log_log(LOG_ERR, "fork() failed: %s", strerror(errno));
close(pipefds[0]);
close(pipefds[1]);
return -1;
@@ -158,6 +168,7 @@ int daemonize_daemon(void)
/* become process leader */
if (setsid() < 0)
{
+ log_log(LOG_ERR, "setsid() failed: %s", strerror(errno));
close(pipefds[1]);
_exit(EXIT_FAILURE);
}
@@ -169,6 +180,7 @@ int daemonize_daemon(void)
break;
case -1:
/* we are the parent, but have an error */
+ log_log(LOG_ERR, "fork() failed: %s", strerror(errno));
close(pipefds[1]);
_exit(EXIT_FAILURE);
default:
diff --git a/nslcd/nslcd.c b/nslcd/nslcd.c
index bbe6547..ea9e4e3 100644
--- a/nslcd/nslcd.c
+++ b/nslcd/nslcd.c
@@ -705,6 +705,7 @@ int main(int argc, char *argv[])
/* daemonize */
if ((!nslcd_debugging) && (!nslcd_nofork))
{
+ errno = 0;
if (daemonize_daemon() != 0)
{
log_log(LOG_ERR, "unable to daemonize: %s", strerror(errno));
-----------------------------------------------------------------------
Summary of changes:
README | 6 +++---
configure.ac | 4 ++--
man/nslcd.conf.5.xml | 9 ++++-----
nslcd/daemonize.c | 12 ++++++++++++
nslcd/nslcd.c | 1 +
5 files changed, 22 insertions(+), 10 deletions(-)
hooks/post-receive
--
nss-pam-ldapd
--
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits/
- nss-pam-ldapd branch master updated. 0.9.3-9-gd6163e2,
Commits of the nss-pam-ldapd project