[SCM] Samba Shared Repository - branch master updated

Andreas Schneider asn at samba.org
Wed Mar 15 04:27:02 UTC 2017


The branch, master has been updated
       via  acad0ad testprogs: Correctly expand shell parameters
       via  1115f15 s3:vfs_expand_msdfs: Do not open the remote address as a file
      from  bbeef55 lib/crypto: implement samba.crypto Python module for RC4

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


- Log -----------------------------------------------------------------
commit acad0adc2977ca26df44e5b22d8b8e991177af71
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Mar 13 17:30:37 2017 +0100

    testprogs: Correctly expand shell parameters
    
    The old behaviour is:
    
      for var in $*
      do
        echo "$var"
      done
    
    And you get this:
    
    $ sh test.sh 1 2 '3 4'
    1
    2
    3
    4
    
    Changing it to:
    
      for var in "$@"
      do
        echo "$var"
      done
    
    will correctly expand to:
    
    $ sh test.sh 1 2 '3 4'
    1
    2
    3 4
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Wed Mar 15 05:26:17 CET 2017 on sn-devel-144

commit 1115f152de9ec25bc9e5e499874b4a7c92c888c0
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Mar 14 16:12:20 2017 +0100

    s3:vfs_expand_msdfs: Do not open the remote address as a file
    
    The arguments get passed in the wrong order to read_target_host().
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12687
    
    Signed-off-by: Andreas Schneider <asn at samba.org>

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

Summary of changes:
 source3/modules/vfs_expand_msdfs.c | 3 +--
 testprogs/blackbox/subunit.sh      | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_expand_msdfs.c b/source3/modules/vfs_expand_msdfs.c
index ffbfa33..e42d009 100644
--- a/source3/modules/vfs_expand_msdfs.c
+++ b/source3/modules/vfs_expand_msdfs.c
@@ -147,8 +147,7 @@ static char *expand_msdfs_target(TALLOC_CTX *ctx,
 		return NULL;
 	}
 
-	targethost = read_target_host(
-		ctx, raddr, mapfilename);
+	targethost = read_target_host(ctx, mapfilename, raddr);
 	if (targethost == NULL) {
 		DEBUG(1, ("Could not expand target host from file %s\n",
 			  mapfilename));
diff --git a/testprogs/blackbox/subunit.sh b/testprogs/blackbox/subunit.sh
index 0791d77..5c81ce2 100755
--- a/testprogs/blackbox/subunit.sh
+++ b/testprogs/blackbox/subunit.sh
@@ -78,7 +78,7 @@ subunit_skip_test () {
 testit () {
 	name="$1"
 	shift
-	cmdline="$*"
+	cmdline="$@"
 	subunit_start_test "$name"
 	output=`$cmdline 2>&1`
 	status=$?
@@ -93,7 +93,7 @@ testit () {
 testit_expect_failure () {
 	name="$1"
 	shift
-	cmdline="$*"
+	cmdline="$@"
 	subunit_start_test "$name"
 	output=`$cmdline 2>&1`
 	status=$?


-- 
Samba Shared Repository



More information about the samba-cvs mailing list