| author | andyq <andyq> | 2002-12-13 13:49:02 (UTC) |
|---|---|---|
| committer | andyq <andyq> | 2002-12-13 13:49:02 (UTC) |
| commit | 8b1c25e608e7255199dc97ad8269ac66d40beede (patch) (unidiff) | |
| tree | f17e7e897e1f872e035c004af8479430c45bc640 | |
| parent | 9b65e55ce70837695b319ef7049674e9c3daba98 (diff) | |
| download | opie-8b1c25e608e7255199dc97ad8269ac66d40beede.zip opie-8b1c25e608e7255199dc97ad8269ac66d40beede.tar.gz opie-8b1c25e608e7255199dc97ad8269ac66d40beede.tar.bz2 | |
Only enable the username and password if one of the proxies is enabled
| -rw-r--r-- | noncore/settings/aqpkg/datamgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/settings/aqpkg/datamgr.cpp b/noncore/settings/aqpkg/datamgr.cpp index 3933a22..0159a79 100644 --- a/noncore/settings/aqpkg/datamgr.cpp +++ b/noncore/settings/aqpkg/datamgr.cpp | |||
| @@ -250,11 +250,11 @@ void DataManager :: writeOutIpkgConf() | |||
| 250 | out << "#"; | 250 | out << "#"; |
| 251 | out << "option ftp_proxy " << ftpProxy << endl; | 251 | out << "option ftp_proxy " << ftpProxy << endl; |
| 252 | } | 252 | } |
| 253 | if ( proxyUsername == "" ) | 253 | if ( proxyUsername == "" || (!httpProxyEnabled && !ftpProxyEnabled) ) |
| 254 | out << "#option proxy_username <username>" << endl; | 254 | out << "#option proxy_username <username>" << endl; |
| 255 | else | 255 | else |
| 256 | out << "option proxy_username " << proxyUsername << endl; | 256 | out << "option proxy_username " << proxyUsername << endl; |
| 257 | if ( proxyPassword == "" ) | 257 | if ( proxyPassword == "" || (!httpProxyEnabled && !ftpProxyEnabled) ) |
| 258 | out << "#option proxy_password <password>" << endl << endl; | 258 | out << "#option proxy_password <password>" << endl << endl; |
| 259 | else | 259 | else |
| 260 | out << "option proxy_password " << proxyPassword << endl<< endl; | 260 | out << "option proxy_password " << proxyPassword << endl<< endl; |