(trunk libT) re-add rpc password to settings benc dict

diff --git a/libtransmission/crypto.c b/libtransmission/crypto.c
index a3b7bd9349a4965c0d2e24c97f9dfa13cd157a39..6257b74dc2623212941157f39c07c00158986ef2 100644 (file)
--- a/libtransmission/crypto.c
+++ b/libtransmission/crypto.c
@@ -19,7 +19,6 @@
 #include <stdarg.h>
 
 #include <openssl/bn.h>
-#include <openssl/des.h>
 #include <openssl/dh.h>
 #include <openssl/err.h>
 #include <openssl/rc4.h>

diff --git a/libtransmission/session.c b/libtransmission/session.c
index 7cf4dd9805bc18cce14c6ac139eb4d0c705ebac9..b0fb10286cfc31eb630abe9c81d6273d13938e47 100644 (file)
--- a/libtransmission/session.c
+++ b/libtransmission/session.c
@@ -297,6 +297,7 @@ tr_sessionGetSettings( tr_session * s, struct tr_benc * d )
     tr_bencDictAddInt( d, TR_PREFS_KEY_RATIO_ENABLED,            s->isRatioLimited );
     tr_bencDictAddInt( d, TR_PREFS_KEY_RPC_AUTH_REQUIRED,        tr_sessionIsRPCPasswordEnabled( s ) );
     tr_bencDictAddInt( d, TR_PREFS_KEY_RPC_ENABLED,              tr_sessionIsRPCEnabled( s ) );
+    tr_bencDictAddStr( d, TR_PREFS_KEY_RPC_PASSWORD,             freeme[n++] = tr_sessionGetRPCPassword( s ) );
     tr_bencDictAddInt( d, TR_PREFS_KEY_RPC_PORT,                 tr_sessionGetRPCPort( s ) );
     tr_bencDictAddStr( d, TR_PREFS_KEY_RPC_USERNAME,             freeme[n++] = tr_sessionGetRPCUsername( s ) );
     tr_bencDictAddStr( d, TR_PREFS_KEY_RPC_WHITELIST,            freeme[n++] = tr_sessionGetRPCWhitelist( s ) );
@@ -1453,6 +1454,14 @@ tr_sessionSetRPCPassword( tr_session * session,
     tr_rpcSetPassword( session->rpcServer, password );
 }
 
+char*
+tr_sessionGetRPCPassword( const tr_session * session )
+{
+    assert( tr_isSession( session ) );
+
+    return tr_rpcGetPassword( session->rpcServer );
+}
+
 void
 tr_sessionSetRPCUsername( tr_session * session,
                           const char * username )

diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h
index dbf12634d611917c6127a711e240219543c0500a..7fa4c9603f7482f2cbe1a77464ec1bdf971a405f 100644 (file)
--- a/libtransmission/transmission.h
+++ b/libtransmission/transmission.h
@@ -370,6 +370,12 @@ void  tr_sessionSetRPCPassword( tr_session * session,
 void  tr_sessionSetRPCUsername( tr_session * session,
                                 const char * username );
 
+/** @brief get the password used to restrict RPC requests.
+    @return the password string. tr_free() when done.
+    @see tr_sessionInit()
+    @see tr_sessionSetRPCPassword() */
+char* tr_sessionGetRPCPassword( const tr_session * session );
+
 char* tr_sessionGetRPCUsername( const tr_session * session  );
 
 void  tr_sessionSetRPCPasswordEnabled( tr_session * session,