s3compat: pass interactive flag to s3compat_initialise()
authorAndrew Tridgell <tridge@samba.org>
Mon, 26 Apr 2010 01:12:55 +0000 (11:12 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 3 Jun 2010 01:12:29 +0000 (11:12 +1000)
source4/s3compat/s3compat.c
source4/smbd/server.c

index b97ad3b91c2a4595bd375050f03a4985e08b21a9..91c131d98f12b12a53a7853cc477c95932b3d5b9 100644 (file)
@@ -30,13 +30,11 @@ _PUBLIC_ const char *s3compat_samba_version_string(void)
 }
 
 _PUBLIC_
-void s3compat_initialise(const char *config_file)
+void s3compat_initialise(const char *config_file, bool interactive)
 {
-
-
        talloc_stackframe();
        /* use stdout logging for now */
-       setup_logging("s3compat", true);
+       setup_logging("s3compat", interactive);
        load_case_tables();
        sec_init();
        set_remote_machine_name("smbd", false);
index 5350feb169ee6e18cb17cbfe92073ad5dcb0cfe1..5a3a2903bb69d25066c4c2e8c207390b7c74d1f1 100644 (file)
@@ -375,7 +375,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
        DEBUGADD(0,("Copyright Andrew Tridgell and the Samba Team 1992-2010\n"));
 
 #ifdef ENABLE_S3COMPAT
-       s3compat_initialise(lp_configfile(cmdline_lp_ctx));
+       s3compat_initialise(lp_configfile(cmdline_lp_ctx), opt_interactive);
 #endif
 
        if (sizeof(uint16_t) < 2 || sizeof(uint32_t) < 4 || sizeof(uint64_t) < 8) {