Changeset 7865 for trunk

Timestamp:

Feb 10, 2009, 4:22:59 PM (13 years ago)

Author:

charles

Message:

(trunk libT) #1784: add .netrc support to transmission-remote

Location:

trunk/daemon

Files:

• remote.c (modified) (4 diffs)
• transmission-remote.1 (modified) (2 diffs)

trunk/daemon/remote.c

@@ -77 +77 @@
     { 'M', "no-portmap",           "Disable portmapping", "M",  0, NULL },
     { 'n', "auth",                 "Set authentication info", "n",  1, "<username:password>" },
+    { 'N', "netrc",                "Set authentication info from a .netrc file", "N",  1, "<filename>" },
     { 'p', "port",                 "Port for incoming peers (Default: " TR_DEFAULT_PEER_PORT_STR ")", "p", 1, "<port>" },
     { 900, "priority-high",        "Set the files' priorities as high", "ph", 1, "<files>" },
@@ -124 +125 @@
 static int    debug = 0;
 static char * auth = NULL;
+static char * netrc = NULL;
 
 static char* 
@@ -400 +402 @@
                 break;
 
+            case 'N':
+                netrc = tr_strdup( optarg );
+                addArg = FALSE;
+                break;
+
             case 'p':
                 tr_bencDictAddStr( &top, "method", "session-set" );
@@ -1213 +1220 @@
     curl_easy_setopt( curl, CURLOPT_ENCODING, "deflate" );
 #endif
-    curl_easy_setopt( curl, CURLOPT_USERAGENT,
-                      MY_NAME "/" LONG_VERSION_STRING );
+    curl_easy_setopt( curl, CURLOPT_USERAGENT, MY_NAME "/" LONG_VERSION_STRING );
     curl_easy_setopt( curl, CURLOPT_WRITEFUNCTION, writeFunc );
     curl_easy_setopt( curl, CURLOPT_WRITEDATA, buf );
     curl_easy_setopt( curl, CURLOPT_POST, 1 );
     curl_easy_setopt( curl, CURLOPT_URL, url );
+    curl_easy_setopt( curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL );
+    curl_easy_setopt( curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY );
+    if( netrc )
+        curl_easy_setopt( curl, CURLOPT_NETRC_FILE, netrc );
     if( auth )
-    {
         curl_easy_setopt( curl, CURLOPT_USERPWD, auth );
-        curl_easy_setopt( curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY );
-    }
 
     for( i = 0; i < reqCount; ++i )

trunk/daemon/transmission-remote.1

@@ -25 +25 @@
 .Op Fl m | M
 .Op Fl n Ar user:pass
+.Op Fl N Ar netrc
 .Op Fl p Ar port
 .Op Fl ph Ar files
@@ -117 +118 @@
 for authentication
 
+.It Fl N Fl -netrc Ar filename
+Set the authentication information from a
+.Ar netrc file.
+See netrc(5) for more information.
+
 .It Fl p Fl -port Ar port
 Set the