Changeset 10594 for branches

Timestamp:

May 1, 2010, 1:45:03 PM (12 years ago)

Author:

charles

Message:

(1.9x) backport r10485 and r10542 for #3141 "Web client should be disabled by default"

Location:

branches/1.9x

Files:

• daemon/daemon.c (modified) (2 diffs)
• libtransmission/session.c (modified) (1 diff)

branches/1.9x/daemon/daemon.c

@@ -120 +120 @@
             tr_inf( "Reloading settings from \"%s\"", configDir );
             tr_bencInitDict( &settings, 0 );
+            tr_bencDictAddBool( &settings, TR_PREFS_KEY_RPC_ENABLED, TRUE );
             tr_sessionLoadSettings( &settings, configDir, MY_NAME );
             tr_sessionSet( mySession, &settings );
@@ -298 +299 @@
     /* load settings from defaults + config file */
     tr_bencInitDict( &settings, 0 );
+    tr_bencDictAddBool( &settings, TR_PREFS_KEY_RPC_ENABLED, TRUE );
     configDir = getConfigDir( argc, (const char**)argv );
     loaded = tr_sessionLoadSettings( &settings, configDir, MY_NAME );

branches/1.9x/libtransmission/session.c

@@ -274 +274 @@
     tr_bencDictAddBool( d, TR_PREFS_KEY_RPC_AUTH_REQUIRED,        FALSE );
     tr_bencDictAddStr ( d, TR_PREFS_KEY_RPC_BIND_ADDRESS,         "0.0.0.0" );
-    tr_bencDictAddBool( d, TR_PREFS_KEY_RPC_ENABLED,              TRUE );
+    tr_bencDictAddBool( d, TR_PREFS_KEY_RPC_ENABLED,              FALSE );
     tr_bencDictAddStr ( d, TR_PREFS_KEY_RPC_PASSWORD,             "" );
     tr_bencDictAddStr ( d, TR_PREFS_KEY_RPC_USERNAME,             "" );