diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-06-11 12:01:37 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-06-11 12:01:37 +0000 |
| commit | 4c719530d9b0ec8616f515a9995286205c9b717b (patch) | |
| tree | b2111f95d89bd2109dea01e538be0332029df7c6 /src/NetrcAuthResolver.cc | |
| parent | 812563bb6d5d449de0a606e8c70206b5ccaec99f (diff) | |
2010-06-11 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Made protected member variable private. Added accessor funcs.
* src/AbstractAuthResolver.h
* src/DefaultAuthResolver.cc
* src/DefaultAuthResolver.h
* src/NetrcAuthResolver.cc
* src/NetrcAuthResolver.h
Diffstat (limited to 'src/NetrcAuthResolver.cc')
| -rw-r--r-- | src/NetrcAuthResolver.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/NetrcAuthResolver.cc b/src/NetrcAuthResolver.cc index 2a3fbae4..ef54c02d 100644 --- a/src/NetrcAuthResolver.cc +++ b/src/NetrcAuthResolver.cc @@ -43,10 +43,10 @@ NetrcAuthResolver::NetrcAuthResolver():_ignoreDefault(false) {} SharedHandle<AuthConfig> NetrcAuthResolver::resolveAuthConfig(const std::string& hostname) { - if(_userDefinedAuthConfig.isNull()) { + if(getUserDefinedAuthConfig().isNull()) { return findNetrcAuthenticator(hostname); } else { - return _userDefinedAuthConfig; + return getUserDefinedAuthConfig(); } } @@ -54,14 +54,14 @@ SharedHandle<AuthConfig> NetrcAuthResolver::findNetrcAuthenticator(const std::string& hostname) const { if(_netrc.isNull()) { - return _defaultAuthConfig; + return getDefaultAuthConfig(); } else { SharedHandle<Authenticator> auth = _netrc->findAuthenticator(hostname); if(auth.isNull()) { - return _defaultAuthConfig; + return getDefaultAuthConfig(); } else { - if(_ignoreDefault && auth->getMachine() == "") { - return _defaultAuthConfig; + if(_ignoreDefault && auth->getMachine().empty()) { + return getDefaultAuthConfig(); } else { return SharedHandle<AuthConfig> (new AuthConfig(auth->getLogin(), auth->getPassword())); |
