[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  1da22ab build: Do not force a specific perl from ${PERL} when running pod2man
       via  3630ea1 Fix bug #9039 'map untrusted to domain' treats WORKSTATION as bogus domain.
      from  a125ebe Make sure that domain joins work correctly when the DC disallows NTLM auth.

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


- Log -----------------------------------------------------------------
commit 1da22ab994822acacf9a0378c68b15cd32535390
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Feb 8 09:12:20 2013 +1100

    build: Do not force a specific perl from ${PERL} when running pod2man
    
    pod2man should have the right #!/usr/bin/perl line already, and forcing it may
    cause us to use the wrong perl.
    
    Essentially treat this like any other system binary, rather than forcing
    it to use the first perl we found.
    
    This essentially reverts e80f576db66ad04592ac436ed74ceb9b96452060.
    Current SLES11 does not seem to have the issue this was added to
    address.
    
    Andrew Bartlett
    
    Reviewed-by: Michael Adam <obnox at samba.org>
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Thu Feb 28 02:14:25 CET 2013 on sn-devel-104

commit 3630ea12034ac17c1498ee2f81eb4788c0305782
Author: Daniel Kobras <d.kobras at science-computing.de>
Date:   Fri Feb 22 16:24:26 2013 -0800

    Fix bug #9039 'map untrusted to domain' treats WORKSTATION as bogus domain.
    
    s3: never try to map global SAM name
    
    Do not treat the global SAM name as a BOGUS domain, and exempt
    local users from mapping, instead. This change reinstates the
    exact mapping behaviour of Samba 3.2 if parameter 'map untrusted
    to domain' is set.
    
    Reviewed-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

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

Summary of changes:
 pidl/wscript             |    2 +-
 source3/auth/auth_util.c |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/pidl/wscript b/pidl/wscript
index e60ca20..7a25734 100644
--- a/pidl/wscript
+++ b/pidl/wscript
@@ -49,7 +49,7 @@ def build(bld):
     bld.SET_BUILD_GROUP('final')
     if 'POD2MAN' in bld.env and bld.env['POD2MAN'] != '':
         for src, manpage in pidl_manpages.iteritems():
-            bld(rule='${PERL} ${POD2MAN} -c "Samba Documentation" ${SRC} ${TGT}',
+            bld(rule='${POD2MAN} -c "Samba Documentation" ${SRC} ${TGT}',
                 shell=True,
                 source=src,
                 install_path=os.path.dirname(bld.EXPAND_VARIABLES('${MANDIR}/'+manpage)),
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 1367186..ceaa706 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -125,7 +125,8 @@ NTSTATUS make_user_info_map(struct auth_usersupplied_info **user_info,
 	 * This also deals with the client passing in a "" domain */
 
 	if (!is_trusted_domain(domain) &&
-	    !strequal(domain, my_sam_name()))
+	    !strequal(domain, my_sam_name()) &&
+	    !strequal(domain, get_global_sam_name()))
 	{
 		if (lp_map_untrusted_to_domain())
 			domain = my_sam_name();


-- 
Samba Shared Repository