[SCM] Samba Shared Repository - branch v4-0-test updated

[Karolin Seeger]

The branch, v4-0-test has been updated
       via  97c3b5d waf: Fix correct linking of libreplace with cmdline-credentials.
       via  db13fac Fallback to the internal resolver on EAI_FAIL.
       via  6284031 s3:idmap_autorid: fix freeing of non-talloced memory (uninitialized pointer) (bug #9653)
      from  1c74a7d Fix bug 9519 - Samba returns unexpected error on SMB posix open.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 97c3b5db4214336786c1fadde8292fe4d1aba56b
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Feb 14 12:14:33 2013 +0100

    waf: Fix correct linking of libreplace with cmdline-credentials.
    
    cmdline-credentials needs rep_getpass from libreplace. The function has
    been replaced in master so this issue only exists in 4.0 releases.
    
    Reviewed-by: Andrew Bartlet <abartlet at samba.org>
    Signed-off-by: Andreas Schneider <asn at samba.org>
    
    Fix bug #9664 - libcmdline-credentials.so isn't correctly linked again
    libreplace.so.
    
    Autobuild-User(v4-0-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-0-test): Mon Feb 18 11:55:59 CET 2013 on sn-devel-104

commit db13facf3397d6043ae4324b78daf5346fed20ef
Author: Landon Fuller <landonf at bikemonkey.org>
Date:   Sat Feb 16 22:57:40 2013 -0500

    Fallback to the internal resolver on EAI_FAIL.
    
    On Linux, non-RFC 1034-complaint names (such as gc._msdsc.example.org)
    will result in the resolver returning the non-POSIX EAI_NODATA. In that
    case, the case statement here would fall back on the internal resolver,
    allowing resolution to complete successfully.
    
    On FreeBSD, the libc resolver uses the same validation code, but
    the POSIX result of EAI_FAIL is returned instead of EAI_NODATA. Since
    there was no case for this error code, no fallback to the internal
    resolver would occur. This led to replication failing on FreeBSD.
    
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Sun Feb 17 07:06:36 CET 2013 on sn-devel-104
    (cherry picked from commit 6dfb35f3ff7ad2d2089c0a3e5eab342384e45e4c)
    
    Fix bug #9656 - [patch] Work around FreeBSD's getaddrinfo() underscore issue.

commit 62840319080908e234ba78affdbad25f53214441
Author: Michael Adam <obnox at samba.org>
Date:   Mon Feb 11 22:52:55 2013 +0100

    s3:idmap_autorid: fix freeing of non-talloced memory (uninitialized pointer) (bug #9653)
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Wed Feb 13 09:51:53 CET 2013 on sn-devel-104
    (cherry picked from commit 19c68f80251f443016e505c5cf87f697fb552e8c)

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

Summary of changes:
 source3/winbindd/idmap_autorid.c  |    2 +-
 source4/lib/cmdline/wscript_build |    1 +
 source4/libcli/resolve/dns_ex.c   |    4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/idmap_autorid.c b/source3/winbindd/idmap_autorid.c
index 621cae9..306b176 100644
--- a/source3/winbindd/idmap_autorid.c
+++ b/source3/winbindd/idmap_autorid.c
@@ -244,7 +244,7 @@ static NTSTATUS idmap_autorid_id_to_sid(struct autorid_global_config *cfg,
 					struct id_map *map)
 {
 	uint32_t range;
-	TDB_DATA data;
+	TDB_DATA data = tdb_null;
 	char *keystr;
 	struct dom_sid sid;
 	NTSTATUS status;
diff --git a/source4/lib/cmdline/wscript_build b/source4/lib/cmdline/wscript_build
index 9b6f6e5..eec92d4 100644
--- a/source4/lib/cmdline/wscript_build
+++ b/source4/lib/cmdline/wscript_build
@@ -4,6 +4,7 @@ bld.SAMBA_LIBRARY('cmdline-credentials',
                   source='credentials.c',
                   autoproto='credentials.h',
                   public_deps='samba-credentials popt',
+                  deps='replace',
                   private_library=True)
 
 bld.SAMBA_SUBSYSTEM('POPT_SAMBA',
diff --git a/source4/libcli/resolve/dns_ex.c b/source4/libcli/resolve/dns_ex.c
index bc64e8d..1226ed6 100644
--- a/source4/libcli/resolve/dns_ex.c
+++ b/source4/libcli/resolve/dns_ex.c
@@ -400,8 +400,10 @@ static void run_child_getaddrinfo(struct dns_ex_state *state, int fd)
 #ifdef EAI_NODATA
 		case EAI_NODATA:
 #endif
+		case EAI_FAIL:
+			/* Linux returns EAI_NODATA on non-RFC1034-compliant names. FreeBSD returns EAI_FAIL */
 		case EAI_NONAME:
-			/* getaddrinfo() doesn't handle CNAME records */
+			/* getaddrinfo() doesn't handle CNAME or non-RFC1034 compatible records */
 			run_child_dns_lookup(state, fd);
 			return;
 		default:


-- 
Samba Shared Repository