| author | andyq <andyq> | 2002-12-13 13:49:02 (UTC) |
|---|---|---|
| committer | andyq <andyq> | 2002-12-13 13:49:02 (UTC) |
| commit | 8b1c25e608e7255199dc97ad8269ac66d40beede (patch) (side-by-side diff) | |
| 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 @@ -249,13 +249,13 @@ void DataManager :: writeOutIpkgConf() if ( !ftpProxyEnabled ) out << "#"; out << "option ftp_proxy " << ftpProxy << endl; } - if ( proxyUsername == "" ) + if ( proxyUsername == "" || (!httpProxyEnabled && !ftpProxyEnabled) ) out << "#option proxy_username <username>" << endl; else out << "option proxy_username " << proxyUsername << endl; - if ( proxyPassword == "" ) + if ( proxyPassword == "" || (!httpProxyEnabled && !ftpProxyEnabled) ) out << "#option proxy_password <password>" << endl << endl; else out << "option proxy_password " << proxyPassword << endl<< endl; |