summaryrefslogtreecommitdiff
path: root/methods
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-05-04 09:57:24 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2010-05-04 09:57:24 +0200
commit52d9d000a74ea71edff93f00ae38aceb9ada53d4 (patch)
treee03749a63a2057b107ba900bbdbdfb9ad320c037 /methods
parent3b1fffc35f3eb277d92f38c687c270edd1d8550d (diff)
parent8f40076991ecc89ab1e3c486da2696a44c285f18 (diff)
merge from the mvo branch
Diffstat (limited to 'methods')
-rw-r--r--methods/connect.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/methods/connect.cc b/methods/connect.cc
index adb16a199..2f6b4833e 100644
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -116,6 +116,9 @@ static bool DoConnect(struct addrinfo *Addr,string Host,
errno = Err;
if(errno == ECONNREFUSED)
Owner->SetFailExtraMsg("\nFailReason: ConnectionRefused");
+ else if (errno == ETIMEDOUT)
+ Owner->SetFailExtraMsg("\nFailReason: ConnectionTimedOut");
+ bad_addr.insert(bad_addr.begin(), string(Name));
return _error->Errno("connect",_("Could not connect to %s:%s (%s)."),Host.c_str(),
Service,Name);
}