nss-pam-ldapd branch master updated. 0.9.2-37-g44764f0

[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.2-37-g44764f0
Date: Mon, 10 Mar 2014 23:02:05 +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  44764f0fbf898c556ca599658029551036ad5481 (commit)
       via  77444ac1328b4538a6e21d2af4c07a69e52e903d (commit)
       via  96e41711eee37ef3bd341690dff38867251b075f (commit)
      from  2d35feb2f94ec811b883a651ce61b8ee91ec47cf (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=44764f0fbf898c556ca599658029551036ad5481

commit 44764f0fbf898c556ca599658029551036ad5481
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Mon Mar 10 22:51:32 2014 +0100

    Run the correct executables for the tests
    
    This fixes issues with running the tests when using a separate build
    directory (fixes ef0eddaa).

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 506dbef..862b510 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am - use automake to generate Makefile.in
 #
 # Copyright (C) 2006 West Consulting
-# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Arthur de Jong
+# Copyright (C) 2006-2014 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
@@ -28,7 +28,8 @@ if ENABLE_PYNSLCD
   TESTS += test_pynslcd_cache.py
 endif
 
-AM_TESTS_ENVIRONMENT = PYTHON='@PYTHON@'; export PYTHON;
+AM_TESTS_ENVIRONMENT = PYTHON='@PYTHON@'; export PYTHON; \
+                       builddir=$(builddir); export builddir;
 
 check_PROGRAMS = test_dict test_set test_tio test_expr test_getpeercred \
                  test_cfg test_myldap test_common test_clock test_tio_timeout \
diff --git a/tests/test_myldap.sh b/tests/test_myldap.sh
index fa94eac..58820ce 100755
--- a/tests/test_myldap.sh
+++ b/tests/test_myldap.sh
@@ -2,7 +2,7 @@
 
 # test_myldap.sh - simple wrapper test script for test_myldap
 #
-# Copyright (C) 2007 Arthur de Jong
+# Copyright (C) 2007-2014 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
@@ -27,6 +27,7 @@ set -e
 
 # get LDAP config
 srcdir="${srcdir-`dirname "$0"`}"
+builddir="${builddir-`dirname "$0"`}"
 cfgfile="$srcdir/nslcd-test.conf"
 uri=`sed -n 's/^uri *//p' "$cfgfile" | head -n 1`
 base="dc=test,dc=tld"
@@ -39,4 +40,4 @@ chmod o-rwx "$cfgfile"
 
 # just execute test_myldap
 export srcdir
-exec "$srcdir/test_myldap"
+exec "$builddir/test_myldap"
diff --git a/tests/test_nsscmds.sh b/tests/test_nsscmds.sh
index 2c5ffc6..a86d9d8 100755
--- a/tests/test_nsscmds.sh
+++ b/tests/test_nsscmds.sh
@@ -2,7 +2,7 @@
 
 # test_nsscmds.sh - simple test script to check output of name lookup commands
 #
-# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Arthur de Jong
+# Copyright (C) 2007-2014 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
@@ -28,14 +28,16 @@ set -e
 
 # find source directory
 srcdir="${srcdir-`dirname "$0"`}"
+builddir="${builddir-`dirname "$0"`}"
+top_builddir="${top_builddir-${builddir}/..}"
 
 # ensure that we are running in the test environment
 "$srcdir/testenv.sh" check || exit 77
 
 # preload our own NSS module
-if [ -e "$srcdir/../nss/nss_ldap.so" ]
+if [ -e "$top_builddir/nss/nss_ldap.so" ]
 then
-  LD_PRELOAD="$srcdir/../nss/nss_ldap.so"
+  LD_PRELOAD="$top_builddir/nss/nss_ldap.so"
   export LD_PRELOAD
 fi
 

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

commit 77444ac1328b4538a6e21d2af4c07a69e52e903d
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Mon Mar 10 21:54:42 2014 +0100

    Fix nslcd-test.conf permissions for test
    
    This ensures that configuration file is not world readable when the
    tests are run. This avoids test failure for the use of the rootpwmodpw
    option.

diff --git a/tests/test_myldap.sh b/tests/test_myldap.sh
index 4f48d19..fa94eac 100755
--- a/tests/test_myldap.sh
+++ b/tests/test_myldap.sh
@@ -34,6 +34,9 @@ base="dc=test,dc=tld"
 # try to fetch the base DN (fail with exit 77 to indicate problem)
 "$srcdir/testenv.sh" check_ldap "$uri" "$base" || exit 77
 
+# fix configuration file permissions for test to pass
+chmod o-rwx "$cfgfile"
+
 # just execute test_myldap
 export srcdir
 exec "$srcdir/test_myldap"

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

commit 96e41711eee37ef3bd341690dff38867251b075f
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Mon Mar 10 21:29:50 2014 +0100

    Interpret transferred integers as signed again
    
    This fixes an issue with unsigned values ending up in signed fields and
    missing sign extension.
    
    See:
    https://bugs.debian.org/739330

diff --git a/common/nslcd-prot.h b/common/nslcd-prot.h
index 70acd53..649be89 100644
--- a/common/nslcd-prot.h
+++ b/common/nslcd-prot.h
@@ -2,7 +2,7 @@
    nslcd-prot.h - helper macros for reading and writing in protocol streams
 
    Copyright (C) 2006 West Consulting
-   Copyright (C) 2006, 2007, 2009, 2010, 2012, 2013 Arthur de Jong
+   Copyright (C) 2006-2014 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
@@ -170,7 +170,7 @@ static void debug_dump(const void *ptr, size_t size)
 
 #define READ_INT32(fp, i)                                                   \
   READ(fp, &tmpint32, sizeof(int32_t));                                     \
-  (i) = ntohl(tmpint32);                                                    \
+  (i) = (int32_t)ntohl(tmpint32);                                           \
   DEBUG_PRINT("READ_INT32 : var="__STRING(i)" int32==%08x", (int)(i));
 
 /* read a string in a fixed-size "normal" buffer */

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

Summary of changes:
 common/nslcd-prot.h   |    4 ++--
 tests/Makefile.am     |    5 +++--
 tests/test_myldap.sh  |    8 ++++++--
 tests/test_nsscmds.sh |    8 +++++---
 4 files changed, 16 insertions(+), 9 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.2-37-g44764f0, Commits of the nss-pam-ldapd project

Prev by Date: nss-pam-ldapd branch master updated. 0.9.2-34-g2d35feb
Next by Date: nss-pam-ldapd branch master updated. 0.9.3
Previous by thread: nss-pam-ldapd branch master updated. 0.9.2-34-g2d35feb
Next by thread: nss-pam-ldapd branch master updated. 0.9.3