[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  3535649 selftest: Fake the hostname.
      from  e8bd0c0 Don't drop any error codes just because we think there 
cannot be any errors we didn't think of if the user asked for a level 10 log.

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


- Log -----------------------------------------------------------------
commit 35356499769b0913855d79acbb805581673909a9
Author: Andreas Schneider <a...@samba.org>
Date:   Wed Oct 29 17:40:22 2014 +0100

    selftest: Fake the hostname.
    
    This fixes the GetPrinterDataEx(DNSMachineName) test on some machines.
    
    Signed-off-by: Andreas Schneider <a...@samba.org>
    Reviewed-by: Stefan Metzmacher <me...@samba.org>
    
    Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org>
    Autobuild-Date(master): Thu Oct 30 11:35:15 CET 2014 on sn-devel-104

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

Summary of changes:
 selftest/target/Samba3.pm |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index de40ced..1963321 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -647,6 +647,7 @@ sub check_or_start($$$$$) {
                $ENV{NSS_WRAPPER_PASSWD} = $env_vars->{NSS_WRAPPER_PASSWD};
                $ENV{NSS_WRAPPER_GROUP} = $env_vars->{NSS_WRAPPER_GROUP};
                $ENV{NSS_WRAPPER_HOSTS} = $env_vars->{NSS_WRAPPER_HOSTS};
+               $ENV{NSS_WRAPPER_HOSTNAME} = $env_vars->{NSS_WRAPPER_HOSTNAME};
                $ENV{NSS_WRAPPER_MODULE_SO_PATH} = 
$env_vars->{NSS_WRAPPER_MODULE_SO_PATH};
                $ENV{NSS_WRAPPER_MODULE_FN_PREFIX} = 
$env_vars->{NSS_WRAPPER_MODULE_FN_PREFIX};
 
@@ -704,6 +705,7 @@ sub check_or_start($$$$$) {
                $ENV{NSS_WRAPPER_PASSWD} = $env_vars->{NSS_WRAPPER_PASSWD};
                $ENV{NSS_WRAPPER_GROUP} = $env_vars->{NSS_WRAPPER_GROUP};
                $ENV{NSS_WRAPPER_HOSTS} = $env_vars->{NSS_WRAPPER_HOSTS};
+               $ENV{NSS_WRAPPER_HOSTNAME} = $env_vars->{NSS_WRAPPER_HOSTNAME};
                $ENV{NSS_WRAPPER_MODULE_SO_PATH} = 
$env_vars->{NSS_WRAPPER_MODULE_SO_PATH};
                $ENV{NSS_WRAPPER_MODULE_FN_PREFIX} = 
$env_vars->{NSS_WRAPPER_MODULE_FN_PREFIX};
 
@@ -761,6 +763,7 @@ sub check_or_start($$$$$) {
                $ENV{NSS_WRAPPER_PASSWD} = $env_vars->{NSS_WRAPPER_PASSWD};
                $ENV{NSS_WRAPPER_GROUP} = $env_vars->{NSS_WRAPPER_GROUP};
                $ENV{NSS_WRAPPER_HOSTS} = $env_vars->{NSS_WRAPPER_HOSTS};
+               $ENV{NSS_WRAPPER_HOSTNAME} = $env_vars->{NSS_WRAPPER_HOSTNAME};
                $ENV{NSS_WRAPPER_MODULE_SO_PATH} = 
$env_vars->{NSS_WRAPPER_MODULE_SO_PATH};
                $ENV{NSS_WRAPPER_MODULE_FN_PREFIX} = 
$env_vars->{NSS_WRAPPER_MODULE_FN_PREFIX};
 
@@ -1278,6 +1281,7 @@ domadmins:X:$gid_domadmins:
        $ENV{NSS_WRAPPER_PASSWD} = $nss_wrapper_passwd;
        $ENV{NSS_WRAPPER_GROUP} = $nss_wrapper_group;
        $ENV{NSS_WRAPPER_HOSTS} = $nss_wrapper_hosts;
+       $ENV{NSS_WRAPPER_HOSTNAME} = "${hostname}.samba.example.com";
 
         my $cmd = "UID_WRAPPER_ROOT=1 " . Samba::bindir_path($self, 
"smbpasswd")." -c $conffile -L -s -a $unix_name > /dev/null";
        unless (open(PWD, "|$cmd")) {
@@ -1324,6 +1328,7 @@ domadmins:X:$gid_domadmins:
        $ret{NSS_WRAPPER_PASSWD} = $nss_wrapper_passwd;
        $ret{NSS_WRAPPER_GROUP} = $nss_wrapper_group;
        $ret{NSS_WRAPPER_HOSTS} = $nss_wrapper_hosts;
+       $ret{NSS_WRAPPER_HOSTNAME} = "${hostname}.samba.example.com";
        $ret{NSS_WRAPPER_MODULE_SO_PATH} = 
Samba::nss_wrapper_winbind_so_path($self);
        $ret{NSS_WRAPPER_MODULE_FN_PREFIX} = "winbind";
        $ret{LOCAL_PATH} = "$shrdir";


-- 
Samba Shared Repository