s3: Rename LOCAL-dom_sid_parse to LOCAL-string_to_sid, add some tests

2 files changed, 19 insertions, 7 deletions

diff --git a/source3/script/tests/test_smbtorture_s3.sh b/source3/script/tests/test_smbtorture_s3.sh
index 3e0e3de911..851e58a47c 100755
--- a/source3/script/tests/test_smbtorture_s3.sh
+++ b/source3/script/tests/test_smbtorture_s3.sh
@@ -33,7 +33,7 @@ tests="$tests OPEN XCOPY RENAME DELETE PROPERTIES W2K"
 tests="$tests TCON2 IOCTL CHKPATH FDSESS LOCAL-SUBSTITUTE CHAIN1"
 tests="$tests GETADDRINFO POSIX UID-REGRESSION-TEST SHORTNAME-TEST"
 tests="$tests LOCAL-BASE64 LOCAL-GENCACHE POSIX-APPEND"
-tests="$tests LOCAL-dom_sid_parse"
+tests="$tests LOCAL-string_to_sid"
 
 skipped1="RANDOMIPC NEGNOWAIT NBENCH ERRMAPEXTRACT TRANS2SCAN NTTRANSSCAN"
 skipped2="DENY1 DENY2 OPENATTR CASETABLE EATEST"
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 52cd016cb3..24aea3ceee 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -6757,22 +6757,34 @@ static bool run_local_talloc_dict(int dummy)
 	return true;
 }
 
-static bool run_local_dom_sid_parse(int dummy) {
+static bool run_local_string_to_sid(int dummy) {
 	struct dom_sid sid;
 
-	if (dom_sid_parse("S--1-5-32-545", &sid)) {
+	if (string_to_sid(&sid, "S--1-5-32-545")) {
 		printf("allowing S--1-5-32-545\n");
 		return false;
 	}
-	if (dom_sid_parse("S-1-5-32-+545", &sid)) {
+	if (string_to_sid(&sid, "S-1-5-32-+545")) {
 		printf("allowing S-1-5-32-+545\n");
 		return false;
 	}
-	if (dom_sid_parse("S-1-2-3-4-5-6-7-8-9-0-1-2-3-4-5-6-7-8-9-0", &sid)) {
+	if (string_to_sid(&sid, "S-1-2-3-4-5-6-7-8-9-0-1-2-3-4-5-6-7-8-9-0")) {
 		printf("allowing S-1-2-3-4-5-6-7-8-9-0-1-2-3-4-5-6-7-8-9-0\n");
 		return false;
 	}
-
+	if (string_to_sid(&sid, "S-1-5-32-545-abc")) {
+		printf("allowing S-1-5-32-545-abc\n");
+		return false;
+	}
+	if (!string_to_sid(&sid, "S-1-5-32-545")) {
+		printf("could not parse S-1-5-32-545\n");
+		return false;
+	}
+	if (!sid_equal(&sid, &global_sid_Builtin_Users)) {
+		printf("mis-parsed S-1-5-32-545 as %s\n",
+		       sid_string_tos(&sid));
+		return false;
+	}
 	return true;
 }
 
@@ -7464,7 +7476,7 @@ static struct {
 	{ "LOCAL-MEMCACHE", run_local_memcache, 0},
 	{ "LOCAL-STREAM-NAME", run_local_stream_name, 0},
 	{ "LOCAL-WBCLIENT", run_local_wbclient, 0},
-	{ "LOCAL-dom_sid_parse", run_local_dom_sid_parse, 0},
+	{ "LOCAL-string_to_sid", run_local_string_to_sid, 0},
 	{ "LOCAL-DBTRANS", run_local_dbtrans, 0},
 	{NULL, NULL, 0}};