[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  42aee0e rwrap: Bump version to 1.1.2.
       via  90de53f rwrap: Fix ns_name_compress detection.
       via  cee8ba1 rwrap: Bump version to 1.1.1.
       via  6e187c0 rwrap: Fix a possible NULL dereference.
       via  931dbb3 rwrap: If we do not have ns_name_compress() use dn_comp().
      from  a2c1b8e net: Fix sam addgroupmem

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 42aee0e56bbea572542a021bfb1a21ea294d41c5
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Jan 13 15:14:25 2015 +0100

    rwrap: Bump version to 1.1.2.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Tue Jan 13 19:19:25 CET 2015 on sn-devel-104

commit 90de53f970a87fd4b6ade5e5f280cc58587b58ef
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Jan 13 15:13:40 2015 +0100

    rwrap: Fix ns_name_compress detection.
    
    On some platforms it is a macro and not a function. So we need to
    check if the macro exists.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>

commit cee8ba1252e03bd6b92000f7b66a5cf9d1b66ca1
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Jan 12 17:36:44 2015 +0100

    rwrap: Bump version to 1.1.1.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>

commit 6e187c0587247babb805ae0b76b801baa30616b8
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Jan 12 17:33:58 2015 +0100

    rwrap: Fix a possible NULL dereference.
    
    CID: #84271
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Jakub Hrozek <jakub.hrozek at gmail.com>
    Reviewed-by: Guenther Deschner <gd at samba.org>

commit 931dbb3202248547bad484667247793d190f7ab0
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Jan 12 17:32:45 2015 +0100

    rwrap: If we do not have ns_name_compress() use dn_comp().
    
    This should fix older Linux versions which do not export
    ns_name_compress(). In newer glibc versions dn_comp() calls
    ns_name_compress().
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11019
    
    Reviewed-by: Jakub Hrozek <jakub.hrozek at gmail.com>
    Reviewed-by: Michael Adam <obnox at samba.org>

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

Summary of changes:
 lib/resolv_wrapper/resolv_wrapper.c | 6 +++++-
 lib/resolv_wrapper/wscript          | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/resolv_wrapper/resolv_wrapper.c b/lib/resolv_wrapper/resolv_wrapper.c
index 7211ad0..10af360 100644
--- a/lib/resolv_wrapper/resolv_wrapper.c
+++ b/lib/resolv_wrapper/resolv_wrapper.c
@@ -65,6 +65,10 @@
 #define RWRAP_DEFAULT_FAKE_TTL 600
 #endif  /* RWRAP_DEFAULT_FAKE_TTL */
 
+#ifndef HAVE_NS_NAME_COMPRESS
+#define ns_name_compress dn_comp
+#endif
+
 enum rwrap_dbglvl_e {
 	RWRAP_LOG_ERROR = 0,
 	RWRAP_LOG_WARN,
@@ -729,7 +733,7 @@ static int rwrap_get_record(const char *hostfile, unsigned recursion,
 		}
 	}
 
-	if (rc == ENOENT && recursion == 0) {
+	if (rc == ENOENT && recursion == 0 && key != NULL) {
 		RWRAP_LOG(RWRAP_LOG_TRACE, "Record for [%s] not found\n", query);
 		memcpy(rr->key, key, strlen(key) + 1);
 	}
diff --git a/lib/resolv_wrapper/wscript b/lib/resolv_wrapper/wscript
index 3aff4d1..f30621b 100644
--- a/lib/resolv_wrapper/wscript
+++ b/lib/resolv_wrapper/wscript
@@ -2,7 +2,7 @@
 
 import os
 
-VERSION="1.1.0"
+VERSION="1.1.2"
 
 def configure(conf):
     if conf.CHECK_BUNDLED_SYSTEM('resolv_wrapper', minversion=VERSION, set_target=False):
@@ -74,6 +74,10 @@ def configure(conf):
         conf.CHECK_FUNCS_IN('res_search __res_search', 'resolv', checklibc=True)
         conf.CHECK_FUNCS_IN('res_nsearch __res_nsearch', 'resolv', checklibc=True)
 
+        conf.CHECK_DECLS('ns_name_compress', headers='sys/types.h arpa/nameser.h')
+        if (conf.CONFIG_SET("HAVE_DECL_NS_NAME_COMPRESS")):
+            conf.DEFINE("HAVE_NS_NAME_COMPRESS", 1)
+
         # Create full path to resolv_wrapper
         srcdir = os.path.realpath(conf.srcdir)
         libresolv_wrapper_so_path = srcdir + '/bin/default/lib/resolv_wrapper/libresolv-wrapper.so'


-- 
Samba Shared Repository