[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  6ef0a64 s3-script: Install the findsmb script
       via  0ae1bbf selftest: Set the correct hostname
      from  e46cb9b s3: krb5: keytab - The done label can be jumped to with context == NULL.

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


- Log -----------------------------------------------------------------
commit 6ef0a6416228dc37f24d7554b386d6ded9337c0b
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Jun 7 13:49:39 2016 +0200

    s3-script: Install the findsmb script
    
    When we transitioned from autotools to waf we dropped installing the
    findsmb script. However we create and install the manpage for it so
    install it in the system again.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Thu Jun  9 19:10:15 CEST 2016 on sn-devel-144

commit 0ae1bbf9b8dbbb70d7c07fdc62628a19ff319392
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Jun 7 10:23:59 2016 +0200

    selftest: Set the correct hostname
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>

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

Summary of changes:
 selftest/target/Samba4.pm    |  4 ++++
 source3/script/findsmb.in    |  2 +-
 source3/script/wscript_build | 13 +++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 3ac131c..fd1b575 100755
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -128,6 +128,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};
 
@@ -431,6 +432,7 @@ sub provision_raw_prepare($$$$$$$$$$$)
 	$ctx->{nsswrap_passwd} = "$ctx->{etcdir}/passwd";
 	$ctx->{nsswrap_group} = "$ctx->{etcdir}/group";
 	$ctx->{nsswrap_hosts} = "$ENV{SELFTEST_PREFIX}/hosts";
+	$ctx->{nsswrap_hostname} = "$ctx->{hostname}.$ctx->{dnsname}";
 	if ($ENV{SAMBA_DNS_FAKING}) {
 		$ctx->{dns_host_file} = "$ENV{SELFTEST_PREFIX}/dns_host_file";
 		$ctx->{samba_dnsupdate} = "$ENV{SRCDIR_ABS}/source4/scripting/bin/samba_dnsupdate -s $ctx->{smb_conf} --all-interfaces --use-file=$ctx->{dns_host_file}";
@@ -460,6 +462,7 @@ sub provision_raw_prepare($$$$$$$$$$$)
 	push (@provision_options, "NSS_WRAPPER_PASSWD=\"$ctx->{nsswrap_passwd}\"");
 	push (@provision_options, "NSS_WRAPPER_GROUP=\"$ctx->{nsswrap_group}\"");
 	push (@provision_options, "NSS_WRAPPER_HOSTS=\"$ctx->{nsswrap_hosts}\"");
+	push (@provision_options, "NSS_WRAPPER_HOSTNAME=\"$ctx->{nsswrap_hostname}\"");
 	if (defined($ctx->{resolv_conf})) {
 		push (@provision_options, "RESOLV_WRAPPER_CONF=\"$ctx->{resolv_conf}\"");
 	} else {
@@ -675,6 +678,7 @@ nogroup:x:65534:nobody
 		NSS_WRAPPER_PASSWD => $ctx->{nsswrap_passwd},
 		NSS_WRAPPER_GROUP => $ctx->{nsswrap_group},
 		NSS_WRAPPER_HOSTS => $ctx->{nsswrap_hosts},
+		NSS_WRAPPER_HOSTNAME => $ctx->{nsswrap_hostname},
 		SAMBA_TEST_FIFO => "$ctx->{prefix}/samba_test.fifo",
 		SAMBA_TEST_LOG => "$ctx->{prefix}/samba_test.log",
 		SAMBA_TEST_LOG_POS => 0,
diff --git a/source3/script/findsmb.in b/source3/script/findsmb.in
index 546cf8c..46cda84 100755
--- a/source3/script/findsmb.in
+++ b/source3/script/findsmb.in
@@ -20,7 +20,7 @@
 # -r		add -r option to nmblookup when finding netbios name
 #
 
-$SAMBABIN = "@prefix@/bin";
+$SAMBABIN = "@BINDIR@";
 
 for ($i = 0; $i < 2; $i++) {	# test for -d and -r options
 	$_ = shift;
diff --git a/source3/script/wscript_build b/source3/script/wscript_build
index 56c904f..25591ea 100644
--- a/source3/script/wscript_build
+++ b/source3/script/wscript_build
@@ -10,3 +10,16 @@ bld.INSTALL_FILES('${BINDIR}',
 bld.SAMBA_SCRIPT('smbaddshare', pattern='smbaddshare', installdir='.')
 bld.SAMBA_SCRIPT('smbchangeshare', pattern='smbchangeshare', installdir='.')
 bld.SAMBA_SCRIPT('smbdeleteshare', pattern='smbdeleteshare', installdir='.')
+
+sed_expr1 = 's#@PERL@#/usr/bin/env perl#'
+sed_expr2 = 's#@BINDIR@#${BINDIR}#'
+
+bld.SAMBA_GENERATOR('findsmb-script',
+                    source='findsmb.in',
+                    target='findsmb',
+                    rule='sed -e "%s" -e "%s" ${SRC} > ${TGT}' % (sed_expr1, sed_expr2))
+
+bld.INSTALL_FILES('${BINDIR}',
+                  'findsmb',
+                  destname='findsmb',
+                  chmod=0755)


-- 
Samba Shared Repository