Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Mon, 22 Dec 2008 20:15:59 +0000 (21:15 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 22 Dec 2008 20:15:59 +0000 (21:15 +0100)
source3/winbindd/winbindd_util.c
source4/torture/raw/streams.c

index fdfc8ed9d13dd3d076efa461d270da73d150b8ff..748099a32e578d2b7e94605955d750dee9154b2d 100644 (file)
@@ -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; 
index 4e2a204cb61ea042495b78daa0174937cbb9eb67..ba74530c6f97a01c6594a41c4cf03b3f343a18df 100644 (file)
@@ -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);