nss-pam-ldapd branch master updated. 0.8.12-121-gfa27d94
[
Date Prev][
Date Next]
[
Thread Prev][
Thread Next]
nss-pam-ldapd branch master updated. 0.8.12-121-gfa27d94
- 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.8.12-121-gfa27d94
- Date: Sun, 10 Mar 2013 23:33:11 +0100 (CET)
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 fa27d94a73be50c2730401279663ee41081137dd (commit)
via 0b5b4d1b13910cfcfd2efd3afc6bfad306a8d183 (commit)
via 24c565cf053c0149e3b0a5098284314fed248c55 (commit)
via 6a926212484bcd423aa265341eb198ef2bc9b410 (commit)
via f7c6771538371e4797a29ec6e5a8ea91d955beeb (commit)
from ba5f39f7c21cf3444ca2e84b0c02e89a1f36cd66 (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=fa27d94a73be50c2730401279663ee41081137dd
commit fa27d94a73be50c2730401279663ee41081137dd
Author: Arthur de Jong <arthur@arthurdejong.org>
Date: Sun Mar 10 15:25:41 2013 +0100
fix a few compiler warnings
diff --git a/nslcd/cfg.c b/nslcd/cfg.c
index 250a9c5..c2b9674 100644
--- a/nslcd/cfg.c
+++ b/nslcd/cfg.c
@@ -1501,7 +1501,9 @@ static void bindpw_read(const char *filename, struct
ldap_config *cfg)
static void cfg_dump(void)
{
int i;
+#ifdef LDAP_OPT_X_TLS
int rc;
+#endif /* LDAP_OPT_X_TLS */
enum ldap_map_selector map;
char *str;
const char **strp;
diff --git a/nslcd/nscd.c b/nslcd/nscd.c
index 70365b4..c03cae4 100644
--- a/nslcd/nscd.c
+++ b/nslcd/nscd.c
@@ -105,26 +105,26 @@ static void exec_invalidate(const char *db)
}
while ((i < 0) && (errno == EINTR));
if (i < 0)
- log_log(LOG_ERR, "nscd_invalidator: waitpid(%d) failed: %s", cpid,
strerror(errno));
+ log_log(LOG_ERR, "nscd_invalidator: waitpid(%d) failed: %s",
(int)cpid, strerror(errno));
else if (WIFEXITED(status))
{
i = WEXITSTATUS(status);
if (i == 0)
log_log(LOG_DEBUG, "nscd_invalidator: nscd -i %s (pid %d) success",
- db, cpid);
+ db, (int)cpid);
else
log_log(LOG_DEBUG, "nscd_invalidator: nscd -i %s (pid %d) failed
(%d)",
- db, cpid, i);
+ db, (int)cpid, i);
}
else if (WIFSIGNALED(status))
{
i = WTERMSIG(status);
log_log(LOG_ERR, "nscd_invalidator: nscd -i %s (pid %d) killed by %s
(%d)",
- db, cpid, signame(i), i);
+ db, (int)cpid, signame(i), i);
}
else
log_log(LOG_ERR, "nscd_invalidator: nscd -i %s (pid %d) had unknown
failure",
- db, cpid);
+ db, (int)cpid);
break;
}
}
http://arthurdejong.org/git/nss-pam-ldapd/commit/?id=0b5b4d1b13910cfcfd2efd3afc6bfad306a8d183
commit 0b5b4d1b13910cfcfd2efd3afc6bfad306a8d183
Author: Arthur de Jong <arthur@arthurdejong.org>
Date: Sun Mar 10 22:11:43 2013 +0100
guess the value for --with-pam-seclib-dir if it is not specified
diff --git a/configure.ac b/configure.ac
index 31d17e8..47fafd9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -225,11 +225,21 @@ AC_DEFINE_UNQUOTED(NSLCD_SOCKET, "$NSLCD_SOCKET", [The
location of the socket us
AC_SUBST(NSLCD_SOCKET)
# the directory PAM librabries are expected to be placed into
+AC_MSG_CHECKING([location for PAM module])
AC_ARG_WITH(pam-seclib-dir,
AS_HELP_STRING([--with-pam-seclib-dir=PAM_SECLIB_DIR],
- [path to PAM security library
@<:@/lib/security@:>@]),
+ [path to PAM security library @<:@auto@:>@]),
[ PAM_SECLIB_DIR="$with_pam_seclib_dir" ],
- [ PAM_SECLIB_DIR="/lib/security" ])
+ [ PAM_SECLIB_DIR="auto" ])
+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" ;;
+ *) PAM_SECLIB_DIR="/lib/security" ;;
+ esac
+fi
+AC_MSG_RESULT($PAM_SECLIB_DIR)
AC_DEFINE_UNQUOTED(PAM_SECLIB_DIR, "$PAM_SECLIB_DIR", [path to PAM security
library])
AC_SUBST(PAM_SECLIB_DIR)
http://arthurdejong.org/git/nss-pam-ldapd/commit/?id=24c565cf053c0149e3b0a5098284314fed248c55
commit 24c565cf053c0149e3b0a5098284314fed248c55
Author: Arthur de Jong <arthur@arthurdejong.org>
Date: Sun Mar 10 17:09:03 2013 +0100
small portability fix in test_pamcmds.sh
diff --git a/tests/test_pamcmds.sh b/tests/test_pamcmds.sh
index 798cafd..a50205c 100755
--- a/tests/test_pamcmds.sh
+++ b/tests/test_pamcmds.sh
@@ -2,7 +2,7 @@
# test_pamcmds.sh - test script to start test_pamcmds.expect
#
-# Copyright (C) 2011 Arthur de Jong
+# Copyright (C) 2011, 2013 Arthur de Jong
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -29,8 +29,10 @@ srcdir="${srcdir-`dirname "$0"`}"
# check if we have expect installed
EXPECT="$(which expect 2> /dev/null || true)"
-if ! [ -x "$EXPECT" ]
+if [ -x "$EXPECT" ]
then
+ :
+else
echo "$0: expect not found, not running tests"
exit 77
fi
http://arthurdejong.org/git/nss-pam-ldapd/commit/?id=6a926212484bcd423aa265341eb198ef2bc9b410
commit 6a926212484bcd423aa265341eb198ef2bc9b410
Author: Arthur de Jong <arthur@arthurdejong.org>
Date: Sun Mar 10 17:02:30 2013 +0100
only log protocol name if it is present
diff --git a/nslcd/service.c b/nslcd/service.c
index c3ca061..de0e019 100644
--- a/nslcd/service.c
+++ b/nslcd/service.c
@@ -209,7 +209,8 @@ NSLCD_HANDLE(
char filter[4096];
READ_STRING(fp, name);
READ_STRING(fp, protocol);
- log_setrequest("service=\"%s\"/%s", name, protocol);,
+ log_setrequest("service=\"%s\"%s%s", name,
+ *protocol != '\0' ? "/" : "", protocol);,
mkfilter_service_byname(name, protocol, filter, sizeof(filter)),
write_service(fp, entry, name, protocol)
)
@@ -221,7 +222,8 @@ NSLCD_HANDLE(
char filter[4096];
READ_INT32(fp, number);
READ_STRING(fp, protocol);
- log_setrequest("service=%lu/%s", (unsigned long int)number, protocol);,
+ log_setrequest("service=%lu/%s", (unsigned long int)number,
+ *protocol != '\0' ? "/" : "", protocol);,
mkfilter_service_bynumber(number, protocol, filter, sizeof(filter)),
write_service(fp, entry, NULL, protocol)
)
http://arthurdejong.org/git/nss-pam-ldapd/commit/?id=f7c6771538371e4797a29ec6e5a8ea91d955beeb
commit f7c6771538371e4797a29ec6e5a8ea91d955beeb
Author: Arthur de Jong <arthur@arthurdejong.org>
Date: Sun Mar 10 15:43:51 2013 +0100
also support systems without bet_get_enum()
diff --git a/compat/ldap_parse_passwordpolicy_control.c
b/compat/ldap_parse_passwordpolicy_control.c
index 88a0d6a..3517085 100644
--- a/compat/ldap_parse_passwordpolicy_control.c
+++ b/compat/ldap_parse_passwordpolicy_control.c
@@ -52,7 +52,9 @@ int ldap_parse_passwordpolicy_control(LDAP UNUSED(*ld),
LDAPControl *ctrl,
ber_tag_t tag;
ber_len_t berLen;
char *last;
+#ifdef HAVE_BER_GET_ENUM
int err = PP_noError;
+#endif /* HAVE_BER_GET_ENUM */
/* get a BerElement from the control */
ber = ber_init(&ctrl->ldctl_value);
if (ber == NULL)
@@ -86,6 +88,7 @@ int ldap_parse_passwordpolicy_control(LDAP UNUSED(*ld),
LDAPControl *ctrl,
return LDAP_DECODING_ERROR;
}
break;
+#ifdef HAVE_BER_GET_ENUM
case PPOLICY_ERROR:
if (ber_get_enum(ber, &err) == LBER_DEFAULT)
{
@@ -93,6 +96,7 @@ int ldap_parse_passwordpolicy_control(LDAP UNUSED(*ld),
LDAPControl *ctrl,
return LDAP_DECODING_ERROR;
}
break;
+#endif /* HAVE_BER_GET_ENUM */
default:
ber_free(ber, 1);
return LDAP_DECODING_ERROR;
diff --git a/configure.ac b/configure.ac
index 9fcc3ac..31d17e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -712,7 +712,7 @@ then
AC_CHECK_FUNCS(ldap_get_values ldap_get_values_len ldap_value_free
ldap_value_free_len)
AC_CHECK_FUNCS(ldap_get_dn ldap_explode_dn ldap_count_values_len)
AC_CHECK_FUNCS(ldap_err2string ldap_msgfree ldap_result)
- AC_CHECK_FUNCS(ber_bvfree ber_free ber_set_option ldap_modify_ext_s)
+ AC_CHECK_FUNCS(ber_bvfree ber_free ber_set_option ldap_modify_ext_s
ber_get_enum)
AC_CHECK_FUNCS(ldap_first_attribute ldap_next_attribute)
# replace ldap_create_page_control() and ldap_parse_page_control()
-----------------------------------------------------------------------
Summary of changes:
compat/ldap_parse_passwordpolicy_control.c | 4 ++++
configure.ac | 16 +++++++++++++---
nslcd/cfg.c | 2 ++
nslcd/nscd.c | 10 +++++-----
nslcd/service.c | 6 ++++--
tests/test_pamcmds.sh | 6 ++++--
6 files changed, 32 insertions(+), 12 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.8.12-121-gfa27d94,
Commits of the nss-pam-ldapd project
