[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  da39e74 libcli/security: fix some SID values in comments
       via  3056e24 test_smbclient_s3.sh: force LANG=C during test_utimes()
      from  0361748 wbinfo: Improve the wording for --online-status

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


- Log -----------------------------------------------------------------
commit da39e74c3909f1c260b4899ea835e789044aaa56
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Mar 6 16:38:30 2018 +0100

    libcli/security: fix some SID values in comments
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Fri Mar 16 19:47:15 CET 2018 on sn-devel-144

commit 3056e24a4bee545b94847265ec8ab3b228ce5f89
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Mar 7 11:19:54 2018 +0100

    test_smbclient_s3.sh: force LANG=C during test_utimes()
    
    This makes the test independent from the developers environment.
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

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

Summary of changes:
 libcli/security/util_sid.c                | 6 +++---
 source3/script/tests/test_smbclient_s3.sh | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/security/util_sid.c b/libcli/security/util_sid.c
index 4e4a8fa..af04dff 100644
--- a/libcli/security/util_sid.c
+++ b/libcli/security/util_sid.c
@@ -34,10 +34,10 @@
  */
 
 
-/* S-1 */
+/* S-1-1 */
 const struct dom_sid global_sid_World_Domain =               /* Everyone domain */
 { 1, 0, {0,0,0,0,0,1}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}};
-/* S-1-1 */
+/* S-1-1-0 */
 const struct dom_sid global_sid_World =                      /* Everyone */
 { 1, 1, {0,0,0,0,0,1}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}};
 /* S-1-2 */
@@ -52,7 +52,7 @@ const struct dom_sid global_sid_NT_Authority =    		/* NT Authority */
 /* S-1-5-18 */
 const struct dom_sid global_sid_System =			/* System */
 { 1, 1, {0,0,0,0,0,5}, {18,0,0,0,0,0,0,0,0,0,0,0,0,0,0}};
-/* S-1-0 */
+/* S-1-0-0 */
 const struct dom_sid global_sid_NULL =            		/* NULL sid */
 { 1, 1, {0,0,0,0,0,0}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}};
 /* S-1-5-11 */
diff --git a/source3/script/tests/test_smbclient_s3.sh b/source3/script/tests/test_smbclient_s3.sh
index db77eb1..03f7b27 100755
--- a/source3/script/tests/test_smbclient_s3.sh
+++ b/source3/script/tests/test_smbclient_s3.sh
@@ -1422,6 +1422,9 @@ test_utimes()
     saved_TZ="$TZ"
     TZ=UTC
     export TZ
+    saved_LANG="$LANG"
+    LANG=C
+    export LANG
 
     cat > $tmpfile <<EOF
 del utimes_test
@@ -1442,6 +1445,11 @@ EOF
     else
 	unset TZ
     fi
+    if [ -n "$saved_LANG" ] ; then
+	export LANG="$saved_LANG"
+    else
+	unset LANG
+    fi
 
     if [ $ret != 0 ] ; then
 	echo "$out"


-- 
Samba Shared Repository