nss-pam-ldapd branch master updated. 0.9.1-24-g2f088ec

[Date Prev][Date Next] [Thread Prev][Thread Next]
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.1-24-g2f088ec
Date: Sun, 15 Sep 2013 16:10:35 +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  2f088ec904b9866cd5b76fbb780fcc0ef6f00107 (commit)
       via  173d768b519e513ea5579204038acbde60b8527b (commit)
       via  b7ca95a4f853296e82dc0a830ac9f724416fd4c0 (commit)
       via  f36bb819ca61b7c617f754574b0748b6eee44aba (commit)
       via  8ae8b9a17333f232f80e05479e4d7f409cc3bebb (commit)
      from  2bd2bc470c824453cd002f151db9d668f609fc10 (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=2f088ec904b9866cd5b76fbb780fcc0ef6f00107

commit 2f088ec904b9866cd5b76fbb780fcc0ef6f00107
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Sun Sep 15 16:05:00 2013 +0200

    Also support poll() returning EAGAIN

diff --git a/common/tio.c b/common/tio.c
index 650f4d0..1ec1381 100644
--- a/common/tio.c
+++ b/common/tio.c
@@ -183,10 +183,10 @@ static int tio_wait(int fd, short events, int timeout,
       errno = ETIME;
       return -1;
     }
-    else if (errno != EINTR)
+    else if ((errno != EINTR) && (errno != EAGAIN))
       /* some error ocurred */
       return -1;
-    /* we just try again on EINTR */
+    /* we just try again on EINTR or EAGAIN */
   }
 }
 
@@ -407,7 +407,7 @@ static int tio_flush_nonblock(TFILE *fp)
   rv = poll(fds, 1, 0);
   /* check if any file descriptors were ready (timeout) or we were
      interrupted */
-  if ((rv == 0) || ((rv < 0) && (errno == EINTR)))
+  if ((rv == 0) || ((rv < 0) && ((errno == EINTR) || (errno == EAGAIN))))
     return 0;
   /* any other errors? */
   if (rv < 0)

http://arthurdejong.org/git/nss-pam-ldapd/commit/?id=173d768b519e513ea5579204038acbde60b8527b

commit 173d768b519e513ea5579204038acbde60b8527b
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Fri Sep 13 16:09:34 2013 +0200

    Add more python module checks to configure

diff --git a/configure.ac b/configure.ac
index 0497fd4..4f49cc6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -850,14 +850,21 @@ then
   AX_PYTHON_MODULE(fnmatch)
   AX_PYTHON_MODULE(ldap)
   AX_PYTHON_MODULE(sqlite3)
+  # required by ldap.controls.ppolicy:
+  AX_PYTHON_MODULE(pyasn1)
+  AX_PYTHON_MODULE(pyasn1_modules)
   if test "x$HAVE_PYMOD_DAEMON" != "xyes" || \
      test "x$HAVE_PYMOD_FCNTL" != "xyes" || \
      test "x$HAVE_PYMOD_FNMATCH" != "xyes" || \
      test "x$HAVE_PYMOD_LDAP" != "xyes" || \
-     test "x$HAVE_PYMOD_SQLITE3" != "xyes"
+     test "x$HAVE_PYMOD_SQLITE3" != "xyes" || \
+     test "x$HAVE_PYMOD_PYASN1" != "xyes" || \
+     test "x$HAVE_PYMOD_PYASN1_MODULES" != "xyes"
   then
     AC_MSG_WARN(Required Python modules missing)
   fi
+  # optional modules
+  AX_PYTHON_MODULE(setproctitle)
 fi
 
 AM_CONDITIONAL([NSS_FLAVOUR_GLIBC], [test "x${with_nss_flavour}" = xglibc])

http://arthurdejong.org/git/nss-pam-ldapd/commit/?id=b7ca95a4f853296e82dc0a830ac9f724416fd4c0

commit b7ca95a4f853296e82dc0a830ac9f724416fd4c0
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Fri Sep 13 15:53:08 2013 +0200

    Make missing Python modules a waring
    
    This avoids having to have all modules installed in the build
    environment. A Python version is still required during build.

diff --git a/configure.ac b/configure.ac
index 979eab6..0497fd4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -614,7 +614,7 @@ then
   AX_PYTHON_MODULE(argparse)
   if test "x$HAVE_PYMOD_ARGPARSE" != "xyes"
   then
-    AC_MSG_ERROR(Required Python modules missing)
+    AC_MSG_WARN(Required Python modules missing)
   fi
 fi
 
@@ -856,7 +856,7 @@ then
      test "x$HAVE_PYMOD_LDAP" != "xyes" || \
      test "x$HAVE_PYMOD_SQLITE3" != "xyes"
   then
