Merge branch 'debian/sid' into debian/experimental

[apt.git] / methods / connect.cc

diff --git a/methods/connect.cc b/methods/connect.cc
index 35f4723ce33b2dbb3fac9cb96059107e95eba21c..d9c9a1dd4bc41da0798dcd5987222d949ab89e92 100644 (file)
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -142,9 +142,9 @@ bool Connect(std::string Host,int Port,const char *Service,int DefPort,int &Fd,
    // Convert the port name/number
    char ServStr[300];
    if (Port != 0)
    // Convert the port name/number
    char ServStr[300];
    if (Port != 0)

-      snprintf(ServStr,sizeof(ServStr),"%u",Port);
+      snprintf(ServStr,sizeof(ServStr),"%i", Port);

    else
    else

-      snprintf(ServStr,sizeof(ServStr),"%s",Service);
+      snprintf(ServStr,sizeof(ServStr),"%s", Service);

    
    /* We used a cached address record.. Yes this is against the spec but
       the way we have setup our rotating dns suggests that this is more
    
    /* We used a cached address record.. Yes this is against the spec but
       the way we have setup our rotating dns suggests that this is more


@@ -190,7 +190,7 @@ bool Connect(std::string Host,int Port,const char *Service,int DefPort,int &Fd,
            {
               if (DefPort != 0)
               {
            {
               if (DefPort != 0)
               {

-                 snprintf(ServStr,sizeof(ServStr),"%u",DefPort);
+                 snprintf(ServStr, sizeof(ServStr), "%i", DefPort);

                  DefPort = 0;
                  continue;
               }
                  DefPort = 0;
                  continue;
               }


@@ -206,8 +206,8 @@ bool Connect(std::string Host,int Port,const char *Service,int DefPort,int &Fd,
                                    Host.c_str());
            }
            if (Res == EAI_SYSTEM)
                                    Host.c_str());
            }
            if (Res == EAI_SYSTEM)

-              return _error->Error(_("System error resolving '%s:%s' (%s)"),
-                                   Host.c_str(),ServStr,strerror(errno));
+              return _error->Errno("getaddrinfo", _("System error resolving '%s:%s'"),
+                                      Host.c_str(),ServStr);

            return _error->Error(_("Something wicked happened resolving '%s:%s' (%i - %s)"),
                                 Host.c_str(),ServStr,Res,gai_strerror(Res));
         }
            return _error->Error(_("Something wicked happened resolving '%s:%s' (%i - %s)"),
                                 Host.c_str(),ServStr,Res,gai_strerror(Res));
         }