[SAMBA 4] [PATCH] Fix IBM checker warnings
Andrew Kroeger
andrew at sprocks.gotdns.com
Fri Feb 8 10:42:16 GMT 2008
Samba Developers:
I am attaching a couple of patches to correct a number of issues
discovered by the IBM checker.
I am trying to adopt the Git development model, and have also posted the
same commits at git://git.id10ts.net/samba.git under the v4-0-checker
topic branch.
I would appreciate if someone could evaluate these patches vs. my Git
repository and let me know if I am doing anything wrong with my Git
repository setup.
Sincerely,
Andrew Kroeger
-------------- next part --------------
diff --git a/source/lib/replace/test/testsuite.c b/source/lib/replace/test/testsuite.c
index c9f3301..dee775e 100644
--- a/source/lib/replace/test/testsuite.c
+++ b/source/lib/replace/test/testsuite.c
@@ -879,50 +879,50 @@ struct torture_context;
bool torture_local_replace(struct torture_context *ctx)
{
bool ret = true;
- ret &= test_ftruncate();
- ret &= test_strlcpy();
- ret &= test_strlcat();
- ret &= test_mktime();
- ret &= test_initgroups();
- ret &= test_memmove();
- ret &= test_strdup();
- ret &= test_setlinebuf();
- ret &= test_vsyslog();
- ret &= test_timegm();
- ret &= test_setenv();
- ret &= test_strndup();
- ret &= test_strnlen();
- ret &= test_waitpid();
- ret &= test_seteuid();
- ret &= test_setegid();
- ret &= test_asprintf();
- ret &= test_snprintf();
- ret &= test_vasprintf();
- ret &= test_vsnprintf();
- ret &= test_opendir();
- ret &= test_readdir();
- ret &= test_telldir();
- ret &= test_seekdir();
- ret &= test_dlopen();
- ret &= test_chroot();
- ret &= test_bzero();
- ret &= test_strerror();
- ret &= test_errno();
- ret &= test_mkdtemp();
- ret &= test_mkstemp();
- ret &= test_pread();
- ret &= test_pwrite();
- ret &= test_getpass();
- ret &= test_inet_ntoa();
- ret &= test_strtoll();
- ret &= test_strtoull();
- ret &= test_va_copy();
- ret &= test_FUNCTION();
- ret &= test_MIN();
- ret &= test_MAX();
- ret &= test_socketpair();
- ret &= test_strptime();
- ret &= test_getifaddrs();
+ ret = ret && test_ftruncate();
+ ret = ret && test_strlcpy();
+ ret = ret && test_strlcat();
+ ret = ret && test_mktime();
+ ret = ret && test_initgroups();
+ ret = ret && test_memmove();
+ ret = ret && test_strdup();
+ ret = ret && test_setlinebuf();
+ ret = ret && test_vsyslog();
+ ret = ret && test_timegm();
+ ret = ret && test_setenv();
+ ret = ret && test_strndup();
+ ret = ret && test_strnlen();
+ ret = ret && test_waitpid();
+ ret = ret && test_seteuid();
+ ret = ret && test_setegid();
+ ret = ret && test_asprintf();
+ ret = ret && test_snprintf();
+ ret = ret && test_vasprintf();
+ ret = ret && test_vsnprintf();
+ ret = ret && test_opendir();
+ ret = ret && test_readdir();
+ ret = ret && test_telldir();
+ ret = ret && test_seekdir();
+ ret = ret && test_dlopen();
+ ret = ret && test_chroot();
+ ret = ret && test_bzero();
+ ret = ret && test_strerror();
+ ret = ret && test_errno();
+ ret = ret && test_mkdtemp();
+ ret = ret && test_mkstemp();
+ ret = ret && test_pread();
+ ret = ret && test_pwrite();
+ ret = ret && test_getpass();
+ ret = ret && test_inet_ntoa();
+ ret = ret && test_strtoll();
+ ret = ret && test_strtoull();
+ ret = ret && test_va_copy();
+ ret = ret && test_FUNCTION();
+ ret = ret && test_MIN();
+ ret = ret && test_MAX();
+ ret = ret && test_socketpair();
+ ret = ret && test_strptime();
+ ret = ret && test_getifaddrs();
return ret;
}
diff --git a/source/lib/talloc/testsuite.c b/source/lib/talloc/testsuite.c
index e16c91f..7988aec 100644
--- a/source/lib/talloc/testsuite.c
+++ b/source/lib/talloc/testsuite.c
@@ -1076,29 +1076,29 @@ bool torture_local_talloc(struct torture_context *tctx)
talloc_disable_null_tracking();
talloc_enable_null_tracking();
- ret &= test_ref1();
- ret &= test_ref2();
- ret &= test_ref3();
- ret &= test_ref4();
- ret &= test_unlink1();
- ret &= test_misc();
- ret &= test_realloc();
- ret &= test_realloc_child();
- ret &= test_steal();
- ret &= test_move();
- ret &= test_unref_reparent();
- ret &= test_realloc_fn();
- ret &= test_type();
- ret &= test_lifeless();
- ret &= test_loop();
- ret &= test_free_parent_deny_child();
- ret &= test_talloc_ptrtype();
- ret &= test_talloc_free_in_destructor();
+ ret = ret && test_ref1();
+ ret = ret && test_ref2();
+ ret = ret && test_ref3();
+ ret = ret && test_ref4();
+ ret = ret && test_unlink1();
+ ret = ret && test_misc();
+ ret = ret && test_realloc();
+ ret = ret && test_realloc_child();
+ ret = ret && test_steal();
+ ret = ret && test_move();
+ ret = ret && test_unref_reparent();
+ ret = ret && test_realloc_fn();
+ ret = ret && test_type();
+ ret = ret && test_lifeless();
+ ret = ret && test_loop();
+ ret = ret && test_free_parent_deny_child();
+ ret = ret && test_talloc_ptrtype();
+ ret = ret && test_talloc_free_in_destructor();
if (ret) {
- ret &= test_speed();
+ ret = ret && test_speed();
}
- ret &= test_autofree();
+ ret = ret && test_autofree();
return ret;
}
diff --git a/source/param/util.c b/source/param/util.c
index 1cf05d4..7537062 100644
--- a/source/param/util.c
+++ b/source/param/util.c
@@ -248,7 +248,7 @@ _PUBLIC_ bool run_init_functions(init_module_fn *fns)
if (fns == NULL)
return true;
- for (i = 0; fns[i]; i++) { ret &= (bool)NT_STATUS_IS_OK(fns[i]()); }
+ for (i = 0; fns[i]; i++) { ret = ret && (bool)NT_STATUS_IS_OK(fns[i]()); }
return ret;
}
diff --git a/source/torture/basic/delete.c b/source/torture/basic/delete.c
index 8b84880..8b46f29 100644
--- a/source/torture/basic/delete.c
+++ b/source/torture/basic/delete.c
@@ -390,13 +390,13 @@ static bool deltest7(struct torture_context *tctx, struct smbcli_state *cli1, st
torture_assert_ntstatus_ok(tctx, smbcli_nt_delete_on_close(cli1->tree, fnum1, true),
"setting delete_on_close on file failed !");
- correct &= check_delete_on_close(tctx, cli1, fnum1, fname, true, __location__);
+ correct = correct && check_delete_on_close(tctx, cli1, fnum1, fname, true, __location__);
torture_assert_ntstatus_ok(tctx,
smbcli_nt_delete_on_close(cli1->tree, fnum1, false),
"unsetting delete_on_close on file failed !");
- correct &= check_delete_on_close(tctx, cli1, fnum1, fname, false, __location__);
+ correct = correct && check_delete_on_close(tctx, cli1, fnum1, fname, false, __location__);
torture_assert_ntstatus_ok(tctx, smbcli_close(cli1->tree, fnum1),
talloc_asprintf(tctx, "close - 2 failed (%s)", smbcli_errstr(cli1->tree)));
@@ -450,15 +450,15 @@ static bool deltest8(struct torture_context *tctx, struct smbcli_state *cli1, st
smbcli_nt_delete_on_close(cli1->tree, fnum1, true),
"setting delete_on_close on file failed !");
- correct &= check_delete_on_close(tctx, cli1, fnum1, fname, true, __location__);
- correct &= check_delete_on_close(tctx, cli2, fnum2, fname, true, __location__);
+ correct = correct && check_delete_on_close(tctx, cli1, fnum1, fname, true, __location__);
+ correct = correct && check_delete_on_close(tctx, cli2, fnum2, fname, true, __location__);
torture_assert_ntstatus_ok(tctx, smbcli_close(cli1->tree, fnum1),
talloc_asprintf(tctx, "close - 1 failed (%s)",
smbcli_errstr(cli1->tree)));
- correct &= check_delete_on_close(tctx, cli1, -1, fname, true, __location__);
- correct &= check_delete_on_close(tctx, cli2, fnum2, fname, true, __location__);
+ correct = correct && check_delete_on_close(tctx, cli1, -1, fname, true, __location__);
+ correct = correct && check_delete_on_close(tctx, cli2, fnum2, fname, true, __location__);
torture_assert_ntstatus_ok(tctx, smbcli_close(cli2->tree, fnum2),
talloc_asprintf(tctx, "close - 2 failed (%s)", smbcli_errstr(cli2->tree)));
@@ -634,15 +634,15 @@ static bool deltest13(struct torture_context *tctx, struct smbcli_state *cli1, s
true),
"setting delete_on_close on file failed !");
- correct &= check_delete_on_close(tctx, cli1, fnum1, fname, true, __location__);
- correct &= check_delete_on_close(tctx, cli2, fnum2, fname, true, __location__);
+ correct = correct && check_delete_on_close(tctx, cli1, fnum1, fname, true, __location__);
+ correct = correct && check_delete_on_close(tctx, cli2, fnum2, fname, true, __location__);
torture_assert_ntstatus_ok(tctx, smbcli_nt_delete_on_close(cli2->tree, fnum2,
false),
"setting delete_on_close on file failed !");
- correct &= check_delete_on_close(tctx, cli1, fnum1, fname, false, __location__);
- correct &= check_delete_on_close(tctx, cli2, fnum2, fname, false, __location__);
+ correct = correct && check_delete_on_close(tctx, cli1, fnum1, fname, false, __location__);
+ correct = correct && check_delete_on_close(tctx, cli2, fnum2, fname, false, __location__);
torture_assert_ntstatus_ok(tctx, smbcli_close(cli1->tree, fnum1),
talloc_asprintf(tctx, "close - 1 failed (%s)",
@@ -684,10 +684,10 @@ static bool deltest14(struct torture_context *tctx, struct smbcli_state *cli1, s
torture_assert(tctx, dnum1 != -1, talloc_asprintf(tctx, "open of %s failed: %s!",
dname, smbcli_errstr(cli1->tree)));
- correct &= check_delete_on_close(tctx, cli1, dnum1, dname, false, __location__);
+ correct = correct && check_delete_on_close(tctx, cli1, dnum1, dname, false, __location__);
torture_assert_ntstatus_ok(tctx, smbcli_nt_delete_on_close(cli1->tree, dnum1, true),
"setting delete_on_close on file failed !");
- correct &= check_delete_on_close(tctx, cli1, dnum1, dname, true, __location__);
+ correct = correct && check_delete_on_close(tctx, cli1, dnum1, dname, true, __location__);
smbcli_close(cli1->tree, dnum1);
/* Now it should be gone... */
@@ -761,7 +761,7 @@ static bool deltest15(struct torture_context *tctx, struct smbcli_state *cli1, s
/* The file should be around under the new name, there's a second
* handle open */
- correct &= check_delete_on_close(tctx, cli1, fnum1, fname_new, true, __location__);
+ correct = correct && check_delete_on_close(tctx, cli1, fnum1, fname_new, true, __location__);
fnum2 = smbcli_nt_create_full(cli2->tree, fname, 0,
SEC_GENERIC_ALL,
@@ -775,7 +775,7 @@ static bool deltest15(struct torture_context *tctx, struct smbcli_state *cli1, s
torture_assert(tctx, fnum2 != -1, talloc_asprintf(tctx, "open - 1 of %s failed (%s)",
fname, smbcli_errstr(cli1->tree)));
- correct &= check_delete_on_close(tctx, cli2, fnum2, fname, false, __location__);
+ correct = correct && check_delete_on_close(tctx, cli2, fnum2, fname, false, __location__);
smbcli_close(cli2->tree, fnum2);
smbcli_close(cli1->tree, fnum1);
@@ -840,11 +840,11 @@ static bool deltest16(struct torture_context *tctx, struct smbcli_state *cli1, s
torture_assert (tctx, fnum1 != -1, talloc_asprintf(tctx, "open - 1 of %s failed (%s)", fname, smbcli_errstr(cli1->tree)));
/* The delete on close bit is *not* reported as being set. */
- correct &= check_delete_on_close(tctx, cli1, fnum1, fname, false, __location__);
+ correct = correct && check_delete_on_close(tctx, cli1, fnum1, fname, false, __location__);
/* The delete on close bit is *not* reported as being set. */
- correct &= check_delete_on_close(tctx, cli1, -1, fname, false, __location__);
- correct &= check_delete_on_close(tctx, cli2, -1, fname, false, __location__);
+ correct = correct && check_delete_on_close(tctx, cli1, -1, fname, false, __location__);
+ correct = correct && check_delete_on_close(tctx, cli2, -1, fname, false, __location__);
/* Now try opening again for read-only. */
fnum2 = smbcli_nt_create_full(cli2->tree, fname, 0,
@@ -860,15 +860,15 @@ static bool deltest16(struct torture_context *tctx, struct smbcli_state *cli1, s
torture_assert(tctx, fnum2 != -1, talloc_asprintf(tctx, "open - 1 of %s failed (%s)",
fname, smbcli_errstr(cli1->tree)));
- correct &= check_delete_on_close(tctx, cli1, fnum1, fname, false, __location__);
- correct &= check_delete_on_close(tctx, cli1, -1, fname, false, __location__);
- correct &= check_delete_on_close(tctx, cli2, fnum2, fname, false, __location__);
- correct &= check_delete_on_close(tctx, cli2, -1, fname, false, __location__);
+ correct = correct && check_delete_on_close(tctx, cli1, fnum1, fname, false, __location__);
+ correct = correct && check_delete_on_close(tctx, cli1, -1, fname, false, __location__);
+ correct = correct && check_delete_on_close(tctx, cli2, fnum2, fname, false, __location__);
+ correct = correct && check_delete_on_close(tctx, cli2, -1, fname, false, __location__);
smbcli_close(cli1->tree, fnum1);
- correct &= check_delete_on_close(tctx, cli2, fnum2, fname, true, __location__);
- correct &= check_delete_on_close(tctx, cli2, -1, fname, true, __location__);
+ correct = correct && check_delete_on_close(tctx, cli2, fnum2, fname, true, __location__);
+ correct = correct && check_delete_on_close(tctx, cli2, -1, fname, true, __location__);
smbcli_close(cli2->tree, fnum2);
@@ -926,7 +926,7 @@ static bool deltest17(struct torture_context *tctx, struct smbcli_state *cli1, s
fname, smbcli_errstr(cli1->tree)));
/* The delete on close bit is *not* reported as being set. */
- correct &= check_delete_on_close(tctx, cli1, fnum1, fname, false, __location__);
+ correct = correct && check_delete_on_close(tctx, cli1, fnum1, fname, false, __location__);
/* Now try opening again for read-only. */
fnum2 = smbcli_nt_create_full(cli1->tree, fname, 0,
@@ -944,12 +944,12 @@ static bool deltest17(struct torture_context *tctx, struct smbcli_state *cli1, s
fname, smbcli_errstr(cli1->tree)));
/* still not reported as being set on either */
- correct &= check_delete_on_close(tctx, cli1, fnum1, fname, false, __location__);
- correct &= check_delete_on_close(tctx, cli1, fnum2, fname, false, __location__);
+ correct = correct && check_delete_on_close(tctx, cli1, fnum1, fname, false, __location__);
+ correct = correct && check_delete_on_close(tctx, cli1, fnum2, fname, false, __location__);
smbcli_close(cli1->tree, fnum1);
- correct &= check_delete_on_close(tctx, cli1, fnum2, fname, false, __location__);
+ correct = correct && check_delete_on_close(tctx, cli1, fnum2, fname, false, __location__);
smbcli_close(cli1->tree, fnum2);
@@ -994,7 +994,7 @@ static bool deltest18(struct torture_context *tctx, struct smbcli_state *cli1, s
dname, smbcli_errstr(cli1->tree)));
/* The delete on close bit is *not* reported as being set. */
- correct &= check_delete_on_close(tctx, cli1, fnum1, dname, false, __location__);
+ correct = correct && check_delete_on_close(tctx, cli1, fnum1, dname, false, __location__);
/* Now try opening again for read-only. */
fnum2 = smbcli_nt_create_full(cli1->tree, dname, 0,
@@ -1011,12 +1011,12 @@ static bool deltest18(struct torture_context *tctx, struct smbcli_state *cli1, s
torture_assert(tctx, fnum2 != -1, talloc_asprintf(tctx, "open - 1 of %s failed (%s)",
dname, smbcli_errstr(cli1->tree)));
- correct &= check_delete_on_close(tctx, cli1, fnum1, dname, false, __location__);
- correct &= check_delete_on_close(tctx, cli1, fnum2, dname, false, __location__);
+ correct = correct && check_delete_on_close(tctx, cli1, fnum1, dname, false, __location__);
+ correct = correct && check_delete_on_close(tctx, cli1, fnum2, dname, false, __location__);
smbcli_close(cli1->tree, fnum1);
- correct &= check_delete_on_close(tctx, cli1, fnum2, dname, true, __location__);
+ correct = correct && check_delete_on_close(tctx, cli1, fnum2, dname, true, __location__);
smbcli_close(cli1->tree, fnum2);
@@ -1082,7 +1082,7 @@ static bool deltest19(struct torture_context *tctx, struct smbcli_state *cli1, s
talloc_asprintf(tctx, "open - 1 of %s failed (%s)", fname, smbcli_errstr(cli1->tree)));
/* The delete on close bit is *not* reported as being set. */
- correct &= check_delete_on_close(tctx, cli1, fnum1, dname, false, __location__);
+ correct = correct && check_delete_on_close(tctx, cli1, fnum1, dname, false, __location__);
/* Now try opening again for read-only. */
fnum2 = smbcli_nt_create_full(cli1->tree, dname, 0,
@@ -1100,7 +1100,7 @@ static bool deltest19(struct torture_context *tctx, struct smbcli_state *cli1, s
smbcli_close(cli1->tree, fnum1);
- correct &= check_delete_on_close(tctx, cli1, fnum2, dname, true, __location__);
+ correct = correct && check_delete_on_close(tctx, cli1, fnum2, dname, true, __location__);
smbcli_close(cli1->tree, fnum2);
@@ -1153,7 +1153,7 @@ static bool deltest20(struct torture_context *tctx, struct smbcli_state *cli1, s
torture_assert(tctx, dnum1 != -1, talloc_asprintf(tctx, "open of %s failed: %s!",
dname, smbcli_errstr(cli1->tree)));
- correct &= check_delete_on_close(tctx, cli1, dnum1, dname, false, __location__);
+ correct = correct && check_delete_on_close(tctx, cli1, dnum1, dname, false, __location__);
status = smbcli_nt_delete_on_close(cli1->tree, dnum1, true);
{
@@ -1239,12 +1239,12 @@ static bool deltest20a(struct torture_context *tctx, struct smbcli_state *cli1,
fname, smbcli_errstr(cli2->tree)));
/* The delete on close bit is *not* reported as being set. */
- correct &= check_delete_on_close(tctx, cli1, fnum1, fname, false, __location__);
- correct &= check_delete_on_close(tctx, cli2, fnum2, fname, false, __location__);
+ correct = correct && check_delete_on_close(tctx, cli1, fnum1, fname, false, __location__);
+ correct = correct && check_delete_on_close(tctx, cli2, fnum2, fname, false, __location__);
smbcli_close(cli1->tree, fnum1);
- correct &= check_delete_on_close(tctx, cli2, fnum2, fname, false, __location__);
+ correct = correct && check_delete_on_close(tctx, cli2, fnum2, fname, false, __location__);
smbcli_close(cli2->tree, fnum2);
@@ -1322,12 +1322,12 @@ static bool deltest20b(struct torture_context *tctx, struct smbcli_state *cli1,
fname, smbcli_errstr(cli2->tree)));
/* The delete on close bit is *not* reported as being set. */
- correct &= check_delete_on_close(tctx, cli1, fnum1, fname, false, __location__);
- correct &= check_delete_on_close(tctx, cli2, fnum2, fname, false, __location__);
+ correct = correct && check_delete_on_close(tctx, cli1, fnum1, fname, false, __location__);
+ correct = correct && check_delete_on_close(tctx, cli2, fnum2, fname, false, __location__);
smbcli_close(cli1->tree, fnum1);
- correct &= check_delete_on_close(tctx, cli2, fnum2, fname, false, __location__);
+ correct = correct && check_delete_on_close(tctx, cli2, fnum2, fname, false, __location__);
/* Rename the file by handle. */
@@ -1349,7 +1349,7 @@ static bool deltest20b(struct torture_context *tctx, struct smbcli_state *cli1,
fname, fname_new, smbcli_errstr(cli2->tree)));
}
- correct &= check_delete_on_close(tctx, cli2, fnum2, fname_new, false, __location__);
+ correct = correct && check_delete_on_close(tctx, cli2, fnum2, fname_new, false, __location__);
smbcli_close(cli2->tree, fnum2);
@@ -1397,7 +1397,7 @@ static bool deltest21(struct torture_context *tctx)
smbcli_errstr(cli1->tree)));
/* Ensure delete on close is set. */
- correct &= check_delete_on_close(tctx, cli1, fnum1, fname, true, __location__);
+ correct = correct && check_delete_on_close(tctx, cli1, fnum1, fname, true, __location__);
/* Now yank the rug from under cli1. */
smbcli_transport_dead(cli1->transport, NT_STATUS_LOCAL_DISCONNECT);
diff --git a/source/torture/basic/disconnect.c b/source/torture/basic/disconnect.c
index 09f54ed..0c51605 100644
--- a/source/torture/basic/disconnect.c
+++ b/source/torture/basic/disconnect.c
@@ -145,12 +145,12 @@ bool torture_disconnect(struct torture_context *torture)
}
for (i=0;i<torture_numops;i++) {
- ret &= test_disconnect_lock(cli, mem_ctx);
+ ret = ret && test_disconnect_lock(cli, mem_ctx);
if (!torture_open_connection(&cli, torture, 0)) {
return false;
}
- ret &= test_disconnect_open(cli, mem_ctx);
+ ret = ret && test_disconnect_open(cli, mem_ctx);
if (!torture_open_connection(&cli, torture, 0)) {
return false;
}
diff --git a/source/torture/ldap/cldap.c b/source/torture/ldap/cldap.c
index 4e58059..c0b0068 100644
--- a/source/torture/ldap/cldap.c
+++ b/source/torture/ldap/cldap.c
@@ -313,8 +313,8 @@ bool torture_cldap(struct torture_context *torture)
bool ret = true;
const char *host = torture_setting_string(torture, "host", NULL);
- ret &= test_cldap_netlogon(torture, host);
- ret &= test_cldap_generic(torture, host);
+ ret = ret && test_cldap_netlogon(torture, host);
+ ret = ret && test_cldap_generic(torture, host);
return ret;
}
diff --git a/source/torture/ldap/cldapbench.c b/source/torture/ldap/cldapbench.c
index c57ed6d..6325861 100644
--- a/source/torture/ldap/cldapbench.c
+++ b/source/torture/ldap/cldapbench.c
@@ -123,7 +123,7 @@ bool torture_bench_cldap(struct torture_context *torture)
return false;
}
- ret &= bench_cldap(torture, address);
+ ret = ret && bench_cldap(torture, address);
return ret;
}
diff --git a/source/torture/ldap/schema.c b/source/torture/ldap/schema.c
index 4cfce11..604825c 100644
--- a/source/torture/ldap/schema.c
+++ b/source/torture/ldap/schema.c
@@ -253,10 +253,10 @@ static bool test_create_schema(struct ldb_context *ldb, struct test_rootDSE *roo
schema = talloc_zero(ldb, struct dsdb_schema);
d_printf("Fetching attributes...\n");
- ret &= test_create_schema_type(ldb, root, "(objectClass=attributeSchema)",
+ ret = ret && test_create_schema_type(ldb, root, "(objectClass=attributeSchema)",
test_add_attribute, schema);
d_printf("Fetching objectClasses...\n");
- ret &= test_create_schema_type(ldb, root, "(objectClass=classSchema)",
+ ret = ret && test_create_schema_type(ldb, root, "(objectClass=classSchema)",
test_add_class, schema);
if (ret == true) {
@@ -382,15 +382,15 @@ bool torture_ldap_schema(struct torture_context *torture)
0, NULL);
if (!ldb) goto failed;
- ret &= test_search_rootDSE(ldb, &rootDSE);
+ ret = ret && test_search_rootDSE(ldb, &rootDSE);
if (!ret) goto failed;
- ret &= test_create_schema(ldb, &rootDSE, &schema);
+ ret = ret && test_create_schema(ldb, &rootDSE, &schema);
if (!ret) goto failed;
- ret &= test_dump_not_replicated(ldb, &rootDSE, schema);
- ret &= test_dump_partial(ldb, &rootDSE, schema);
- ret &= test_dump_contructed(ldb, &rootDSE, schema);
- ret &= test_dump_sorted_syntax(ldb, &rootDSE, schema);
+ ret = ret && test_dump_not_replicated(ldb, &rootDSE, schema);
+ ret = ret && test_dump_partial(ldb, &rootDSE, schema);
+ ret = ret && test_dump_contructed(ldb, &rootDSE, schema);
+ ret = ret && test_dump_sorted_syntax(ldb, &rootDSE, schema);
failed:
return ret;
diff --git a/source/torture/ldap/uptodatevector.c b/source/torture/ldap/uptodatevector.c
index cec330b..56c4b89 100644
--- a/source/torture/ldap/uptodatevector.c
+++ b/source/torture/ldap/uptodatevector.c
@@ -168,9 +168,9 @@ bool torture_ldap_uptodatevector(struct torture_context *torture)
0, NULL);
if (!ldb) goto failed;
- ret &= test_check_uptodatevector(torture, ldb, samdb_base_dn(ldb));
- ret &= test_check_uptodatevector(torture, ldb, samdb_config_dn(ldb));
- ret &= test_check_uptodatevector(torture, ldb, samdb_schema_dn(ldb));
+ ret = ret && test_check_uptodatevector(torture, ldb, samdb_base_dn(ldb));
+ ret = ret && test_check_uptodatevector(torture, ldb, samdb_config_dn(ldb));
+ ret = ret && test_check_uptodatevector(torture, ldb, samdb_schema_dn(ldb));
return ret;
failed:
diff --git a/source/torture/nbt/wins.c b/source/torture/nbt/wins.c
index cf115fc..5033381 100644
--- a/source/torture/nbt/wins.c
+++ b/source/torture/nbt/wins.c
@@ -239,54 +239,54 @@ static bool nbt_test_wins(struct torture_context *tctx)
name.type = NBT_NAME_CLIENT;
name.scope = NULL;
- ret &= nbt_test_wins_name(tctx, address, &name, NBT_NODE_H);
+ ret = ret && nbt_test_wins_name(tctx, address, &name, NBT_NODE_H);
name.type = NBT_NAME_MASTER;
- ret &= nbt_test_wins_name(tctx, address, &name, NBT_NODE_H);
+ ret = ret && nbt_test_wins_name(tctx, address, &name, NBT_NODE_H);
- ret &= nbt_test_wins_name(tctx, address, &name, NBT_NODE_H | NBT_NM_GROUP);
+ ret = ret && nbt_test_wins_name(tctx, address, &name, NBT_NODE_H | NBT_NM_GROUP);
name.type = NBT_NAME_SERVER;
- ret &= nbt_test_wins_name(tctx, address, &name, NBT_NODE_H);
+ ret = ret && nbt_test_wins_name(tctx, address, &name, NBT_NODE_H);
name.type = NBT_NAME_LOGON;
- ret &= nbt_test_wins_name(tctx, address, &name, NBT_NODE_H | NBT_NM_GROUP);
+ ret = ret && nbt_test_wins_name(tctx, address, &name, NBT_NODE_H | NBT_NM_GROUP);
name.type = NBT_NAME_BROWSER;
- ret &= nbt_test_wins_name(tctx, address, &name, NBT_NODE_H | NBT_NM_GROUP);
+ ret = ret && nbt_test_wins_name(tctx, address, &name, NBT_NODE_H | NBT_NM_GROUP);
name.type = NBT_NAME_PDC;
- ret &= nbt_test_wins_name(tctx, address, &name, NBT_NODE_H);
+ ret = ret && nbt_test_wins_name(tctx, address, &name, NBT_NODE_H);
name.type = 0xBF;
- ret &= nbt_test_wins_name(tctx, address, &name, NBT_NODE_H);
+ ret = ret && nbt_test_wins_name(tctx, address, &name, NBT_NODE_H);
name.type = 0xBE;
- ret &= nbt_test_wins_name(tctx, address, &name, NBT_NODE_H);
+ ret = ret && nbt_test_wins_name(tctx, address, &name, NBT_NODE_H);
name.scope = "example";
name.type = 0x72;
- ret &= nbt_test_wins_name(tctx, address, &name, NBT_NODE_H);
+ ret = ret && nbt_test_wins_name(tctx, address, &name, NBT_NODE_H);
name.scope = "example";
name.type = 0x71;
- ret &= nbt_test_wins_name(tctx, address, &name, NBT_NODE_H | NBT_NM_GROUP);
+ ret = ret && nbt_test_wins_name(tctx, address, &name, NBT_NODE_H | NBT_NM_GROUP);
name.scope = "foo.example.com";
name.type = 0x72;
- ret &= nbt_test_wins_name(tctx, address, &name, NBT_NODE_H);
+ ret = ret && nbt_test_wins_name(tctx, address, &name, NBT_NODE_H);
name.name = talloc_asprintf(tctx, "_T\01-%5u.foo", r);
- ret &= nbt_test_wins_name(tctx, address, &name, NBT_NODE_H);
+ ret = ret && nbt_test_wins_name(tctx, address, &name, NBT_NODE_H);
name.name = "";
- ret &= nbt_test_wins_name(tctx, address, &name, NBT_NODE_H);
+ ret = ret && nbt_test_wins_name(tctx, address, &name, NBT_NODE_H);
name.name = talloc_asprintf(tctx, ".");
- ret &= nbt_test_wins_name(tctx, address, &name, NBT_NODE_H);
+ ret = ret && nbt_test_wins_name(tctx, address, &name, NBT_NODE_H);
name.name = talloc_asprintf(tctx, "%5u-\377\200\300FOO", r);
- ret &= nbt_test_wins_name(tctx, address, &name, NBT_NODE_H);
+ ret = ret && nbt_test_wins_name(tctx, address, &name, NBT_NODE_H);
return ret;
}
diff --git a/source/torture/nbt/winsreplication.c b/source/torture/nbt/winsreplication.c
index d96ed3e..2180721 100644
--- a/source/torture/nbt/winsreplication.c
+++ b/source/torture/nbt/winsreplication.c
@@ -1157,12 +1157,12 @@ static bool test_conflict_same_owner(struct torture_context *tctx,
}
wins_name_cur->unknown = "255.255.255.255";
- ret &= test_wrepl_update_one(tctx, ctx, &ctx->a,wins_name_cur);
+ ret = ret && test_wrepl_update_one(tctx, ctx, &ctx->a,wins_name_cur);
if (records[i].state == WREPL_STATE_RELEASED) {
- ret &= test_wrepl_is_applied(tctx, ctx, &ctx->a, wins_name_last, false);
- ret &= test_wrepl_is_applied(tctx, ctx, &ctx->a, wins_name_cur, false);
+ ret = ret && test_wrepl_is_applied(tctx, ctx, &ctx->a, wins_name_last, false);
+ ret = ret && test_wrepl_is_applied(tctx, ctx, &ctx->a, wins_name_cur, false);
} else {
- ret &= test_wrepl_is_applied(tctx, ctx, &ctx->a, wins_name_cur, true);
+ ret = ret && test_wrepl_is_applied(tctx, ctx, &ctx->a, wins_name_cur, true);
}
/* the first one is a cleanup run */
@@ -4841,8 +4841,8 @@ static bool test_conflict_different_owner(struct torture_context *tctx,
wins_name_r1->unknown = "255.255.255.255";
/* now apply R1 */
- ret &= test_wrepl_update_one(tctx, ctx, records[i].r1.owner, wins_name_r1);
- ret &= test_wrepl_is_applied(tctx, ctx, records[i].r1.owner,
+ ret = ret && test_wrepl_update_one(tctx, ctx, records[i].r1.owner, wins_name_r1);
+ ret = ret && test_wrepl_is_applied(tctx, ctx, records[i].r1.owner,
wins_name_r1, records[i].r1.apply_expected);
/*
@@ -4863,12 +4863,12 @@ static bool test_conflict_different_owner(struct torture_context *tctx,
wins_name_r2->unknown = "255.255.255.255";
/* now apply R2 */
- ret &= test_wrepl_update_one(tctx, ctx, records[i].r2.owner, wins_name_r2);
+ ret = ret && test_wrepl_update_one(tctx, ctx, records[i].r2.owner, wins_name_r2);
if (records[i].r1.state == WREPL_STATE_RELEASED) {
- ret &= test_wrepl_is_applied(tctx, ctx, records[i].r1.owner,
+ ret = ret && test_wrepl_is_applied(tctx, ctx, records[i].r1.owner,
wins_name_r1, false);
} else if (records[i].r2.sgroup_merge) {
- ret &= test_wrepl_sgroup_merged(tctx, ctx, records[i].r2.merge_owner,
+ ret = ret && test_wrepl_sgroup_merged(tctx, ctx, records[i].r2.merge_owner,
records[i].r1.owner,
records[i].r1.num_ips, records[i].r1.ips,
records[i].r2.owner,
@@ -4877,14 +4877,14 @@ static bool test_conflict_different_owner(struct torture_context *tctx,
} else if (records[i].r1.owner != records[i].r2.owner) {
bool _expected;
_expected = (records[i].r1.apply_expected && !records[i].r2.apply_expected);
- ret &= test_wrepl_is_applied(tctx, ctx, records[i].r1.owner,
+ ret = ret && test_wrepl_is_applied(tctx, ctx, records[i].r1.owner,
wins_name_r1, _expected);
}
if (records[i].r2.state == WREPL_STATE_RELEASED) {
- ret &= test_wrepl_is_applied(tctx, ctx, records[i].r2.owner,
+ ret = ret && test_wrepl_is_applied(tctx, ctx, records[i].r2.owner,
wins_name_r2, false);
} else if (!records[i].r2.sgroup_merge) {
- ret &= test_wrepl_is_applied(tctx, ctx, records[i].r2.owner,
+ ret = ret && test_wrepl_is_applied(tctx, ctx, records[i].r2.owner,
wins_name_r2, records[i].r2.apply_expected);
}
@@ -4903,11 +4903,11 @@ static bool test_conflict_different_owner(struct torture_context *tctx,
wins_name_r1->addresses.addresses.num_ips = 0;
wins_name_r1->addresses.addresses.ips = NULL;
wins_name_r1->unknown = "255.255.255.255";
- ret &= test_wrepl_update_one(tctx, ctx, records[i].r1.owner, wins_name_r1);
+ ret = ret && test_wrepl_update_one(tctx, ctx, records[i].r1.owner, wins_name_r1);
/* here we test how names from an owner are deleted */
if (records[i].r2.sgroup_merge && records[i].r2.num_ips) {
- ret &= test_wrepl_sgroup_merged(tctx, ctx, NULL,
+ ret = ret && test_wrepl_sgroup_merged(tctx, ctx, NULL,
records[i].r2.owner,
records[i].r2.num_ips, records[i].r2.ips,
records[i].r1.owner,
@@ -4924,7 +4924,7 @@ static bool test_conflict_different_owner(struct torture_context *tctx,
wins_name_r2->addresses.addresses.num_ips = 0;
wins_name_r2->addresses.addresses.ips = NULL;
wins_name_r2->unknown = "255.255.255.255";
- ret &= test_wrepl_update_one(tctx, ctx, records[i].r2.owner, wins_name_r2);
+ ret = ret && test_wrepl_update_one(tctx, ctx, records[i].r2.owner, wins_name_r2);
/* take ownership of the SGROUP record */
wins_name_r2->name = &records[i].name;
@@ -4935,8 +4935,8 @@ static bool test_conflict_different_owner(struct torture_context *tctx,
wins_name_r2->addresses.addresses.num_ips = ARRAY_SIZE(addresses_B_1);
wins_name_r2->addresses.addresses.ips = discard_const(addresses_B_1);
wins_name_r2->unknown = "255.255.255.255";
- ret &= test_wrepl_update_one(tctx, ctx, records[i].r2.owner, wins_name_r2);
- ret &= test_wrepl_is_applied(tctx, ctx, records[i].r2.owner, wins_name_r2, true);
+ ret = ret && test_wrepl_update_one(tctx, ctx, records[i].r2.owner, wins_name_r2);
+ ret = ret && test_wrepl_is_applied(tctx, ctx, records[i].r2.owner, wins_name_r2, true);
/* overwrite the SGROUP record with unique,tombstone */
wins_name_r2->name = &records[i].name;
@@ -4947,8 +4947,8 @@ static bool test_conflict_different_owner(struct torture_context *tctx,
wins_name_r2->addresses.addresses.num_ips = ARRAY_SIZE(addresses_B_1);
wins_name_r2->addresses.addresses.ips = discard_const(addresses_B_1);
wins_name_r2->unknown = "255.255.255.255";
- ret &= test_wrepl_update_one(tctx, ctx, records[i].r2.owner, wins_name_r2);
- ret &= test_wrepl_is_applied(tctx, ctx, records[i].r2.owner, wins_name_r2, true);
+ ret = ret && test_wrepl_update_one(tctx, ctx, records[i].r2.owner, wins_name_r2);
+ ret = ret && test_wrepl_is_applied(tctx, ctx, records[i].r2.owner, wins_name_r2, true);
if (!ret) {
torture_comment(tctx, "failed in sgroup_cleanup record[%u]: %s\n", i, records[i].line);
@@ -6599,8 +6599,8 @@ static bool test_conflict_owned_released_vs_replica(struct torture_context *tctx
}
wins_name->unknown = "255.255.255.255";
- ret &= test_wrepl_update_one(tctx, ctx, &ctx->b, wins_name);
- ret &= test_wrepl_is_applied(tctx, ctx, &ctx->b, wins_name,
+ ret = ret && test_wrepl_update_one(tctx, ctx, &ctx->b, wins_name);
+ ret = ret && test_wrepl_is_applied(tctx, ctx, &ctx->b, wins_name,
records[i].replica.apply_expected);
if (records[i].replica.apply_expected) {
@@ -6612,8 +6612,8 @@ static bool test_conflict_owned_released_vs_replica(struct torture_context *tctx
wins_name->addresses.ip = addresses_B_1[0].ip;
wins_name->unknown = "255.255.255.255";
- ret &= test_wrepl_update_one(tctx, ctx, &ctx->b, wins_name);
- ret &= test_wrepl_is_applied(tctx, ctx, &ctx->b, wins_name, true);
+ ret = ret && test_wrepl_update_one(tctx, ctx, &ctx->b, wins_name);
+ ret = ret && test_wrepl_is_applied(tctx, ctx, &ctx->b, wins_name, true);
} else {
release->in.name = records[i].name;
release->in.dest_addr = ctx->address;
@@ -9251,7 +9251,7 @@ static bool test_conflict_owned_active_vs_replica(struct torture_context *tctx,
event_loop_once(ctx->nbtsock_srv->event_ctx);
if (timeval_expired(&end)) break;
}
- ret &= records[i].defend.ret;
+ ret = ret && records[i].defend.ret;
}
status = nbt_name_register_recv(req, ctx, name_register);
@@ -9300,7 +9300,7 @@ static bool test_conflict_owned_active_vs_replica(struct torture_context *tctx,
}
wins_name->unknown = "255.255.255.255";
- ret &= test_wrepl_update_one(tctx, ctx, &ctx->b, wins_name);
+ ret = ret && test_wrepl_update_one(tctx, ctx, &ctx->b, wins_name);
/*
* wait for the name query, which is handled in
@@ -9312,7 +9312,7 @@ static bool test_conflict_owned_active_vs_replica(struct torture_context *tctx,
event_loop_once(ctx->nbtsock_srv->event_ctx);
if (timeval_expired(&end)) break;
}
- ret &= records[i].defend.ret;
+ ret = ret && records[i].defend.ret;
if (records[i].defend.late_release) {
records[i].defend = record.defend;
@@ -9327,24 +9327,24 @@ static bool test_conflict_owned_active_vs_replica(struct torture_context *tctx,
event_loop_once(ctx->nbtsock_srv->event_ctx);
if (timeval_expired(&end)) break;
}
- ret &= records[i].defend.ret;
+ ret = ret && records[i].defend.ret;
}
if (records[i].replica.mhomed_merge) {
- ret &= test_wrepl_mhomed_merged(tctx, ctx, &ctx->c,
+ ret = ret && test_wrepl_mhomed_merged(tctx, ctx, &ctx->c,
records[i].wins.num_ips, records[i].wins.ips,
&ctx->b,
records[i].replica.num_ips, records[i].replica.ips,
wins_name);
} else if (records[i].replica.sgroup_merge) {
- ret &= test_wrepl_sgroup_merged(tctx, ctx, NULL,
+ ret = ret && test_wrepl_sgroup_merged(tctx, ctx, NULL,
&ctx->c,
records[i].wins.num_ips, records[i].wins.ips,
&ctx->b,
records[i].replica.num_ips, records[i].replica.ips,
wins_name);
} else {
- ret &= test_wrepl_is_applied(tctx, ctx, &ctx->b, wins_name,
+ ret = ret && test_wrepl_is_applied(tctx, ctx, &ctx->b, wins_name,
records[i].replica.apply_expected);
}
@@ -9358,8 +9358,8 @@ static bool test_conflict_owned_active_vs_replica(struct torture_context *tctx,
wins_name->addresses.ip = addresses_B_1[0].ip;
wins_name->unknown = "255.255.255.255";
- ret &= test_wrepl_update_one(tctx, ctx, &ctx->b, wins_name);
- ret &= test_wrepl_is_applied(tctx, ctx, &ctx->b, wins_name, true);
+ ret = ret && test_wrepl_update_one(tctx, ctx, &ctx->b, wins_name);
+ ret = ret && test_wrepl_is_applied(tctx, ctx, &ctx->b, wins_name, true);
} else {
for (j=0; j < count; j++) {
struct nbt_name_socket *nbtsock = ctx->nbtsock;
@@ -9400,7 +9400,7 @@ static bool test_conflict_owned_active_vs_replica(struct torture_context *tctx,
wins_name->addresses.addresses.num_ips = 0;
wins_name->addresses.addresses.ips = NULL;
wins_name->unknown = "255.255.255.255";
- ret &= test_wrepl_update_one(tctx, ctx, &ctx->b, wins_name);
+ ret = ret && test_wrepl_update_one(tctx, ctx, &ctx->b, wins_name);
/* take ownership of the SGROUP record */
wins_name->name = &records[i].name;
@@ -9411,8 +9411,8 @@ static bool test_conflict_owned_active_vs_replica(struct torture_context *tctx,
wins_name->addresses.addresses.num_ips = ARRAY_SIZE(addresses_B_1);
wins_name->addresses.addresses.ips = discard_const(addresses_B_1);
wins_name->unknown = "255.255.255.255";
- ret &= test_wrepl_update_one(tctx, ctx, &ctx->b, wins_name);
- ret &= test_wrepl_is_applied(tctx, ctx, &ctx->b, wins_name, true);
+ ret = ret && test_wrepl_update_one(tctx, ctx, &ctx->b, wins_name);
+ ret = ret && test_wrepl_is_applied(tctx, ctx, &ctx->b, wins_name, true);
/* overwrite the SGROUP record with unique,tombstone */
wins_name->name = &records[i].name;
@@ -9422,8 +9422,8 @@ static bool test_conflict_owned_active_vs_replica(struct torture_context *tctx,
wins_name->id = ++ctx->b.max_version;
wins_name->addresses.ip = addresses_A_1[0].ip;
wins_name->unknown = "255.255.255.255";
- ret &= test_wrepl_update_one(tctx, ctx, &ctx->b, wins_name);
- ret &= test_wrepl_is_applied(tctx, ctx, &ctx->b, wins_name, true);
+ ret = ret && test_wrepl_update_one(tctx, ctx, &ctx->b, wins_name);
+ ret = ret && test_wrepl_is_applied(tctx, ctx, &ctx->b, wins_name, true);
}
}
@@ -9644,8 +9644,8 @@ static bool torture_nbt_winsreplication_replica(struct torture_context *tctx)
ctx = test_create_conflict_ctx(tctx, address);
if (!ctx) return false;
- ret &= test_conflict_same_owner(tctx, ctx);
- ret &= test_conflict_different_owner(tctx, ctx);
+ ret = ret && test_conflict_same_owner(tctx, ctx);
+ ret = ret && test_conflict_different_owner(tctx, ctx);
return ret;
}
@@ -9670,8 +9670,8 @@ static bool torture_nbt_winsreplication_owned(struct torture_context *tctx)
ctx = test_create_conflict_ctx(tctx, address);
torture_assert(tctx, ctx != NULL, "Creating context failed");
- ret &= test_conflict_owned_released_vs_replica(tctx, ctx);
- ret &= test_conflict_owned_active_vs_replica(tctx, ctx);
+ ret = ret && test_conflict_owned_released_vs_replica(tctx, ctx);
+ ret = ret && test_conflict_owned_active_vs_replica(tctx, ctx);
return ret;
}
diff --git a/source/torture/raw/acls.c b/source/torture/raw/acls.c
index 95e7282..413f723 100644
--- a/source/torture/raw/acls.c
+++ b/source/torture/raw/acls.c
@@ -1742,14 +1742,14 @@ bool torture_raw_acls(struct torture_context *tctx, struct smbcli_state *cli)
return false;
}
- ret &= test_sd(tctx, cli);
- ret &= test_nttrans_create(tctx, cli);
- ret &= test_creator_sid(tctx, cli);
- ret &= test_generic_bits(tctx, cli);
- ret &= test_owner_bits(tctx, cli);
- ret &= test_inheritance(tctx, cli);
- ret &= test_inheritance_dynamic(tctx, cli);
- ret &= test_sd_get_set(tctx, cli);
+ ret = ret && test_sd(tctx, cli);
+ ret = ret && test_nttrans_create(tctx, cli);
+ ret = ret && test_creator_sid(tctx, cli);
+ ret = ret && test_generic_bits(tctx, cli);
+ ret = ret && test_owner_bits(tctx, cli);
+ ret = ret && test_inheritance(tctx, cli);
+ ret = ret && test_inheritance_dynamic(tctx, cli);
+ ret = ret && test_sd_get_set(tctx, cli);
smb_raw_exit(cli->session);
smbcli_deltree(cli->tree, BASEDIR);
diff --git a/source/torture/raw/chkpath.c b/source/torture/raw/chkpath.c
index 42a3c3c..3b3729b 100644
--- a/source/torture/raw/chkpath.c
+++ b/source/torture/raw/chkpath.c
@@ -84,7 +84,7 @@ static bool test_chkpath(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
status = smb_raw_chkpath(cli->tree, &io);
CHECK_STATUS(status, NT_STATUS_OK, NT_STATUS_OK);
- ret &= test_path(cli, BASEDIR "\\nodir", NT_STATUS_OBJECT_NAME_NOT_FOUND, NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, BASEDIR "\\nodir", NT_STATUS_OBJECT_NAME_NOT_FOUND, NT_STATUS_DOS(ERRDOS,ERRbadpath));
fnum = create_complex_file(cli, mem_ctx, BASEDIR "\\test.txt..");
if (fnum == -1) {
@@ -93,7 +93,7 @@ static bool test_chkpath(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
goto done;
}
- ret &= test_path(cli, BASEDIR "\\test.txt..", NT_STATUS_NOT_A_DIRECTORY, NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, BASEDIR "\\test.txt..", NT_STATUS_NOT_A_DIRECTORY, NT_STATUS_DOS(ERRDOS,ERRbadpath));
if (!torture_set_file_attribute(cli->tree, BASEDIR, FILE_ATTRIBUTE_HIDDEN)) {
printf("failed to set basedir hidden\n");
@@ -101,22 +101,22 @@ static bool test_chkpath(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
goto done;
}
- ret &= test_path(cli, BASEDIR, NT_STATUS_OK, NT_STATUS_OK);
- ret &= test_path(cli, BASEDIR "\\foo\\..\\test.txt..", NT_STATUS_NOT_A_DIRECTORY, NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, "", NT_STATUS_OK, NT_STATUS_OK);
- ret &= test_path(cli, ".", NT_STATUS_OBJECT_NAME_INVALID, NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, ".\\", NT_STATUS_OBJECT_NAME_INVALID, NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, "\\\\\\.\\", NT_STATUS_OBJECT_NAME_INVALID, NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, ".\\.", NT_STATUS_OBJECT_PATH_NOT_FOUND, NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, "." BASEDIR, NT_STATUS_OBJECT_PATH_NOT_FOUND, NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, BASEDIR "\\.", NT_STATUS_OBJECT_NAME_INVALID, NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, BASEDIR "\\.\\test.txt..", NT_STATUS_OBJECT_PATH_NOT_FOUND, NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, ".\\.\\", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, ".\\.\\.", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, ".\\.\\.aaaaa", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, "\\.\\", NT_STATUS_OBJECT_NAME_INVALID,NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, "\\.\\\\", NT_STATUS_OBJECT_NAME_INVALID,NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, "\\.\\\\\\\\\\\\", NT_STATUS_OBJECT_NAME_INVALID,NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, BASEDIR, NT_STATUS_OK, NT_STATUS_OK);
+ ret = ret && test_path(cli, BASEDIR "\\foo\\..\\test.txt..", NT_STATUS_NOT_A_DIRECTORY, NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, "", NT_STATUS_OK, NT_STATUS_OK);
+ ret = ret && test_path(cli, ".", NT_STATUS_OBJECT_NAME_INVALID, NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, ".\\", NT_STATUS_OBJECT_NAME_INVALID, NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, "\\\\\\.\\", NT_STATUS_OBJECT_NAME_INVALID, NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, ".\\.", NT_STATUS_OBJECT_PATH_NOT_FOUND, NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, "." BASEDIR, NT_STATUS_OBJECT_PATH_NOT_FOUND, NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, BASEDIR "\\.", NT_STATUS_OBJECT_NAME_INVALID, NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, BASEDIR "\\.\\test.txt..", NT_STATUS_OBJECT_PATH_NOT_FOUND, NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, ".\\.\\", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, ".\\.\\.", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, ".\\.\\.aaaaa", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, "\\.\\", NT_STATUS_OBJECT_NAME_INVALID,NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, "\\.\\\\", NT_STATUS_OBJECT_NAME_INVALID,NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, "\\.\\\\\\\\\\\\", NT_STATUS_OBJECT_NAME_INVALID,NT_STATUS_DOS(ERRDOS,ERRbadpath));
/* Note that the two following paths are identical but
give different NT status returns for chkpth and findfirst. */
@@ -125,7 +125,7 @@ static bool test_chkpath(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
status = single_search(cli, mem_ctx, "\\.\\\\\\\\\\\\.");
CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_INVALID,NT_STATUS_DOS(ERRDOS,ERRinvalidname));
- ret &= test_path(cli, "\\.\\\\\\\\\\\\.", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, "\\.\\\\\\\\\\\\.", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
/* We expect this open to fail with the same error code as the chkpath below. */
printf("testing Open on %s\n", "\\.\\\\\\\\\\\\.");
@@ -142,31 +142,31 @@ static bool test_chkpath(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
CHECK_STATUS(status, NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, "\\.\\\\xxx", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, "..\\..\\..", NT_STATUS_OBJECT_PATH_SYNTAX_BAD,NT_STATUS_DOS(ERRDOS,ERRinvalidpath));
- ret &= test_path(cli, "\\..", NT_STATUS_OBJECT_PATH_SYNTAX_BAD,NT_STATUS_DOS(ERRDOS,ERRinvalidpath));
- ret &= test_path(cli, "\\.\\\\\\\\\\\\xxx", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, BASEDIR"\\.\\", NT_STATUS_OBJECT_NAME_INVALID,NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, BASEDIR"\\.\\\\", NT_STATUS_OBJECT_NAME_INVALID,NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, BASEDIR"\\.\\nt", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, BASEDIR"\\.\\.\\nt", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, BASEDIR"\\nt", NT_STATUS_OK, NT_STATUS_OK);
- ret &= test_path(cli, BASEDIR".\\foo", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, BASEDIR"xx\\foo", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, ".\\", NT_STATUS_OBJECT_NAME_INVALID,NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, ".\\.", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, ".\\.\\.\\.\\foo\\.\\.\\", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, BASEDIR".\\.\\.\\.\\foo\\.\\.\\", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, BASEDIR".\\.\\.\\.\\foo\\..\\.\\", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, BASEDIR".", NT_STATUS_OBJECT_NAME_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, "\\", NT_STATUS_OK,NT_STATUS_OK);
- ret &= test_path(cli, "\\.", NT_STATUS_OBJECT_NAME_INVALID,NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, "\\..\\", NT_STATUS_OBJECT_PATH_SYNTAX_BAD,NT_STATUS_DOS(ERRDOS,ERRinvalidpath));
- ret &= test_path(cli, "\\..", NT_STATUS_OBJECT_PATH_SYNTAX_BAD,NT_STATUS_DOS(ERRDOS,ERRinvalidpath));
- ret &= test_path(cli, BASEDIR "\\.", NT_STATUS_OBJECT_NAME_INVALID,NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, BASEDIR "\\..", NT_STATUS_OK,NT_STATUS_OK);
- ret &= test_path(cli, BASEDIR "\\nt\\V S\\VB98\\vb600", NT_STATUS_OBJECT_NAME_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, BASEDIR "\\nt\\V S\\VB98\\vb6.exe", NT_STATUS_NOT_A_DIRECTORY,NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, "\\.\\\\xxx", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, "..\\..\\..", NT_STATUS_OBJECT_PATH_SYNTAX_BAD,NT_STATUS_DOS(ERRDOS,ERRinvalidpath));
+ ret = ret && test_path(cli, "\\..", NT_STATUS_OBJECT_PATH_SYNTAX_BAD,NT_STATUS_DOS(ERRDOS,ERRinvalidpath));
+ ret = ret && test_path(cli, "\\.\\\\\\\\\\\\xxx", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, BASEDIR"\\.\\", NT_STATUS_OBJECT_NAME_INVALID,NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, BASEDIR"\\.\\\\", NT_STATUS_OBJECT_NAME_INVALID,NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, BASEDIR"\\.\\nt", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, BASEDIR"\\.\\.\\nt", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, BASEDIR"\\nt", NT_STATUS_OK, NT_STATUS_OK);
+ ret = ret && test_path(cli, BASEDIR".\\foo", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, BASEDIR"xx\\foo", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, ".\\", NT_STATUS_OBJECT_NAME_INVALID,NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, ".\\.", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, ".\\.\\.\\.\\foo\\.\\.\\", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, BASEDIR".\\.\\.\\.\\foo\\.\\.\\", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, BASEDIR".\\.\\.\\.\\foo\\..\\.\\", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, BASEDIR".", NT_STATUS_OBJECT_NAME_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, "\\", NT_STATUS_OK,NT_STATUS_OK);
+ ret = ret && test_path(cli, "\\.", NT_STATUS_OBJECT_NAME_INVALID,NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, "\\..\\", NT_STATUS_OBJECT_PATH_SYNTAX_BAD,NT_STATUS_DOS(ERRDOS,ERRinvalidpath));
+ ret = ret && test_path(cli, "\\..", NT_STATUS_OBJECT_PATH_SYNTAX_BAD,NT_STATUS_DOS(ERRDOS,ERRinvalidpath));
+ ret = ret && test_path(cli, BASEDIR "\\.", NT_STATUS_OBJECT_NAME_INVALID,NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, BASEDIR "\\..", NT_STATUS_OK,NT_STATUS_OK);
+ ret = ret && test_path(cli, BASEDIR "\\nt\\V S\\VB98\\vb600", NT_STATUS_OBJECT_NAME_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, BASEDIR "\\nt\\V S\\VB98\\vb6.exe", NT_STATUS_NOT_A_DIRECTORY,NT_STATUS_DOS(ERRDOS,ERRbadpath));
/* We expect this open to fail with the same error code as the chkpath below. */
printf("testing Open on %s\n", BASEDIR".\\.\\.\\.\\foo\\..\\.\\");
@@ -200,11 +200,11 @@ static bool test_chkpath(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
status = smbcli_nt_error(cli->tree);
CHECK_STATUS(status, NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, BASEDIR "\\nt\\V S\\VB98\\vb6.exe\\3", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, BASEDIR "\\nt\\V S\\VB98\\vb6.exe\\3\\foo", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, BASEDIR "\\nt\\3\\foo", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, BASEDIR "\\nt\\V S\\*\\vb6.exe\\3", NT_STATUS_OBJECT_NAME_INVALID,NT_STATUS_DOS(ERRDOS,ERRbadpath));
- ret &= test_path(cli, BASEDIR "\\nt\\V S\\*\\*\\vb6.exe\\3", NT_STATUS_OBJECT_NAME_INVALID,NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, BASEDIR "\\nt\\V S\\VB98\\vb6.exe\\3", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, BASEDIR "\\nt\\V S\\VB98\\vb6.exe\\3\\foo", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, BASEDIR "\\nt\\3\\foo", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, BASEDIR "\\nt\\V S\\*\\vb6.exe\\3", NT_STATUS_OBJECT_NAME_INVALID,NT_STATUS_DOS(ERRDOS,ERRbadpath));
+ ret = ret && test_path(cli, BASEDIR "\\nt\\V S\\*\\*\\vb6.exe\\3", NT_STATUS_OBJECT_NAME_INVALID,NT_STATUS_DOS(ERRDOS,ERRbadpath));
done:
smbcli_close(cli->tree, fnum);
@@ -246,7 +246,7 @@ bool torture_raw_chkpath(struct torture_context *torture,
goto done;
}
- ret &= test_chkpath(cli, torture);
+ ret = ret && test_chkpath(cli, torture);
done:
diff --git a/source/torture/raw/composite.c b/source/torture/raw/composite.c
index 0367110..4f64462 100644
--- a/source/torture/raw/composite.c
+++ b/source/torture/raw/composite.c
@@ -409,10 +409,10 @@ bool torture_raw_composite(struct torture_context *tctx,
return false;
}
- ret &= test_fetchfile(cli, tctx);
- ret &= test_loadfile(cli, tctx);
- ret &= test_appendacl(cli, tctx);
- ret &= test_fsinfo(cli, tctx);
+ ret = ret && test_fetchfile(cli, tctx);
+ ret = ret && test_loadfile(cli, tctx);
+ ret = ret && test_appendacl(cli, tctx);
+ ret = ret && test_fsinfo(cli, tctx);
smb_raw_exit(cli->session);
smbcli_deltree(cli->tree, BASEDIR);
diff --git a/source/torture/raw/context.c b/source/torture/raw/context.c
index 20135d2..10364d5 100644
--- a/source/torture/raw/context.c
+++ b/source/torture/raw/context.c
@@ -871,12 +871,12 @@ static bool torture_raw_context_int(struct torture_context *tctx,
{
bool ret = true;
- ret &= test_session(cli, tctx);
- ret &= test_tree(cli, tctx);
- ret &= test_tree_ulogoff(cli, tctx);
- ret &= test_pid_exit_only_sees_open(cli, tctx);
- ret &= test_pid_2sess(cli, tctx);
- ret &= test_pid_2tcon(cli, tctx);
+ ret = ret && test_session(cli, tctx);
+ ret = ret && test_tree(cli, tctx);
+ ret = ret && test_tree_ulogoff(cli, tctx);
+ ret = ret && test_pid_exit_only_sees_open(cli, tctx);
+ ret = ret && test_pid_2sess(cli, tctx);
+ ret = ret && test_pid_2tcon(cli, tctx);
smb_raw_exit(cli->session);
smbcli_deltree(cli->tree, BASEDIR);
@@ -891,11 +891,11 @@ bool torture_raw_context(struct torture_context *torture,
{
bool ret = true;
if (lp_use_spnego(torture->lp_ctx)) {
- ret &= torture_raw_context_int(torture, cli);
+ ret = ret && torture_raw_context_int(torture, cli);
lp_set_cmdline(torture->lp_ctx, "use spnego", "False");
}
- ret &= torture_raw_context_int(torture, cli);
+ ret = ret && torture_raw_context_int(torture, cli);
return ret;
}
diff --git a/source/torture/raw/eas.c b/source/torture/raw/eas.c
index bc4473b..806713e 100644
--- a/source/torture/raw/eas.c
+++ b/source/torture/raw/eas.c
@@ -75,7 +75,7 @@ static bool test_eas(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
CHECK_STATUS(status, NT_STATUS_OK);
fnum = io.ntcreatex.out.file.fnum;
- ret &= check_ea(cli, fname, "EAONE", NULL);
+ ret = ret && check_ea(cli, fname, "EAONE", NULL);
printf("Adding first two EAs\n");
setfile.generic.level = RAW_SFILEINFO_EA_SET;
@@ -92,8 +92,8 @@ static bool test_eas(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
status = smb_raw_setfileinfo(cli->tree, &setfile);
CHECK_STATUS(status, NT_STATUS_OK);
- ret &= check_ea(cli, fname, "EAONE", "VALUE1");
- ret &= check_ea(cli, fname, "SECONDEA", "ValueTwo");
+ ret = ret && check_ea(cli, fname, "EAONE", "VALUE1");
+ ret = ret && check_ea(cli, fname, "SECONDEA", "ValueTwo");
printf("Modifying 2nd EA\n");
setfile.ea_set.in.num_eas = 1;
@@ -102,8 +102,8 @@ static bool test_eas(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
status = smb_raw_setfileinfo(cli->tree, &setfile);
CHECK_STATUS(status, NT_STATUS_OK);
- ret &= check_ea(cli, fname, "EAONE", "VALUE1");
- ret &= check_ea(cli, fname, "SECONDEA", " Changed Value");
+ ret = ret && check_ea(cli, fname, "EAONE", "VALUE1");
+ ret = ret && check_ea(cli, fname, "SECONDEA", " Changed Value");
printf("Setting a NULL EA\n");
setfile.ea_set.in.eas[0].value = data_blob(NULL, 0);
@@ -111,9 +111,9 @@ static bool test_eas(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
status = smb_raw_setfileinfo(cli->tree, &setfile);
CHECK_STATUS(status, NT_STATUS_OK);
- ret &= check_ea(cli, fname, "EAONE", "VALUE1");
- ret &= check_ea(cli, fname, "SECONDEA", " Changed Value");
- ret &= check_ea(cli, fname, "NULLEA", NULL);
+ ret = ret && check_ea(cli, fname, "EAONE", "VALUE1");
+ ret = ret && check_ea(cli, fname, "SECONDEA", " Changed Value");
+ ret = ret && check_ea(cli, fname, "NULLEA", NULL);
printf("Deleting first EA\n");
setfile.ea_set.in.eas[0].flags = 0;
@@ -122,8 +122,8 @@ static bool test_eas(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
status = smb_raw_setfileinfo(cli->tree, &setfile);
CHECK_STATUS(status, NT_STATUS_OK);
- ret &= check_ea(cli, fname, "EAONE", NULL);
- ret &= check_ea(cli, fname, "SECONDEA", " Changed Value");
+ ret = ret && check_ea(cli, fname, "EAONE", NULL);
+ ret = ret && check_ea(cli, fname, "SECONDEA", " Changed Value");
printf("Deleting second EA\n");
setfile.ea_set.in.eas[0].flags = 0;
@@ -132,8 +132,8 @@ static bool test_eas(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
status = smb_raw_setfileinfo(cli->tree, &setfile);
CHECK_STATUS(status, NT_STATUS_OK);
- ret &= check_ea(cli, fname, "EAONE", NULL);
- ret &= check_ea(cli, fname, "SECONDEA", NULL);
+ ret = ret && check_ea(cli, fname, "EAONE", NULL);
+ ret = ret && check_ea(cli, fname, "SECONDEA", NULL);
done:
smbcli_close(cli->tree, fnum);
@@ -412,10 +412,10 @@ static bool test_nttrans_create(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
CHECK_STATUS(status, NT_STATUS_OK);
fnum = io.ntcreatex.out.file.fnum;
- ret &= check_ea(cli, fname, "EAONE", NULL);
- ret &= check_ea(cli, fname, "1st EA", "Value One");
- ret &= check_ea(cli, fname, "2nd EA", "Second Value");
- ret &= check_ea(cli, fname, "and 3rd", "final value");
+ ret = ret && check_ea(cli, fname, "EAONE", NULL);
+ ret = ret && check_ea(cli, fname, "1st EA", "Value One");
+ ret = ret && check_ea(cli, fname, "2nd EA", "Second Value");
+ ret = ret && check_ea(cli, fname, "and 3rd", "final value");
smbcli_close(cli->tree, fnum);
@@ -432,10 +432,10 @@ static bool test_nttrans_create(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
CHECK_STATUS(status, NT_STATUS_OK);
fnum = io.ntcreatex.out.file.fnum;
- ret &= check_ea(cli, fname, "1st EA", "Value One");
- ret &= check_ea(cli, fname, "2nd EA", "Second Value");
- ret &= check_ea(cli, fname, "and 3rd", "final value");
- ret &= check_ea(cli, fname, "Fourth EA", NULL);
+ ret = ret && check_ea(cli, fname, "1st EA", "Value One");
+ ret = ret && check_ea(cli, fname, "2nd EA", "Second Value");
+ ret = ret && check_ea(cli, fname, "and 3rd", "final value");
+ ret = ret && check_ea(cli, fname, "Fourth EA", NULL);
done:
smbcli_close(cli->tree, fnum);
@@ -453,8 +453,8 @@ bool torture_raw_eas(struct torture_context *torture, struct smbcli_state *cli)
return false;
}
- ret &= test_eas(cli, torture);
- ret &= test_nttrans_create(cli, torture);
+ ret = ret && test_eas(cli, torture);
+ ret = ret && test_nttrans_create(cli, torture);
smb_raw_exit(cli->session);
@@ -477,7 +477,7 @@ bool torture_max_eas(struct torture_context *torture)
return false;
}
- ret &= test_max_eas(cli, torture);
+ ret = ret && test_max_eas(cli, torture);
smb_raw_exit(cli->session);
if (!maxeadebug) {
diff --git a/source/torture/raw/ioctl.c b/source/torture/raw/ioctl.c
index c4dd4c5..c7adf86 100644
--- a/source/torture/raw/ioctl.c
+++ b/source/torture/raw/ioctl.c
@@ -160,8 +160,8 @@ bool torture_raw_ioctl(struct torture_context *torture,
return false;
}
- ret &= test_ioctl(cli, torture);
- ret &= test_fsctl(cli, torture);
+ ret = ret && test_ioctl(cli, torture);
+ ret = ret && test_fsctl(cli, torture);
smb_raw_exit(cli->session);
smbcli_deltree(cli->tree, BASEDIR);
diff --git a/source/torture/raw/mux.c b/source/torture/raw/mux.c
index 846a978..7655f37 100644
--- a/source/torture/raw/mux.c
+++ b/source/torture/raw/mux.c
@@ -350,9 +350,9 @@ bool torture_raw_mux(struct torture_context *torture, struct smbcli_state *cli)
return false;
}
- ret &= test_mux_open(cli, torture);
- ret &= test_mux_write(cli, torture);
- ret &= test_mux_lock(cli, torture);
+ ret = ret && test_mux_open(cli, torture);
+ ret = ret && test_mux_write(cli, torture);
+ ret = ret && test_mux_lock(cli, torture);
smb_raw_exit(cli->session);
smbcli_deltree(cli->tree, BASEDIR);
diff --git a/source/torture/raw/notify.c b/source/torture/raw/notify.c
index 2967abd..bde6a33 100644
--- a/source/torture/raw/notify.c
+++ b/source/torture/raw/notify.c
@@ -383,23 +383,23 @@ static bool test_notify_recursive(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
CHECK_VAL(notify.nttrans.out.changes[4].action, NOTIFY_ACTION_NEW_NAME);
CHECK_WSTR(notify.nttrans.out.changes[4].name, "subdir-name\\subname1-r", STR_UNICODE);
- ret &= check_rename_reply(
+ ret = ret && check_rename_reply(
cli, __LINE__, ¬ify.nttrans.out.changes[5],
NOTIFY_ACTION_ADDED, "subname2-r");
- ret &= check_rename_reply(
+ ret = ret && check_rename_reply(
cli, __LINE__, ¬ify.nttrans.out.changes[5],
NOTIFY_ACTION_REMOVED, "subdir-name\\subname2");
- ret &= check_rename_reply(
+ ret = ret && check_rename_reply(
cli, __LINE__, ¬ify.nttrans.out.changes[5],
NOTIFY_ACTION_MODIFIED, "subname2-r");
- ret &= check_rename_reply(
+ ret = ret && check_rename_reply(
cli, __LINE__, ¬ify.nttrans.out.changes[8],
NOTIFY_ACTION_OLD_NAME, "subname2-r");
- ret &= check_rename_reply(
+ ret = ret && check_rename_reply(
cli, __LINE__, ¬ify.nttrans.out.changes[8],
NOTIFY_ACTION_NEW_NAME, "subname3-r");
- ret &= check_rename_reply(
+ ret = ret && check_rename_reply(
cli, __LINE__, ¬ify.nttrans.out.changes[8],
NOTIFY_ACTION_MODIFIED, "subname3-r");
@@ -1293,17 +1293,17 @@ bool torture_raw_notify(struct torture_context *torture,
return false;
}
- ret &= test_notify_dir(cli, cli2, torture);
- ret &= test_notify_mask(cli, torture);
- ret &= test_notify_recursive(cli, torture);
- ret &= test_notify_mask_change(cli, torture);
- ret &= test_notify_file(cli, torture);
- ret &= test_notify_tdis(torture);
- ret &= test_notify_exit(torture);
- ret &= test_notify_ulogoff(torture);
- ret &= test_notify_tcp_dis(torture);
- ret &= test_notify_double(cli, torture);
- ret &= test_notify_tree(cli, torture);
+ ret = ret && test_notify_dir(cli, cli2, torture);
+ ret = ret && test_notify_mask(cli, torture);
+ ret = ret && test_notify_recursive(cli, torture);
+ ret = ret && test_notify_mask_change(cli, torture);
+ ret = ret && test_notify_file(cli, torture);
+ ret = ret && test_notify_tdis(torture);
+ ret = ret && test_notify_exit(torture);
+ ret = ret && test_notify_ulogoff(torture);
+ ret = ret && test_notify_tcp_dis(torture);
+ ret = ret && test_notify_double(cli, torture);
+ ret = ret && test_notify_tree(cli, torture);
smb_raw_exit(cli->session);
smbcli_deltree(cli->tree, BASEDIR);
diff --git a/source/torture/raw/open.c b/source/torture/raw/open.c
index 76bc0ca..8181cd0 100644
--- a/source/torture/raw/open.c
+++ b/source/torture/raw/open.c
@@ -1467,18 +1467,18 @@ bool torture_raw_open(struct torture_context *torture, struct smbcli_state *cli)
return false;
}
- ret &= test_ntcreatex_brlocked(cli, torture);
- ret &= test_open(cli, torture);
- ret &= test_raw_open_multi(torture);
- ret &= test_openx(cli, torture);
- ret &= test_ntcreatex(cli, torture);
- ret &= test_nttrans_create(cli, torture);
- ret &= test_t2open(cli, torture);
- ret &= test_mknew(cli, torture);
- ret &= test_create(cli, torture);
- ret &= test_ctemp(cli, torture);
- ret &= test_chained(cli, torture);
- ret &= test_no_leading_slash(cli, torture);
+ ret = ret && test_ntcreatex_brlocked(cli, torture);
+ ret = ret && test_open(cli, torture);
+ ret = ret && test_raw_open_multi(torture);
+ ret = ret && test_openx(cli, torture);
+ ret = ret && test_ntcreatex(cli, torture);
+ ret = ret && test_nttrans_create(cli, torture);
+ ret = ret && test_t2open(cli, torture);
+ ret = ret && test_mknew(cli, torture);
+ ret = ret && test_create(cli, torture);
+ ret = ret && test_ctemp(cli, torture);
+ ret = ret && test_chained(cli, torture);
+ ret = ret && test_no_leading_slash(cli, torture);
smb_raw_exit(cli->session);
smbcli_deltree(cli->tree, BASEDIR);
diff --git a/source/torture/raw/search.c b/source/torture/raw/search.c
index 0242b9c..f403102 100644
--- a/source/torture/raw/search.c
+++ b/source/torture/raw/search.c
@@ -876,16 +876,16 @@ static bool test_modify_search(struct torture_context *tctx,
CHECK_STATUS(status, NT_STATUS_OK);
CHECK_VALUE(result.count, 20);
- ret &= check_result(&result, "t009-9.txt", true, FILE_ATTRIBUTE_ARCHIVE);
- ret &= check_result(&result, "t014-14.txt", false, 0);
- ret &= check_result(&result, "t015-15.txt", false, 0);
- ret &= check_result(&result, "t016-16.txt", true, FILE_ATTRIBUTE_NORMAL);
- ret &= check_result(&result, "t017-17.txt", false, 0);
- ret &= check_result(&result, "t018-18.txt", true, FILE_ATTRIBUTE_ARCHIVE);
- ret &= check_result(&result, "t019-19.txt", true, FILE_ATTRIBUTE_ARCHIVE);
- ret &= check_result(&result, "T013-13.txt.2", true, FILE_ATTRIBUTE_ARCHIVE);
- ret &= check_result(&result, "T003-3.txt.2", false, 0);
- ret &= check_result(&result, "T013-13.txt.3", true, FILE_ATTRIBUTE_ARCHIVE);
+ ret = ret && check_result(&result, "t009-9.txt", true, FILE_ATTRIBUTE_ARCHIVE);
+ ret = ret && check_result(&result, "t014-14.txt", false, 0);
+ ret = ret && check_result(&result, "t015-15.txt", false, 0);
+ ret = ret && check_result(&result, "t016-16.txt", true, FILE_ATTRIBUTE_NORMAL);
+ ret = ret && check_result(&result, "t017-17.txt", false, 0);
+ ret = ret && check_result(&result, "t018-18.txt", true, FILE_ATTRIBUTE_ARCHIVE);
+ ret = ret && check_result(&result, "t019-19.txt", true, FILE_ATTRIBUTE_ARCHIVE);
+ ret = ret && check_result(&result, "T013-13.txt.2", true, FILE_ATTRIBUTE_ARCHIVE);
+ ret = ret && check_result(&result, "T003-3.txt.2", false, 0);
+ ret = ret && check_result(&result, "T013-13.txt.3", true, FILE_ATTRIBUTE_ARCHIVE);
if (!ret) {
for (i=0;i<result.count;i++) {
diff --git a/source/torture/raw/seek.c b/source/torture/raw/seek.c
index 3ba022f..3e93db3 100644
--- a/source/torture/raw/seek.c
+++ b/source/torture/raw/seek.c
@@ -237,7 +237,7 @@ bool torture_raw_seek(struct torture_context *torture, struct smbcli_state *cli)
{
bool ret = true;
- ret &= test_seek(cli, torture);
+ ret = ret && test_seek(cli, torture);
return ret;
}
diff --git a/source/torture/raw/streams.c b/source/torture/raw/streams.c
index ca6b488..65600af 100644
--- a/source/torture/raw/streams.c
+++ b/source/torture/raw/streams.c
@@ -214,7 +214,7 @@ static bool test_stream_io(struct torture_context *tctx,
CHECK_STATUS(status, NT_STATUS_OK);
fnum = io.ntcreatex.out.file.fnum;
- ret &= check_stream(cli, __location__, mem_ctx, fname, "Stream One", NULL);
+ ret = ret && check_stream(cli, __location__, mem_ctx, fname, "Stream One", NULL);
printf("(%s) check that open of base file is allowed\n", __location__);
io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN;
@@ -229,7 +229,7 @@ static bool test_stream_io(struct torture_context *tctx,
smbcli_close(cli->tree, fnum);
- ret &= check_stream(cli, __location__, mem_ctx, fname, "Stream One", "test data");
+ ret = ret && check_stream(cli, __location__, mem_ctx, fname, "Stream One", "test data");
io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN;
io.ntcreatex.in.fname = sname1;
@@ -243,7 +243,7 @@ static bool test_stream_io(struct torture_context *tctx,
smbcli_close(cli->tree, fnum);
- ret &= check_stream(cli, __location__, mem_ctx, fname, "Stream One:$FOO", NULL);
+ ret = ret && check_stream(cli, __location__, mem_ctx, fname, "Stream One:$FOO", NULL);
printf("(%s) creating a stream2 on a existing file\n", __location__);
io.ntcreatex.in.fname = sname2;
@@ -258,17 +258,17 @@ static bool test_stream_io(struct torture_context *tctx,
smbcli_close(cli->tree, fnum);
- ret &= check_stream(cli, __location__, mem_ctx, fname, "Stream One", "test MORE DATA ");
- ret &= check_stream(cli, __location__, mem_ctx, fname, "Stream One:$DATA", "test MORE DATA ");
- ret &= check_stream(cli, __location__, mem_ctx, fname, "Stream One:", NULL);
- ret &= check_stream(cli, __location__, mem_ctx, fname, "Second Stream", "SECOND STREAM");
+ ret = ret && check_stream(cli, __location__, mem_ctx, fname, "Stream One", "test MORE DATA ");
+ ret = ret && check_stream(cli, __location__, mem_ctx, fname, "Stream One:$DATA", "test MORE DATA ");
+ ret = ret && check_stream(cli, __location__, mem_ctx, fname, "Stream One:", NULL);
+ ret = ret && check_stream(cli, __location__, mem_ctx, fname, "Second Stream", "SECOND STREAM");
if (!torture_setting_bool(tctx, "samba4", false)) {
- ret &= check_stream(cli, __location__, mem_ctx, fname,
+ ret = ret && check_stream(cli, __location__, mem_ctx, fname,
"SECOND STREAM:$DATA", "SECOND STREAM");
}
- ret &= check_stream(cli, __location__, mem_ctx, fname, "Second Stream:$DATA", "SECOND STREAM");
- ret &= check_stream(cli, __location__, mem_ctx, fname, "Second Stream:", NULL);
- ret &= check_stream(cli, __location__, mem_ctx, fname, "Second Stream:$FOO", NULL);
+ ret = ret && check_stream(cli, __location__, mem_ctx, fname, "Second Stream:$DATA", "SECOND STREAM");
+ ret = ret && check_stream(cli, __location__, mem_ctx, fname, "Second Stream:", NULL);
+ ret = ret && check_stream(cli, __location__, mem_ctx, fname, "Second Stream:$FOO", NULL);
check_stream_list(cli, fname, 3, three);
@@ -557,10 +557,10 @@ bool torture_raw_streams(struct torture_context *torture,
return false;
}
- ret &= test_stream_io(torture, cli, torture);
- ret &= test_stream_sharemodes(torture, cli, torture);
+ ret = ret && test_stream_io(torture, cli, torture);
+ ret = ret && test_stream_sharemodes(torture, cli, torture);
if (!torture_setting_bool(torture, "samba4", false)) {
- ret &= test_stream_delete(torture, cli, torture);
+ ret = ret && test_stream_delete(torture, cli, torture);
}
smb_raw_exit(cli->session);
diff --git a/source/torture/rpc/alter_context.c b/source/torture/rpc/alter_context.c
index 7843713..63fb0c6 100644
--- a/source/torture/rpc/alter_context.c
+++ b/source/torture/rpc/alter_context.c
@@ -56,10 +56,10 @@ bool torture_rpc_alter_context(struct torture_context *torture)
"dcerpc_alter_context with wrong version should fail");
torture_comment(torture, "testing DSSETUP pipe operations\n");
- ret &= test_DsRoleGetPrimaryDomainInformation(torture, p2);
+ ret = ret && test_DsRoleGetPrimaryDomainInformation(torture, p2);
if (handle) {
- ret &= test_lsa_Close(p, torture, handle);
+ ret = ret && test_lsa_Close(p, torture, handle);
}
syntax = p->syntax;
@@ -70,17 +70,17 @@ bool torture_rpc_alter_context(struct torture_context *torture)
torture_assert_ntstatus_ok(torture, status, "dcerpc_alter_context failed");
torture_comment(torture, "testing DSSETUP pipe operations - should fault\n");
- ret &= test_DsRoleGetPrimaryDomainInformation_ext(torture, p, NT_STATUS_NET_WRITE_FAULT);
+ ret = ret && test_DsRoleGetPrimaryDomainInformation_ext(torture, p, NT_STATUS_NET_WRITE_FAULT);
- ret &= test_lsa_OpenPolicy2(p, torture, &handle);
+ ret = ret && test_lsa_OpenPolicy2(p, torture, &handle);
if (handle) {
- ret &= test_lsa_Close(p, torture, handle);
+ ret = ret && test_lsa_Close(p, torture, handle);
}
torture_comment(torture, "testing DSSETUP pipe operations\n");
- ret &= test_DsRoleGetPrimaryDomainInformation(torture, p2);
+ ret = ret && test_DsRoleGetPrimaryDomainInformation(torture, p2);
return ret;
}
diff --git a/source/torture/rpc/countcalls.c b/source/torture/rpc/countcalls.c
index f70649d..02b2424 100644
--- a/source/torture/rpc/countcalls.c
+++ b/source/torture/rpc/countcalls.c
@@ -121,7 +121,7 @@ bool torture_rpc_countcalls(struct torture_context *torture)
for (l=ndr_table_list();l;l=l->next) {
TALLOC_CTX *loop_ctx;
loop_ctx = talloc_named(torture, 0, "torture_rpc_councalls loop context");
- ret &= count_calls(torture, loop_ctx, l->table, true);
+ ret = ret && count_calls(torture, loop_ctx, l->table, true);
talloc_free(loop_ctx);
}
return ret;
diff --git a/source/torture/rpc/dfs.c b/source/torture/rpc/dfs.c
index dc2601d..bb87662 100644
--- a/source/torture/rpc/dfs.c
+++ b/source/torture/rpc/dfs.c
@@ -514,13 +514,13 @@ static bool test_StdRoot(struct dcerpc_pipe *p,
test_cleanup_stdroot(p, mem_ctx, tctx, host, sharename, dir);
- ret &= test_CreateDir(mem_ctx, &cli, tctx, host, "C$", dir);
- ret &= test_NetShareAdd(mem_ctx, tctx, host, sharename, path);
- ret &= test_AddStdRoot(p, mem_ctx, host, sharename);
- ret &= test_RemoveStdRoot(p, mem_ctx, host, sharename);
- ret &= test_AddStdRootForced(p, mem_ctx, host, sharename);
- ret &= test_NetShareDel(mem_ctx, tctx, host, sharename);
- ret &= test_DeleteDir(cli, dir);
+ ret = ret && test_CreateDir(mem_ctx, &cli, tctx, host, "C$", dir);
+ ret = ret && test_NetShareAdd(mem_ctx, tctx, host, sharename, path);
+ ret = ret && test_AddStdRoot(p, mem_ctx, host, sharename);
+ ret = ret && test_RemoveStdRoot(p, mem_ctx, host, sharename);
+ ret = ret && test_AddStdRootForced(p, mem_ctx, host, sharename);
+ ret = ret && test_NetShareDel(mem_ctx, tctx, host, sharename);
+ ret = ret && test_DeleteDir(cli, dir);
torture_close_connection(cli);
@@ -653,13 +653,13 @@ bool torture_rpc_dfs(struct torture_context *torture)
status = torture_rpc_connection(torture, &p, &ndr_table_netdfs);
torture_assert_ntstatus_ok(torture, status, "Unable to connect");
- ret &= test_GetManagerVersion(p, torture, &version);
- ret &= test_ManagerInitialize(p, torture, host);
- ret &= test_Enum(p, torture);
- ret &= test_EnumEx(p, torture, host);
- ret &= test_StdRoot(p, torture, torture, host);
- ret &= test_FtRoot(p, torture, host);
- ret &= test_DcAddress(p, torture, host);
+ ret = ret && test_GetManagerVersion(p, torture, &version);
+ ret = ret && test_ManagerInitialize(p, torture, host);
+ ret = ret && test_Enum(p, torture);
+ ret = ret && test_EnumEx(p, torture, host);
+ ret = ret && test_StdRoot(p, torture, torture, host);
+ ret = ret && test_FtRoot(p, torture, host);
+ ret = ret && test_DcAddress(p, torture, host);
return ret;
}
diff --git a/source/torture/rpc/drsuapi.c b/source/torture/rpc/drsuapi.c
index 5e01c20..7d10330 100644
--- a/source/torture/rpc/drsuapi.c
+++ b/source/torture/rpc/drsuapi.c
@@ -713,25 +713,25 @@ bool torture_rpc_drsuapi(struct torture_context *torture)
torture_fail(torture, "Unable to connect to DRSUAPI pipe");
}
- ret &= test_DsBind(p, torture, &priv);
+ ret = ret && test_DsBind(p, torture, &priv);
#if 0
- ret &= test_QuerySitesByCost(p, torture, &priv);
+ ret = ret && test_QuerySitesByCost(p, torture, &priv);
#endif
- ret &= test_DsGetDomainControllerInfo(p, torture, &priv);
+ ret = ret && test_DsGetDomainControllerInfo(p, torture, &priv);
- ret &= test_DsCrackNames(torture, p, torture, &priv);
+ ret = ret && test_DsCrackNames(torture, p, torture, &priv);
- ret &= test_DsWriteAccountSpn(p, torture, &priv);
+ ret = ret && test_DsWriteAccountSpn(p, torture, &priv);
- ret &= test_DsReplicaGetInfo(p, torture, &priv);
+ ret = ret && test_DsReplicaGetInfo(p, torture, &priv);
- ret &= test_DsReplicaSync(p, torture, &priv);
+ ret = ret && test_DsReplicaSync(p, torture, &priv);
- ret &= test_DsReplicaUpdateRefs(p, torture, &priv);
+ ret = ret && test_DsReplicaUpdateRefs(p, torture, &priv);
- ret &= test_DsGetNCChanges(p, torture, &priv);
+ ret = ret && test_DsGetNCChanges(p, torture, &priv);
- ret &= test_DsUnbind(p, torture, &priv);
+ ret = ret && test_DsUnbind(p, torture, &priv);
torture_leave_domain(priv.join);
@@ -765,15 +765,15 @@ bool torture_rpc_drsuapi_cracknames(struct torture_context *torture)
torture_fail(torture, "Unable to connect to DRSUAPI pipe");
}
- ret &= test_DsBind(p, torture, &priv);
+ ret = ret && test_DsBind(p, torture, &priv);
if (ret) {
/* We don't care if this fails, we just need some info from it */
test_DsGetDomainControllerInfo(p, torture, &priv);
- ret &= test_DsCrackNames(torture, p, torture, &priv);
+ ret = ret && test_DsCrackNames(torture, p, torture, &priv);
- ret &= test_DsUnbind(p, torture, &priv);
+ ret = ret && test_DsUnbind(p, torture, &priv);
}
torture_leave_domain(priv.join);
diff --git a/source/torture/rpc/dssync.c b/source/torture/rpc/dssync.c
index 4417285..cddc1df 100644
--- a/source/torture/rpc/dssync.c
+++ b/source/torture/rpc/dssync.c
@@ -813,21 +813,21 @@ bool torture_rpc_dssync(struct torture_context *torture)
mem_ctx = talloc_init("torture_rpc_dssync");
ctx = test_create_context(torture);
- ret &= _test_DsBind(torture, ctx, ctx->admin.credentials, &ctx->admin.drsuapi);
+ ret = ret && _test_DsBind(torture, ctx, ctx->admin.credentials, &ctx->admin.drsuapi);
if (!ret) {
return ret;
}
- ret &= test_LDAPBind(torture, ctx, ctx->admin.credentials, &ctx->admin.ldap);
+ ret = ret && test_LDAPBind(torture, ctx, ctx->admin.credentials, &ctx->admin.ldap);
if (!ret) {
return ret;
}
- ret &= test_GetInfo(torture, ctx);
- ret &= _test_DsBind(torture, ctx, ctx->new_dc.credentials, &ctx->new_dc.drsuapi);
+ ret = ret && test_GetInfo(torture, ctx);
+ ret = ret && _test_DsBind(torture, ctx, ctx->new_dc.credentials, &ctx->new_dc.drsuapi);
if (!ret) {
return ret;
}
- ret &= test_FetchData(torture, ctx);
- ret &= test_FetchNT4Data(torture, ctx);
+ ret = ret && test_FetchData(torture, ctx);
+ ret = ret && test_FetchNT4Data(torture, ctx);
return ret;
}
diff --git a/source/torture/rpc/lsa.c b/source/torture/rpc/lsa.c
index 60d022f..48f22b4 100644
--- a/source/torture/rpc/lsa.c
+++ b/source/torture/rpc/lsa.c
@@ -272,39 +272,39 @@ static bool test_LookupNames_wellknown(struct dcerpc_pipe *p,
tnames.count = 1;
name.name.string = "NT AUTHORITY\\SYSTEM";
name.sid_type = SID_NAME_WKN_GRP;
- ret &= test_LookupNames(p, mem_ctx, handle, &tnames);
+ ret = ret && test_LookupNames(p, mem_ctx, handle, &tnames);
name.name.string = "NT AUTHORITY\\ANONYMOUS LOGON";
name.sid_type = SID_NAME_WKN_GRP;
- ret &= test_LookupNames(p, mem_ctx, handle, &tnames);
+ ret = ret && test_LookupNames(p, mem_ctx, handle, &tnames);
name.name.string = "NT AUTHORITY\\Authenticated Users";
name.sid_type = SID_NAME_WKN_GRP;
- ret &= test_LookupNames(p, mem_ctx, handle, &tnames);
+ ret = ret && test_LookupNames(p, mem_ctx, handle, &tnames);
#if 0
name.name.string = "NT AUTHORITY";
- ret &= test_LookupNames(p, mem_ctx, handle, &tnames);
+ ret = ret && test_LookupNames(p, mem_ctx, handle, &tnames);
name.name.string = "NT AUTHORITY\\";
- ret &= test_LookupNames(p, mem_ctx, handle, &tnames);
+ ret = ret && test_LookupNames(p, mem_ctx, handle, &tnames);
#endif
name.name.string = "BUILTIN\\";
name.sid_type = SID_NAME_DOMAIN;
- ret &= test_LookupNames(p, mem_ctx, handle, &tnames);
+ ret = ret && test_LookupNames(p, mem_ctx, handle, &tnames);
name.name.string = "BUILTIN\\Administrators";
- ret &= test_LookupNames(p, mem_ctx, handle, &tnames);
+ ret = ret && test_LookupNames(p, mem_ctx, handle, &tnames);
name.sid_type = SID_NAME_ALIAS;
name.name.string = "SYSTEM";
name.sid_type = SID_NAME_WKN_GRP;
- ret &= test_LookupNames(p, mem_ctx, handle, &tnames);
+ ret = ret && test_LookupNames(p, mem_ctx, handle, &tnames);
name.name.string = "Everyone";
name.sid_type = SID_NAME_WKN_GRP;
- ret &= test_LookupNames(p, mem_ctx, handle, &tnames);
+ ret = ret && test_LookupNames(p, mem_ctx, handle, &tnames);
return ret;
}
@@ -864,9 +864,9 @@ static bool test_EnumPrivsAccount(struct dcerpc_pipe *p,
&r.out.privs->set[i].luid);
}
- ret &= test_RemovePrivilegesFromAccount(p, mem_ctx, acct_handle,
+ ret = ret && test_RemovePrivilegesFromAccount(p, mem_ctx, acct_handle,
&r.out.privs->set[0].luid);
- ret &= test_AddPrivilegesToAccount(p, mem_ctx, acct_handle,
+ ret = ret && test_AddPrivilegesToAccount(p, mem_ctx, acct_handle,
&r.out.privs->set[0].luid);
}
@@ -1460,8 +1460,8 @@ static bool test_EnumAccounts(struct dcerpc_pipe *p,
printf("testing all accounts\n");
for (i=0;i<sids1.num_sids;i++) {
- ret &= test_OpenAccount(p, mem_ctx, handle, sids1.sids[i].sid);
- ret &= test_EnumAccountRights(p, mem_ctx, handle, sids1.sids[i].sid);
+ ret = ret && test_OpenAccount(p, mem_ctx, handle, sids1.sids[i].sid);
+ ret = ret && test_EnumAccountRights(p, mem_ctx, handle, sids1.sids[i].sid);
}
printf("\n");
}
@@ -1642,7 +1642,7 @@ static bool test_query_each_TrustDomEx(struct dcerpc_pipe *p,
for (i=0; i< domains->count; i++) {
if (domains->domains[i].trust_attributes & NETR_TRUST_ATTRIBUTE_FOREST_TRANSITIVE) {
- ret &= test_QueryForestTrustInformation(p, mem_ctx, handle,
+ ret = ret && test_QueryForestTrustInformation(p, mem_ctx, handle,
domains->domains[i].domain_name.string);
}
}
@@ -1848,7 +1848,7 @@ static bool test_EnumTrustDom(struct dcerpc_pipe *p,
return false;
}
- ret &= test_query_each_TrustDom(p, mem_ctx, handle, &domains);
+ ret = ret && test_query_each_TrustDom(p, mem_ctx, handle, &domains);
} while ((NT_STATUS_EQUAL(enum_status, STATUS_MORE_ENTRIES)));
@@ -1884,7 +1884,7 @@ static bool test_EnumTrustDom(struct dcerpc_pipe *p,
return false;
}
- ret &= test_query_each_TrustDomEx(p, mem_ctx, handle, &domains_ex);
+ ret = ret && test_query_each_TrustDomEx(p, mem_ctx, handle, &domains_ex);
} while ((NT_STATUS_EQUAL(enum_status, STATUS_MORE_ENTRIES)));
@@ -2079,7 +2079,7 @@ static bool test_QueryInfoPolicy(struct dcerpc_pipe *p,
tnames.names[12].sid_type = SID_NAME_USER;
tnames.names[13].name.string = talloc_asprintf(tctx, TEST_MACHINENAME "$@%s", r.out.info->dns.dns_domain.string);
tnames.names[13].sid_type = SID_NAME_USER;
- ret &= test_LookupNames(p, tctx, handle, &tnames);
+ ret = ret && test_LookupNames(p, tctx, handle, &tnames);
}
}
diff --git a/source/torture/rpc/lsa_lookup.c b/source/torture/rpc/lsa_lookup.c
index 9c817a7..6094e83 100644
--- a/source/torture/rpc/lsa_lookup.c
+++ b/source/torture/rpc/lsa_lookup.c
@@ -229,13 +229,13 @@ bool torture_rpc_lsa_lookup(struct torture_context *torture)
torture_fail(torture, "unable to connect to table");
}
- ret &= open_policy(torture, p, &handle);
+ ret = ret && open_policy(torture, p, &handle);
if (!ret) return false;
- ret &= get_domainsid(torture, p, handle, &dom_sid);
+ ret = ret && get_domainsid(torture, p, handle, &dom_sid);
if (!ret) return false;
- ret &= get_downleveltrust(torture, p, handle, &trusted_sid);
+ ret = ret && get_downleveltrust(torture, p, handle, &trusted_sid);
if (!ret) return false;
torture_comment(torture, "domain sid: %s\n",
@@ -250,7 +250,7 @@ bool torture_rpc_lsa_lookup(struct torture_context *torture)
sids[6] = dom_sid_dup(torture, trusted_sid);
sids[7] = dom_sid_add_rid(torture, trusted_sid, 512);
- ret &= test_lookupsids(torture, p, handle, sids, NUM_SIDS, 0,
+ ret = ret && test_lookupsids(torture, p, handle, sids, NUM_SIDS, 0,
NT_STATUS_INVALID_PARAMETER, NULL);
{
@@ -259,7 +259,7 @@ bool torture_rpc_lsa_lookup(struct torture_context *torture)
SID_NAME_ALIAS, SID_NAME_DOMAIN, SID_NAME_DOM_GRP,
SID_NAME_DOMAIN, SID_NAME_DOM_GRP };
- ret &= test_lookupsids(torture, p, handle, sids, NUM_SIDS, 1,
+ ret = ret && test_lookupsids(torture, p, handle, sids, NUM_SIDS, 1,
NT_STATUS_OK, types);
}
@@ -269,7 +269,7 @@ bool torture_rpc_lsa_lookup(struct torture_context *torture)
SID_NAME_UNKNOWN, SID_NAME_UNKNOWN,
SID_NAME_DOMAIN, SID_NAME_DOM_GRP,
SID_NAME_DOMAIN, SID_NAME_DOM_GRP };
- ret &= test_lookupsids(torture, p, handle, sids, NUM_SIDS, 2,
+ ret = ret && test_lookupsids(torture, p, handle, sids, NUM_SIDS, 2,
STATUS_SOME_UNMAPPED, types);
}
@@ -279,7 +279,7 @@ bool torture_rpc_lsa_lookup(struct torture_context *torture)
SID_NAME_UNKNOWN, SID_NAME_UNKNOWN,
SID_NAME_DOMAIN, SID_NAME_DOM_GRP,
SID_NAME_UNKNOWN, SID_NAME_UNKNOWN };
- ret &= test_lookupsids(torture, p, handle, sids, NUM_SIDS, 3,
+ ret = ret && test_lookupsids(torture, p, handle, sids, NUM_SIDS, 3,
STATUS_SOME_UNMAPPED, types);
}
@@ -289,11 +289,11 @@ bool torture_rpc_lsa_lookup(struct torture_context *torture)
SID_NAME_UNKNOWN, SID_NAME_UNKNOWN,
SID_NAME_DOMAIN, SID_NAME_DOM_GRP,
SID_NAME_UNKNOWN, SID_NAME_UNKNOWN };
- ret &= test_lookupsids(torture, p, handle, sids, NUM_SIDS, 4,
+ ret = ret && test_lookupsids(torture, p, handle, sids, NUM_SIDS, 4,
STATUS_SOME_UNMAPPED, types);
}
- ret &= test_lookupsids(torture, p, handle, sids, NUM_SIDS, 5,
+ ret = ret && test_lookupsids(torture, p, handle, sids, NUM_SIDS, 5,
NT_STATUS_NONE_MAPPED, NULL);
{
@@ -302,17 +302,17 @@ bool torture_rpc_lsa_lookup(struct torture_context *torture)
SID_NAME_UNKNOWN, SID_NAME_UNKNOWN,
SID_NAME_DOMAIN, SID_NAME_DOM_GRP,
SID_NAME_UNKNOWN, SID_NAME_UNKNOWN };
- ret &= test_lookupsids(torture, p, handle, sids, NUM_SIDS, 6,
+ ret = ret && test_lookupsids(torture, p, handle, sids, NUM_SIDS, 6,
STATUS_SOME_UNMAPPED, types);
}
- ret &= test_lookupsids(torture, p, handle, sids, NUM_SIDS, 7,
+ ret = ret && test_lookupsids(torture, p, handle, sids, NUM_SIDS, 7,
NT_STATUS_INVALID_PARAMETER, NULL);
- ret &= test_lookupsids(torture, p, handle, sids, NUM_SIDS, 8,
+ ret = ret && test_lookupsids(torture, p, handle, sids, NUM_SIDS, 8,
NT_STATUS_INVALID_PARAMETER, NULL);
- ret &= test_lookupsids(torture, p, handle, sids, NUM_SIDS, 9,
+ ret = ret && test_lookupsids(torture, p, handle, sids, NUM_SIDS, 9,
NT_STATUS_INVALID_PARAMETER, NULL);
- ret &= test_lookupsids(torture, p, handle, sids, NUM_SIDS, 10,
+ ret = ret && test_lookupsids(torture, p, handle, sids, NUM_SIDS, 10,
NT_STATUS_INVALID_PARAMETER, NULL);
return ret;
diff --git a/source/torture/rpc/samba3rpc.c b/source/torture/rpc/samba3rpc.c
index b08cd05..135399b 100644
--- a/source/torture/rpc/samba3rpc.c
+++ b/source/torture/rpc/samba3rpc.c
@@ -310,13 +310,13 @@ bool torture_bind_samba3(struct torture_context *torture)
ret = true;
- ret &= bindtest(cli, cmdline_credentials, torture->lp_ctx, DCERPC_AUTH_TYPE_NTLMSSP,
+ ret = ret && bindtest(cli, cmdline_credentials, torture->lp_ctx, DCERPC_AUTH_TYPE_NTLMSSP,
DCERPC_AUTH_LEVEL_INTEGRITY);
- ret &= bindtest(cli, cmdline_credentials, torture->lp_ctx, DCERPC_AUTH_TYPE_NTLMSSP,
+ ret = ret && bindtest(cli, cmdline_credentials, torture->lp_ctx, DCERPC_AUTH_TYPE_NTLMSSP,
DCERPC_AUTH_LEVEL_PRIVACY);
- ret &= bindtest(cli, cmdline_credentials, torture->lp_ctx, DCERPC_AUTH_TYPE_SPNEGO,
+ ret = ret && bindtest(cli, cmdline_credentials, torture->lp_ctx, DCERPC_AUTH_TYPE_SPNEGO,
DCERPC_AUTH_LEVEL_INTEGRITY);
- ret &= bindtest(cli, cmdline_credentials, torture->lp_ctx, DCERPC_AUTH_TYPE_SPNEGO,
+ ret = ret && bindtest(cli, cmdline_credentials, torture->lp_ctx, DCERPC_AUTH_TYPE_SPNEGO,
DCERPC_AUTH_LEVEL_PRIVACY);
done:
@@ -1879,11 +1879,11 @@ bool torture_samba3_rpc_srvsvc(struct torture_context *torture)
goto done;
}
- ret &= test_NetShareEnum(p, mem_ctx, &sharename);
+ ret = ret && test_NetShareEnum(p, mem_ctx, &sharename);
if (sharename == NULL) {
printf("did not get sharename\n");
} else {
- ret &= test_NetShareGetInfo(p, mem_ctx, sharename);
+ ret = ret && test_NetShareGetInfo(p, mem_ctx, sharename);
}
done:
@@ -2234,16 +2234,16 @@ bool torture_samba3_rpc_sharesec(struct torture_context *torture)
sd = get_sharesec(mem_ctx, cli->session, torture_setting_string(torture,
"share", NULL));
- ret &= try_tcon(mem_ctx, sd, cli->session,
+ ret = ret && try_tcon(mem_ctx, sd, cli->session,
torture_setting_string(torture, "share", NULL),
user_sid, 0, NT_STATUS_ACCESS_DENIED, NT_STATUS_OK);
- ret &= try_tcon(mem_ctx, sd, cli->session,
+ ret = ret && try_tcon(mem_ctx, sd, cli->session,
torture_setting_string(torture, "share", NULL),
user_sid, SEC_FILE_READ_DATA, NT_STATUS_OK,
NT_STATUS_MEDIA_WRITE_PROTECTED);
- ret &= try_tcon(mem_ctx, sd, cli->session,
+ ret = ret && try_tcon(mem_ctx, sd, cli->session,
torture_setting_string(torture, "share", NULL),
user_sid, SEC_FILE_ALL, NT_STATUS_OK, NT_STATUS_OK);
diff --git a/source/torture/rpc/samr.c b/source/torture/rpc/samr.c
index 9d6c738..c9b9d89 100644
--- a/source/torture/rpc/samr.c
+++ b/source/torture/rpc/samr.c
@@ -4230,42 +4230,42 @@ static bool test_OpenDomain(struct dcerpc_pipe *p, struct torture_context *tctx,
/* run the domain tests with the main handle closed - this tests
the servers reference counting */
- ret &= test_samr_handle_Close(p, tctx, handle);
+ ret = ret && test_samr_handle_Close(p, tctx, handle);
switch (which_ops) {
case TORTURE_SAMR_USER_ATTRIBUTES:
case TORTURE_SAMR_PASSWORDS:
- ret &= test_CreateUser2(p, tctx, &domain_handle, which_ops);
- ret &= test_CreateUser(p, tctx, &domain_handle, &user_handle, which_ops);
+ ret = ret && test_CreateUser2(p, tctx, &domain_handle, which_ops);
+ ret = ret && test_CreateUser(p, tctx, &domain_handle, &user_handle, which_ops);
/* This test needs 'complex' users to validate */
- ret &= test_QueryDisplayInfo(p, tctx, &domain_handle);
+ ret = ret && test_QueryDisplayInfo(p, tctx, &domain_handle);
break;
case TORTURE_SAMR_OTHER:
- ret &= test_CreateUser(p, tctx, &domain_handle, &user_handle, which_ops);
- ret &= test_QuerySecurity(p, tctx, &domain_handle);
- ret &= test_RemoveMemberFromForeignDomain(p, tctx, &domain_handle);
- ret &= test_CreateAlias(p, tctx, &domain_handle, &alias_handle, sid);
- ret &= test_CreateDomainGroup(p, tctx, &domain_handle, &group_handle);
- ret &= test_QueryDomainInfo(p, tctx, &domain_handle);
- ret &= test_QueryDomainInfo2(p, tctx, &domain_handle);
- ret &= test_EnumDomainUsers(p, tctx, &domain_handle);
- ret &= test_EnumDomainUsers_async(p, tctx, &domain_handle);
- ret &= test_EnumDomainGroups(p, tctx, &domain_handle);
- ret &= test_EnumDomainAliases(p, tctx, &domain_handle);
- ret &= test_QueryDisplayInfo2(p, tctx, &domain_handle);
- ret &= test_QueryDisplayInfo3(p, tctx, &domain_handle);
- ret &= test_QueryDisplayInfo_continue(p, tctx, &domain_handle);
+ ret = ret && test_CreateUser(p, tctx, &domain_handle, &user_handle, which_ops);
+ ret = ret && test_QuerySecurity(p, tctx, &domain_handle);
+ ret = ret && test_RemoveMemberFromForeignDomain(p, tctx, &domain_handle);
+ ret = ret && test_CreateAlias(p, tctx, &domain_handle, &alias_handle, sid);
+ ret = ret && test_CreateDomainGroup(p, tctx, &domain_handle, &group_handle);
+ ret = ret && test_QueryDomainInfo(p, tctx, &domain_handle);
+ ret = ret && test_QueryDomainInfo2(p, tctx, &domain_handle);
+ ret = ret && test_EnumDomainUsers(p, tctx, &domain_handle);
+ ret = ret && test_EnumDomainUsers_async(p, tctx, &domain_handle);
+ ret = ret && test_EnumDomainGroups(p, tctx, &domain_handle);
+ ret = ret && test_EnumDomainAliases(p, tctx, &domain_handle);
+ ret = ret && test_QueryDisplayInfo2(p, tctx, &domain_handle);
+ ret = ret && test_QueryDisplayInfo3(p, tctx, &domain_handle);
+ ret = ret && test_QueryDisplayInfo_continue(p, tctx, &domain_handle);
if (torture_setting_bool(tctx, "samba4", false)) {
printf("skipping GetDisplayEnumerationIndex test against Samba4\n");
} else {
- ret &= test_GetDisplayEnumerationIndex(p, tctx, &domain_handle);
- ret &= test_GetDisplayEnumerationIndex2(p, tctx, &domain_handle);
+ ret = ret && test_GetDisplayEnumerationIndex(p, tctx, &domain_handle);
+ ret = ret && test_GetDisplayEnumerationIndex2(p, tctx, &domain_handle);
}
- ret &= test_GroupList(p, tctx, &domain_handle);
- ret &= test_TestPrivateFunctionsDomain(p, tctx, &domain_handle);
- ret &= test_RidToSid(p, tctx, sid, &domain_handle);
- ret &= test_GetBootKeyInformation(p, tctx, &domain_handle);
+ ret = ret && test_GroupList(p, tctx, &domain_handle);
+ ret = ret && test_TestPrivateFunctionsDomain(p, tctx, &domain_handle);
+ ret = ret && test_RidToSid(p, tctx, sid, &domain_handle);
+ ret = ret && test_GetBootKeyInformation(p, tctx, &domain_handle);
break;
}
@@ -4284,10 +4284,10 @@ static bool test_OpenDomain(struct dcerpc_pipe *p, struct torture_context *tctx,
ret = false;
}
- ret &= test_samr_handle_Close(p, tctx, &domain_handle);
+ ret = ret && test_samr_handle_Close(p, tctx, &domain_handle);
/* reconnect the main handle */
- ret &= test_Connect(p, tctx, handle);
+ ret = ret && test_Connect(p, tctx, handle);
if (!ret) {
printf("Testing domain %s failed!\n", dom_sid_string(tctx, sid));
@@ -4515,17 +4515,17 @@ bool torture_rpc_samr(struct torture_context *torture)
return false;
}
- ret &= test_Connect(p, torture, &handle);
+ ret = ret && test_Connect(p, torture, &handle);
- ret &= test_QuerySecurity(p, torture, &handle);
+ ret = ret && test_QuerySecurity(p, torture, &handle);
- ret &= test_EnumDomains(p, torture, &handle, TORTURE_SAMR_OTHER);
+ ret = ret && test_EnumDomains(p, torture, &handle, TORTURE_SAMR_OTHER);
- ret &= test_SetDsrmPassword(p, torture, &handle);
+ ret = ret && test_SetDsrmPassword(p, torture, &handle);
- ret &= test_Shutdown(p, torture, &handle);
+ ret = ret && test_Shutdown(p, torture, &handle);
- ret &= test_samr_handle_Close(p, torture, &handle);
+ ret = ret && test_samr_handle_Close(p, torture, &handle);
return ret;
}
@@ -4543,17 +4543,17 @@ bool torture_rpc_samr_users(struct torture_context *torture)
return false;
}
- ret &= test_Connect(p, torture, &handle);
+ ret = ret && test_Connect(p, torture, &handle);
- ret &= test_QuerySecurity(p, torture, &handle);
+ ret = ret && test_QuerySecurity(p, torture, &handle);
- ret &= test_EnumDomains(p, torture, &handle, TORTURE_SAMR_USER_ATTRIBUTES);
+ ret = ret && test_EnumDomains(p, torture, &handle, TORTURE_SAMR_USER_ATTRIBUTES);
- ret &= test_SetDsrmPassword(p, torture, &handle);
+ ret = ret && test_SetDsrmPassword(p, torture, &handle);
- ret &= test_Shutdown(p, torture, &handle);
+ ret = ret && test_Shutdown(p, torture, &handle);
- ret &= test_samr_handle_Close(p, torture, &handle);
+ ret = ret && test_samr_handle_Close(p, torture, &handle);
return ret;
}
@@ -4571,11 +4571,11 @@ bool torture_rpc_samr_passwords(struct torture_context *torture)
return false;
}
- ret &= test_Connect(p, torture, &handle);
+ ret = ret && test_Connect(p, torture, &handle);
- ret &= test_EnumDomains(p, torture, &handle, TORTURE_SAMR_PASSWORDS);
+ ret = ret && test_EnumDomains(p, torture, &handle, TORTURE_SAMR_PASSWORDS);
- ret &= test_samr_handle_Close(p, torture, &handle);
+ ret = ret && test_samr_handle_Close(p, torture, &handle);
return ret;
}
diff --git a/source/torture/rpc/spoolss.c b/source/torture/rpc/spoolss.c
index 23b4aad..3c502f8 100644
--- a/source/torture/rpc/spoolss.c
+++ b/source/torture/rpc/spoolss.c
@@ -726,7 +726,7 @@ static bool test_EnumForms(struct torture_context *tctx,
for (j = 0; j < r.out.count; j++) {
if (!print_server)
- ret &= test_GetForm(tctx, p, handle, info[j].info1.form_name);
+ ret = ret && test_GetForm(tctx, p, handle, info[j].info1.form_name);
}
}
@@ -785,7 +785,7 @@ static bool test_AddForm(struct torture_context *tctx,
torture_assert_werr_ok(tctx, r.out.result, "AddForm failed");
- if (!print_server) ret &= test_GetForm(tctx, p, handle, form_name);
+ if (!print_server) ret = ret && test_GetForm(tctx, p, handle, form_name);
{
struct spoolss_SetForm sf;
@@ -809,7 +809,7 @@ static bool test_AddForm(struct torture_context *tctx,
torture_assert_werr_ok(tctx, r.out.result, "SetForm failed");
}
- if (!print_server) ret &= test_GetForm(tctx, p, handle, form_name);
+ if (!print_server) ret = ret && test_GetForm(tctx, p, handle, form_name);
if (!test_DeleteForm(tctx, p, handle, form_name)) {
ret = false;
@@ -1049,9 +1049,9 @@ static bool test_DoPrintTest(struct torture_context *tctx,
torture_assert_ntstatus_ok(tctx, status, "dcerpc_spoolss_EndDocPrinter failed");
torture_assert_werr_ok(tctx, e.out.result, "EndDocPrinter failed");
- ret &= test_EnumJobs(tctx, p, handle);
+ ret = ret && test_EnumJobs(tctx, p, handle);
- ret &= test_SetJob(tctx, p, handle, job_id, SPOOLSS_JOB_CONTROL_DELETE);
+ ret = ret && test_SetJob(tctx, p, handle, job_id, SPOOLSS_JOB_CONTROL_DELETE);
return ret;
}
@@ -1355,7 +1355,7 @@ static bool test_OpenPrinter_badname(struct torture_context *tctx,
}
if (W_ERROR_IS_OK(op.out.result)) {
- ret &=test_ClosePrinter(tctx, p, &handle);
+ ret = ret && test_ClosePrinter(tctx, p, &handle);
}
opEx.in.printername = name;
@@ -1376,7 +1376,7 @@ static bool test_OpenPrinter_badname(struct torture_context *tctx,
}
if (W_ERROR_IS_OK(opEx.out.result)) {
- ret &=test_ClosePrinter(tctx, p, &handle);
+ ret = ret && test_ClosePrinter(tctx, p, &handle);
}
return ret;
@@ -1718,44 +1718,44 @@ bool torture_rpc_spoolss(struct torture_context *torture)
ctx = talloc_zero(torture, struct test_spoolss_context);
- ret &= test_OpenPrinter_server(torture, p, ctx);
-
- ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "W3SvcInstalled");
- ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "BeepEnabled");
- ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "EventLog");
- ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "NetPopup");
- ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "NetPopupToComputer");
- ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "MajorVersion");
- ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "MinorVersion");
- ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "DefaultSpoolDirectory");
- ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "Architecture");
- ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "DsPresent");
- ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "OSVersion");
- ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "OSVersionEx");
- ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "DNSMachineName");
- ret &= test_EnumForms(torture, p, &ctx->server_handle, true);
- ret &= test_AddForm(torture, p, &ctx->server_handle, true);
- ret &= test_EnumPorts(torture, p, ctx);
- ret &= test_GetPrinterDriverDirectory(torture, p, ctx);
- ret &= test_EnumPrinterDrivers(torture, p, ctx);
- ret &= test_EnumMonitors(torture, p, ctx);
- ret &= test_EnumPrintProcessors(torture, p, ctx);
- ret &= test_EnumPrinters(torture, p, ctx);
- ret &= test_OpenPrinter_badname(torture, p, "__INVALID_PRINTER__");
- ret &= test_OpenPrinter_badname(torture, p, "\\\\__INVALID_HOST__");
- ret &= test_OpenPrinter_badname(torture, p, "");
- ret &= test_OpenPrinter_badname(torture, p, "\\\\\\");
- ret &= test_OpenPrinter_badname(torture, p, "\\\\\\__INVALID_PRINTER__");
- ret &= test_OpenPrinter_badname(torture, p, talloc_asprintf(torture, "\\\\%s\\", dcerpc_server_name(p)));
- ret &= test_OpenPrinter_badname(torture, p,
+ ret = ret && test_OpenPrinter_server(torture, p, ctx);
+
+ ret = ret && test_GetPrinterData(torture, p, &ctx->server_handle, "W3SvcInstalled");
+ ret = ret && test_GetPrinterData(torture, p, &ctx->server_handle, "BeepEnabled");
+ ret = ret && test_GetPrinterData(torture, p, &ctx->server_handle, "EventLog");
+ ret = ret && test_GetPrinterData(torture, p, &ctx->server_handle, "NetPopup");
+ ret = ret && test_GetPrinterData(torture, p, &ctx->server_handle, "NetPopupToComputer");
+ ret = ret && test_GetPrinterData(torture, p, &ctx->server_handle, "MajorVersion");
+ ret = ret && test_GetPrinterData(torture, p, &ctx->server_handle, "MinorVersion");
+ ret = ret && test_GetPrinterData(torture, p, &ctx->server_handle, "DefaultSpoolDirectory");
+ ret = ret && test_GetPrinterData(torture, p, &ctx->server_handle, "Architecture");
+ ret = ret && test_GetPrinterData(torture, p, &ctx->server_handle, "DsPresent");
+ ret = ret && test_GetPrinterData(torture, p, &ctx->server_handle, "OSVersion");
+ ret = ret && test_GetPrinterData(torture, p, &ctx->server_handle, "OSVersionEx");
+ ret = ret && test_GetPrinterData(torture, p, &ctx->server_handle, "DNSMachineName");
+ ret = ret && test_EnumForms(torture, p, &ctx->server_handle, true);
+ ret = ret && test_AddForm(torture, p, &ctx->server_handle, true);
+ ret = ret && test_EnumPorts(torture, p, ctx);
+ ret = ret && test_GetPrinterDriverDirectory(torture, p, ctx);
+ ret = ret && test_EnumPrinterDrivers(torture, p, ctx);
+ ret = ret && test_EnumMonitors(torture, p, ctx);
+ ret = ret && test_EnumPrintProcessors(torture, p, ctx);
+ ret = ret && test_EnumPrinters(torture, p, ctx);
+ ret = ret && test_OpenPrinter_badname(torture, p, "__INVALID_PRINTER__");
+ ret = ret && test_OpenPrinter_badname(torture, p, "\\\\__INVALID_HOST__");
+ ret = ret && test_OpenPrinter_badname(torture, p, "");
+ ret = ret && test_OpenPrinter_badname(torture, p, "\\\\\\");
+ ret = ret && test_OpenPrinter_badname(torture, p, "\\\\\\__INVALID_PRINTER__");
+ ret = ret && test_OpenPrinter_badname(torture, p, talloc_asprintf(torture, "\\\\%s\\", dcerpc_server_name(p)));
+ ret = ret && test_OpenPrinter_badname(torture, p,
talloc_asprintf(torture, "\\\\%s\\__INVALID_PRINTER__", dcerpc_server_name(p)));
- ret &= test_AddPort(torture, p);
- ret &= test_EnumPorts_old(torture, p);
- ret &= test_EnumPrinters_old(torture, p);
- ret &= test_EnumPrinterDrivers_old(torture, p);
- ret &= test_ReplyOpenPrinter(torture, p);
+ ret = ret && test_AddPort(torture, p);
+ ret = ret && test_EnumPorts_old(torture, p);
+ ret = ret && test_EnumPrinters_old(torture, p);
+ ret = ret && test_EnumPrinterDrivers_old(torture, p);
+ ret = ret && test_ReplyOpenPrinter(torture, p);
return ret;
}
diff --git a/source/torture/rpc/spoolss_win.c b/source/torture/rpc/spoolss_win.c
index 9e2921d..869ef24 100644
--- a/source/torture/rpc/spoolss_win.c
+++ b/source/torture/rpc/spoolss_win.c
@@ -425,74 +425,74 @@ static bool test_WinXP(struct torture_context *tctx, struct dcerpc_pipe *p)
ctx = talloc_zero(tctx, struct test_spoolss_win_context);
tmp_ctx = talloc_zero(tctx, struct test_spoolss_win_context);
- ret &= test_OpenPrinterSequence(tctx, p, &handle01);
- ret &= test_GetPrinterData(tctx, p, &handle01,"UISingleJobStatusString",
+ ret = ret && test_OpenPrinterSequence(tctx, p, &handle01);
+ ret = ret && test_GetPrinterData(tctx, p, &handle01,"UISingleJobStatusString",
WERR_INVALID_PARAM, 0);
torture_comment(tctx, "Skip RemoteFindNextPrinterChangeNotifyEx test\n");
server_name = talloc_asprintf(ctx, "\\\\%s", dcerpc_server_name(p));
- ret &= test_OpenPrinterEx(tctx, p, &unused_handle1, server_name, 0);
+ ret = ret && test_OpenPrinterEx(tctx, p, &unused_handle1, server_name, 0);
- ret &= test_EnumPrinters(tctx, p, ctx, 1024);
+ ret = ret && test_EnumPrinters(tctx, p, ctx, 1024);
- ret &= test_OpenPrinterEx(tctx, p, &handle02, server_name, 0);
- ret &= test_GetPrinterData(tctx, p, &handle02, "MajorVersion", WERR_OK,
+ ret = ret && test_OpenPrinterEx(tctx, p, &handle02, server_name, 0);
+ ret = ret && test_GetPrinterData(tctx, p, &handle02, "MajorVersion", WERR_OK,
3);
- ret &= test_ClosePrinter(tctx, p, &handle02);
+ ret = ret && test_ClosePrinter(tctx, p, &handle02);
/* If no printers were found, skip all tests that need a printer */
if (ctx->printer_count == 0) {
goto end_testWinXP;
}
- ret &= test_OpenPrinterEx(tctx, p, &handle02,
+ ret = ret && test_OpenPrinterEx(tctx, p, &handle02,
ctx->printer_info[0].info2.printername,
PRINTER_ACCESS_USE);
- ret &= test_GetPrinter(tctx, p, &handle02, ctx, 2, 0);
+ ret = ret && test_GetPrinter(tctx, p, &handle02, ctx, 2, 0);
torture_assert_str_equal(tctx, ctx->current_info->info2.printername,
ctx->printer_info[0].info2.printername,
"GetPrinter returned unexpected printername");
/*FIXME: Test more components of the PrinterInfo2 struct */
- ret &= test_OpenPrinterEx(tctx, p, &handle03,
+ ret = ret && test_OpenPrinterEx(tctx, p, &handle03,
ctx->printer_info[0].info2.printername, 0);
- ret &= test_GetPrinter(tctx, p, &handle03, ctx, 0, 1164);
- ret &= test_GetPrinter(tctx, p, &handle03, ctx, 2, 0);
+ ret = ret && test_GetPrinter(tctx, p, &handle03, ctx, 0, 1164);
+ ret = ret && test_GetPrinter(tctx, p, &handle03, ctx, 2, 0);
- ret &= test_OpenPrinterEx(tctx, p, &handle04,
+ ret = ret && test_OpenPrinterEx(tctx, p, &handle04,
ctx->printer_info[0].info2.printername, 0);
- ret &= test_GetPrinter(tctx, p, &handle04, ctx, 2, 0);
- ret &= test_ClosePrinter(tctx, p, &handle04);
+ ret = ret && test_GetPrinter(tctx, p, &handle04, ctx, 2, 0);
+ ret = ret && test_ClosePrinter(tctx, p, &handle04);
- ret &= test_OpenPrinterEx(tctx, p, &handle04,
+ ret = ret && test_OpenPrinterEx(tctx, p, &handle04,
ctx->printer_info[0].info2.printername, 0);
- ret &= test_GetPrinter(tctx, p, &handle04, ctx, 2, 4096);
- ret &= test_ClosePrinter(tctx, p, &handle04);
+ ret = ret && test_GetPrinter(tctx, p, &handle04, ctx, 2, 4096);
+ ret = ret && test_ClosePrinter(tctx, p, &handle04);
- ret &= test_OpenPrinterAsAdmin(tctx, p,
+ ret = ret && test_OpenPrinterAsAdmin(tctx, p,
ctx->printer_info[0].info2.printername);
- ret &= test_OpenPrinterEx(tctx, p, &handle04,
+ ret = ret && test_OpenPrinterEx(tctx, p, &handle04,
ctx->printer_info[0].info2.printername, PRINTER_READ);
- ret &= test_GetPrinterData(tctx, p, &handle04,"UISingleJobStatusString",
+ ret = ret && test_GetPrinterData(tctx, p, &handle04,"UISingleJobStatusString",
WERR_BADFILE, 0);
torture_comment(tctx, "Skip RemoteFindNextPrinterChangeNotifyEx test\n");
- ret &= test_OpenPrinterEx(tctx, p, &unused_handle2,
+ ret = ret && test_OpenPrinterEx(tctx, p, &unused_handle2,
ctx->printer_info[0].info2.printername, 0);
- ret &= test_EnumJobs(tctx, p, &handle04);
- ret &= test_GetPrinter(tctx, p, &handle04, ctx, 2, 4096);
+ ret = ret && test_EnumJobs(tctx, p, &handle04);
+ ret = ret && test_GetPrinter(tctx, p, &handle04, ctx, 2, 4096);
- ret &= test_ClosePrinter(tctx, p, &unused_handle2);
- ret &= test_ClosePrinter(tctx, p, &handle04);
+ ret = ret && test_ClosePrinter(tctx, p, &unused_handle2);
+ ret = ret && test_ClosePrinter(tctx, p, &handle04);
- ret &= test_EnumPrinters(tctx, p, ctx, 1556);
- ret &= test_GetPrinterDriver2(tctx, p, &handle03);
- ret &= test_EnumForms(tctx, p, &handle03, 0);
+ ret = ret && test_EnumPrinters(tctx, p, ctx, 1556);
+ ret = ret && test_GetPrinterDriver2(tctx, p, &handle03);
+ ret = ret && test_EnumForms(tctx, p, &handle03, 0);
- ret &= test_EnumPrinterKey(tctx, p, &handle03, "", ctx);
+ ret = ret && test_EnumPrinterKey(tctx, p, &handle03, "", ctx);
key_pointer = ctx->printer_keys;
while(*key_pointer != '\0') {
char *end_pointer;
@@ -505,60 +505,60 @@ static bool test_WinXP(struct torture_context *tctx, struct dcerpc_pipe *p)
key_name = talloc_strndup(tctx, key_pointer,
end_pointer - key_pointer);
- ret &= test_EnumPrinterKey(tctx, p, &handle03, key_name,
+ ret = ret && test_EnumPrinterKey(tctx, p, &handle03, key_name,
tmp_ctx);
- ret &= test_EnumPrinterDataEx(tctx, p, &handle03, key_name, 0,
+ ret = ret && test_EnumPrinterDataEx(tctx, p, &handle03, key_name, 0,
WERR_OK);
key_pointer = ++end_pointer;
}
- ret &= test_EnumPrinterDataEx(tctx, p, &handle03, "", 0,
+ ret = ret && test_EnumPrinterDataEx(tctx, p, &handle03, "", 0,
WERR_INVALID_PARAM);
- ret &= test_GetPrinter(tctx, p, &handle03, tmp_ctx, 2, 0);
+ ret = ret && test_GetPrinter(tctx, p, &handle03, tmp_ctx, 2, 0);
- ret &= test_OpenPrinterEx(tctx, p, &unused_handle2,
+ ret = ret && test_OpenPrinterEx(tctx, p, &unused_handle2,
ctx->printer_info[0].info2.printername, 0);
- ret &= test_ClosePrinter(tctx, p, &unused_handle2);
+ ret = ret && test_ClosePrinter(tctx, p, &unused_handle2);
- ret &= test_GetPrinter(tctx, p, &handle03, tmp_ctx, 2, 2556);
+ ret = ret && test_GetPrinter(tctx, p, &handle03, tmp_ctx, 2, 2556);
- ret &= test_OpenPrinterEx(tctx, p, &unused_handle2,
+ ret = ret && test_OpenPrinterEx(tctx, p, &unused_handle2,
ctx->printer_info[0].info2.printername, 0);
- ret &= test_ClosePrinter(tctx, p, &unused_handle2);
+ ret = ret && test_ClosePrinter(tctx, p, &unused_handle2);
- ret &= test_OpenPrinterEx(tctx, p, &unused_handle2,
+ ret = ret && test_OpenPrinterEx(tctx, p, &unused_handle2,
ctx->printer_info[0].info2.printername, 0);
- ret &= test_ClosePrinter(tctx, p, &unused_handle2);
+ ret = ret && test_ClosePrinter(tctx, p, &unused_handle2);
- ret &= test_GetPrinter(tctx, p, &handle03, tmp_ctx, 7, 0);
+ ret = ret && test_GetPrinter(tctx, p, &handle03, tmp_ctx, 7, 0);
- ret &= test_OpenPrinterEx(tctx, p, &unused_handle2,
+ ret = ret && test_OpenPrinterEx(tctx, p, &unused_handle2,
ctx->printer_info[0].info2.printername, 0);
- ret &= test_ClosePrinter(tctx, p, &unused_handle2);
+ ret = ret && test_ClosePrinter(tctx, p, &unused_handle2);
- ret &= test_ClosePrinter(tctx, p, &handle03);
+ ret = ret && test_ClosePrinter(tctx, p, &handle03);
- ret &= test_OpenPrinterEx(tctx, p, &unused_handle2,
+ ret = ret && test_OpenPrinterEx(tctx, p, &unused_handle2,
ctx->printer_info[0].info2.printername, 0);
- ret &= test_ClosePrinter(tctx, p, &unused_handle2);
+ ret = ret && test_ClosePrinter(tctx, p, &unused_handle2);
- ret &= test_OpenPrinterEx(tctx, p, &handle03, server_name, 0);
- ret &= test_GetPrinterData(tctx, p, &handle03, "W3SvcInstalled",
+ ret = ret && test_OpenPrinterEx(tctx, p, &handle03, server_name, 0);
+ ret = ret && test_GetPrinterData(tctx, p, &handle03, "W3SvcInstalled",
WERR_OK, 0);
- ret &= test_ClosePrinter(tctx, p, &handle03);
+ ret = ret && test_ClosePrinter(tctx, p, &handle03);
- ret &= test_ClosePrinter(tctx, p, &unused_handle1);
- ret &= test_ClosePrinter(tctx, p, &handle02);
+ ret = ret && test_ClosePrinter(tctx, p, &unused_handle1);
+ ret = ret && test_ClosePrinter(tctx, p, &handle02);
- ret &= test_OpenPrinterEx(tctx, p, &handle02,
+ ret = ret && test_OpenPrinterEx(tctx, p, &handle02,
ctx->printer_info[0].info2.sharename, 0);
- ret &= test_GetPrinter(tctx, p, &handle02, tmp_ctx, 2, 0);
- ret &= test_ClosePrinter(tctx, p, &handle02);
+ ret = ret && test_GetPrinter(tctx, p, &handle02, tmp_ctx, 2, 0);
+ ret = ret && test_ClosePrinter(tctx, p, &handle02);
end_testWinXP:
- ret &= test_ClosePrinter(tctx, p, &handle01);
+ ret = ret && test_ClosePrinter(tctx, p, &handle01);
talloc_free(tmp_ctx);
talloc_free(ctx);
diff --git a/source/torture/rpc/winreg.c b/source/torture/rpc/winreg.c
index d772956..0e35d2d 100644
--- a/source/torture/rpc/winreg.c
+++ b/source/torture/rpc/winreg.c
@@ -1596,9 +1596,9 @@ static bool test_EnumValue(struct dcerpc_pipe *p, struct torture_context *tctx,
"EnumValue failed");
if (W_ERROR_IS_OK(r.out.result)) {
- ret &= test_QueryValue(p, tctx, handle,
+ ret = ret && test_QueryValue(p, tctx, handle,
r.out.name->name);
- ret &= test_QueryMultipleValues(p, tctx, handle,
+ ret = ret && test_QueryMultipleValues(p, tctx, handle,
r.out.name->name);
}
diff --git a/source/torture/smb2/dir.c b/source/torture/smb2/dir.c
index 58cf222..82838a0 100644
--- a/source/torture/smb2/dir.c
+++ b/source/torture/smb2/dir.c
@@ -85,7 +85,7 @@ bool torture_smb2_dir(struct torture_context *torture)
return false;
}
- ret &= torture_smb2_find_dir(tree);
+ ret = ret && torture_smb2_find_dir(tree);
talloc_free(mem_ctx);
diff --git a/source/torture/smb2/find.c b/source/torture/smb2/find.c
index 06222e8..21a3990 100644
--- a/source/torture/smb2/find.c
+++ b/source/torture/smb2/find.c
@@ -212,7 +212,7 @@ bool torture_smb2_find(struct torture_context *torture)
}
torture_setup_complex_file(tree, FNAME ":streamtwo");
- ret &= torture_smb2_find_levels(tree);
+ ret = ret && torture_smb2_find_levels(tree);
talloc_free(mem_ctx);
diff --git a/source/torture/smb2/getinfo.c b/source/torture/smb2/getinfo.c
index f561b62..35bc565 100644
--- a/source/torture/smb2/getinfo.c
+++ b/source/torture/smb2/getinfo.c
@@ -192,8 +192,8 @@ bool torture_smb2_getinfo(struct torture_context *torture)
}
torture_setup_complex_file(tree, DNAME ":streamtwo");
- ret &= torture_smb2_fileinfo(torture, tree);
- ret &= torture_smb2_fsinfo(tree);
+ ret = ret && torture_smb2_fileinfo(torture, tree);
+ ret = ret && torture_smb2_fsinfo(tree);
talloc_free(mem_ctx);
diff --git a/source/torture/smb2/notify.c b/source/torture/smb2/notify.c
index 574136a..2930a8a 100644
--- a/source/torture/smb2/notify.c
+++ b/source/torture/smb2/notify.c
@@ -197,7 +197,7 @@ bool torture_smb2_notify(struct torture_context *torture)
return false;
}
- ret &= test_valid_request(torture, tree);
+ ret = ret && test_valid_request(torture, tree);
return ret;
}
diff --git a/source/torture/smbtorture.c b/source/torture/smbtorture.c
index 371ddc7..06b7024 100644
--- a/source/torture/smbtorture.c
+++ b/source/torture/smbtorture.c
@@ -51,11 +51,11 @@ static bool run_matching(struct torture_context *torture,
if (gen_fnmatch(expr, o->name) == 0) {
*matched = true;
reload_charcnv(torture->lp_ctx);
- ret &= torture_run_suite(torture, o);
+ ret = ret && torture_run_suite(torture, o);
continue;
}
- ret &= run_matching(torture, o->name, expr, o, matched);
+ ret = ret && run_matching(torture, o->name, expr, o, matched);
}
} else {
char *name;
@@ -69,12 +69,12 @@ static bool run_matching(struct torture_context *torture,
*matched = true;
reload_charcnv(torture->lp_ctx);
torture->active_testname = talloc_strdup(torture, prefix);
- ret &= torture_run_suite(torture, c);
+ ret = ret && torture_run_suite(torture, c);
free(name);
continue;
}
- ret &= run_matching(torture, name, expr, c, matched);
+ ret = ret && run_matching(torture, name, expr, c, matched);
free(name);
}
@@ -85,7 +85,7 @@ static bool run_matching(struct torture_context *torture,
*matched = true;
reload_charcnv(torture->lp_ctx);
torture->active_testname = talloc_strdup(torture, prefix);
- ret &= torture_run_tcase(torture, t);
+ ret = ret && torture_run_tcase(torture, t);
talloc_free(torture->active_testname);
}
free(name);
@@ -108,7 +108,7 @@ static bool run_test(struct torture_context *torture, const char *name)
if (strequal(name, "ALL")) {
for (o = torture_root->children; o; o = o->next) {
- ret &= torture_run_suite(torture, o);
+ ret = ret && torture_run_suite(torture, o);
}
return ret;
}
diff --git a/source/torture/ui.c b/source/torture/ui.c
index a7025aa..a31c563 100644
--- a/source/torture/ui.c
+++ b/source/torture/ui.c
@@ -212,11 +212,11 @@ bool torture_run_suite(struct torture_context *context,
context->active_testname = talloc_strdup(context, suite->name);
for (tcase = suite->testcases; tcase; tcase = tcase->next) {
- ret &= torture_run_tcase(context, tcase);
+ ret = ret && torture_run_tcase(context, tcase);
}
for (tsuite = suite->children; tsuite; tsuite = tsuite->next) {
- ret &= torture_run_suite(context, tsuite);
+ ret = ret && torture_run_suite(context, tsuite);
}
talloc_free(context->active_testname);
@@ -355,7 +355,7 @@ bool torture_run_tcase(struct torture_context *context,
context->active_testname = talloc_asprintf(context, "%s-%s",
old_testname, tcase->name);
for (test = tcase->tests; test; test = test->next) {
- ret &= internal_torture_run_test(context, tcase, test,
+ ret = ret && internal_torture_run_test(context, tcase, test,
tcase->fixture_persistent);
}
talloc_free(context->active_testname);
diff --git a/source/utils/nmblookup.c b/source/utils/nmblookup.c
index 7eae9c7..5a869e2 100644
--- a/source/utils/nmblookup.c
+++ b/source/utils/nmblookup.c
@@ -360,7 +360,7 @@ int main(int argc, const char *argv[])
while (poptPeekArg(pc)) {
const char *name = poptGetArg(pc);
- ret &= process_one(cmdline_lp_ctx, ifaces, name, lp_nbt_port(cmdline_lp_ctx));
+ ret = ret && process_one(cmdline_lp_ctx, ifaces, name, lp_nbt_port(cmdline_lp_ctx));
}
talloc_free(ifaces);
-------------- next part --------------
diff --git a/source/auth/auth_sam.c b/source/auth/auth_sam.c
index 0885d82..1788955 100644
--- a/source/auth/auth_sam.c
+++ b/source/auth/auth_sam.c
@@ -119,13 +119,13 @@ static NTSTATUS authsam_search_account(TALLOC_CTX *mem_ctx, struct ldb_context *
if (ret_domain == 0) {
DEBUG(3,("check_sam_security: Couldn't find domain [%s] in passdb file.\n",
- ldb_dn_get_linearized(msgs_tmp[0]->dn)));
+ ldb_dn_get_linearized(domain_dn)));
return NT_STATUS_NO_SUCH_USER;
}
if (ret_domain > 1) {
DEBUG(0,("Found %d records matching domain [%s]\n",
- ret_domain, ldb_dn_get_linearized(msgs_tmp[0]->dn)));
+ ret_domain, ldb_dn_get_linearized(domain_dn)));
return NT_STATUS_INTERNAL_DB_CORRUPTION;
}
diff --git a/source/lib/registry/patchfile.c b/source/lib/registry/patchfile.c
index fa1367b..8f51c86 100644
--- a/source/lib/registry/patchfile.c
+++ b/source/lib/registry/patchfile.c
@@ -72,7 +72,7 @@ WERROR reg_generate_diff_key(struct registry_key *oldkey,
NULL, NULL);
if (!W_ERROR_IS_OK(error1)) {
DEBUG(0, ("Error occured while getting subkey by index: %s\n",
- win_errstr(error2)));
+ win_errstr(error1)));
continue;
}
More information about the samba-technical
mailing list