-    AC_MSG_ERROR(Required Python modules missing)
+    AC_MSG_WARN(Required Python modules missing)
   fi
 fi
 

http://arthurdejong.org/git/nss-pam-ldapd/commit/?id=f36bb819ca61b7c617f754574b0748b6eee44aba

commit f36bb819ca61b7c617f754574b0748b6eee44aba
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Fri Sep 13 15:45:51 2013 +0200

    Remove unneeded imports

diff --git a/pynslcd/cache.py b/pynslcd/cache.py
index 3974fef..c3c0082 100644
--- a/pynslcd/cache.py
+++ b/pynslcd/cache.py
@@ -19,7 +19,6 @@
 # 02110-1301 USA
 
 import datetime
-import itertools
 import os
 import sys
 
diff --git a/pynslcd/group.py b/pynslcd/group.py
index ffcc8d1..da2d315 100644
--- a/pynslcd/group.py
+++ b/pynslcd/group.py
@@ -18,7 +18,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 USA
 
-import itertools
 import logging
 
 from ldap.filter import escape_filter_chars

http://arthurdejong.org/git/nss-pam-ldapd/commit/?id=8ae8b9a17333f232f80e05479e4d7f409cc3bebb

commit 8ae8b9a17333f232f80e05479e4d7f409cc3bebb
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Fri Sep 13 15:38:08 2013 +0200

    Cleanups and fixes related to automake upgrade
    
    This removes a few legacy workarounds and fixes for older versions of
    automake. This also removes adding specific DEBUG flags for tests since
    subdir objects are handled differently now.

diff --git a/Makefile.am b/Makefile.am
index c98c9fb..d51a9ad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,10 +63,6 @@ install-nslcd_conf:
 uninstall-nslcd_conf:
        -rm -f $(DESTDIR)$(NSLCD_CONF_PATH)
 
-# fix permissions before distributing
-dist-hook:
-       chmod -R a+rX $(distdir)
-
 # target for generating the ChangeLog file
 changelog:
        git log --date=short --name-only \
diff --git a/configure.ac b/configure.ac
index 08956d3..979eab6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,7 +47,7 @@ AC_CONFIG_LIBOBJ_DIR([compat])
 
 # display notice and initialize automake
 AC_MSG_NOTICE([configuring AC_PACKAGE_TARNAME AC_PACKAGE_VERSION])
-AM_INIT_AUTOMAKE([check-news gnu std-options color-tests --warnings=all])
+AM_INIT_AUTOMAKE([1.11.2 check-news gnu std-options color-tests 
--warnings=all])
 
 # create a config.h file (Automake will add -DHAVE_CONFIG_H)
 AC_CONFIG_HEADERS([config.h])
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e8a5680..0e42417 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -44,19 +44,14 @@ CLEANFILES = $(EXTRA_PROGRAMS)
 AM_CPPFLAGS = -I$(top_srcdir)
 AM_CFLAGS = $(PTHREAD_CFLAGS) -g
 
-# the following enables verbose protocol debugging information to be dumped
-#AM_CPPFLAGS += -DDEBUG_PROT -DDEBUG_PROT_DUMP
-
-# the following enabled verbose tio stats logging
-#AM_CPPFLAGS += -DDEBUG_TIO_STATS
-
-test_dict_SOURCES = test_dict.c ../common/dict.h ../common/dict.c
-#test_dict_LDADD = ../common/dict.o
+test_dict_SOURCES = test_dict.c ../common/dict.h
+test_dict_LDADD = ../common/libdict.a
 
 test_set_SOURCES = test_set.c ../common/set.h
 test_set_LDADD = ../common/libdict.a
 
-test_tio_SOURCES = test_tio.c common.h ../common/tio.h ../common/tio.c
+test_tio_SOURCES = test_tio.c common.h ../common/tio.h
+test_tio_LDADD = ../common/tio.o
 test_tio_LDFLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
 
 test_expr_SOURCES = test_expr.c common.h

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am       |    4 ----
 common/tio.c      |    6 +++---
 configure.ac      |   15 +++++++++++----
 pynslcd/cache.py  |    1 -
 pynslcd/group.py  |    1 -
 tests/Makefile.am |   13 ++++---------
 6 files changed, 18 insertions(+), 22 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.1-24-g2f088ec, Commits of the nss-pam-ldapd project
Prev by Date: nss-pam-ldapd branch master updated. 0.9.1-19-g2bd2bc4
Next by Date: nss-pam-ldapd commit: r2031 - in nss-pam-ldapd-0.8: common nss
Previous by thread: nss-pam-ldapd branch master updated. 0.9.1-19-g2bd2bc4
Next by thread: nss-pam-ldapd commit: r2031 - in nss-pam-ldapd-0.8: common nss