Merge branch 'master' of ssh://git.samba.org/data/git/samba

2 files changed, 17 insertions, 6 deletions

diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c
index fdfc8ed9d1..748099a32e 100644
--- a/source3/winbindd/winbindd_util.c
+++ b/source3/winbindd/winbindd_util.c
@@ -540,7 +540,11 @@ static void rescan_forest_trusts( void )
 void rescan_trusted_domains( void )
 {
 	time_t now = time(NULL);
-	
+
+	/* Check that we allow trusted domains at all */
+	if (!lp_allow_trusted_domains())
+		return;
+
 	/* see if the time has come... */
 	
 	if ((now >= last_trustdom_scan) &&
@@ -796,7 +800,12 @@ void check_domain_trusted( const char *name, const DOM_SID *user_sid )
 	struct winbindd_domain *domain;	
 	DOM_SID dom_sid;
 	uint32 rid;
-	
+
+	/* Check if we even care */
+
+	if (!lp_allow_trusted_domains())
+		return;
+
 	domain = find_domain_from_name_noinit( name );
 	if ( domain )
 		return;	
diff --git a/source4/torture/raw/streams.c b/source4/torture/raw/streams.c
index 4e2a204cb6..ba74530c6f 100644
--- a/source4/torture/raw/streams.c
+++ b/source4/torture/raw/streams.c
@@ -996,14 +996,16 @@ static bool test_stream_names2(struct torture_context *tctx,
 			break;
 		}
 
-		printf("(%s) %s:Stream%c0x%02X:$DATA%s => expected[%s]\n",
-		       __location__, fname, isprint(i)?(char)i:' ', i,
-		       isprint(i)?"":" (not printable)",
-		       nt_errstr(expected));
 
 		io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN;
 		io.ntcreatex.in.fname = path;
 		status = smb_raw_open(cli->tree, mem_ctx, &io);
+		if (!NT_STATUS_EQUAL(status, expected)) {
+			printf("(%s) %s:Stream%c0x%02X:$DATA%s => expected[%s]\n",
+				__location__, fname, isprint(i)?(char)i:' ', i,
+				isprint(i)?"":" (not printable)",
+				nt_errstr(expected));
+		}
 		CHECK_STATUS(status, expected);
 
 		talloc_free(path);