Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint

diff --git a/daemon.c b/daemon.c
index 60bf6c743c559676f0c9e0ff8dc6d9a5dfede195..daa4c8e8c95924c6fb446884b3ed44c454425b54 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -229,7 +229,7 @@ static char *path_ok(char *directory)
        }
 
        if (!path) {
-               logerror("'%s': unable to chdir or not a git archive", dir);
+               logerror("'%s' does not appear to be a git repository", dir);
                return NULL;
        }
 
@@ -444,27 +444,27 @@ static void parse_extra_args(char *extra_args, int buflen)
        if (hostname) {
 #ifndef NO_IPV6
                struct addrinfo hints;
-               struct addrinfo *ai, *ai0;
+               struct addrinfo *ai;
                int gai;
                static char addrbuf[HOST_NAME_MAX + 1];
 
                memset(&hints, 0, sizeof(hints));
                hints.ai_flags = AI_CANONNAME;
 
-               gai = getaddrinfo(hostname, 0, &hints, &ai0);
+               gai = getaddrinfo(hostname, 0, &hints, &ai);
                if (!gai) {
-                       for (ai = ai0; ai; ai = ai->ai_next) {
-                               struct sockaddr_in *sin_addr = (void *)ai->ai_addr;
-
-                               inet_ntop(AF_INET, &sin_addr->sin_addr,
-                                         addrbuf, sizeof(addrbuf));
-                               free(canon_hostname);
-                               canon_hostname = xstrdup(ai->ai_canonname);
-                               free(ip_address);
-                               ip_address = xstrdup(addrbuf);
-                               break;
-                       }
-                       freeaddrinfo(ai0);
+                       struct sockaddr_in *sin_addr = (void *)ai->ai_addr;
+
+                       inet_ntop(AF_INET, &sin_addr->sin_addr,
+                                 addrbuf, sizeof(addrbuf));
+                       free(ip_address);
+                       ip_address = xstrdup(addrbuf);
+
+                       free(canon_hostname);
+                       canon_hostname = xstrdup(ai->ai_canonname ?
+                                                ai->ai_canonname : ip_address);
+
+                       freeaddrinfo(ai);
                }
 #else
                struct hostent *hent;
@@ -716,7 +716,7 @@ static int socksetup(char *listen_addr, int listen_port, int **socklist_p)
 
        gai = getaddrinfo(listen_addr, pbuf, &hints, &ai0);
        if (gai)
-               die("getaddrinfo() failed: %s\n", gai_strerror(gai));
+               die("getaddrinfo() failed: %s", gai_strerror(gai));
 
        for (ai = ai0; ai; ai = ai->ai_next) {
                int sockfd;
@@ -937,6 +937,8 @@ int main(int argc, char **argv)
        gid_t gid = 0;
        int i;
 
+       git_extract_argv0_path(argv[0]);
+
        for (i = 1; i < argc; i++) {
                char *arg = argv[i];