Merge branch 'nd/git-daemon-error-msgs'

* nd/git-daemon-error-msgs:
  daemon: return "access denied" if a service is not allowed

diff --combined daemon.c
index 3a348a79b3da190488cffcc85c966df75189970d,ac24b637e479cdeac12608a3eed7f9735be1ffeb..5a1086198b5f3780b5bc348cae78af12d8775cad
--- 1/daemon.c
--- 2/daemon.c
+++ b/daemon.c
@@@ -257,11 -257,11 +257,11 @@@ static int run_service(char *dir, struc
        if (!enabled && !service->overridable) {
                logerror("'%s': service not enabled.", service->name);
                errno = EACCES;
-               return -1;
+               goto failed;
        }
  
        if (!(path = path_ok(dir)))
-               return -1;
+               goto failed;
  
        /*
         * Security on the cheap.
@@@ -277,7 -277,7 +277,7 @@@
        if (!export_all_trees && access("git-daemon-export-ok", F_OK)) {
                logerror("'%s': repository not exported.", path);
                errno = EACCES;
-               return -1;
+               goto failed;
        }
  
        if (service->overridable) {
@@@ -291,7 -291,7 +291,7 @@@
                logerror("'%s': service not enabled for '%s'",
                         service->name, path);
                errno = EACCES;
-               return -1;
+               goto failed;
        }
  
        /*
@@@ -301,6 -301,10 +301,10 @@@
        signal(SIGTERM, SIG_IGN);
  
        return service->fn();
+ 
+ failed:
+       packet_write(1, "ERR %s: access denied", dir);
+       return -1;
  }
  
  static void copy_to_log(int fd)
@@@ -660,7 -664,7 +664,7 @@@ static void check_dead_children(void
  static char **cld_argv;
  static void handle(int incoming, struct sockaddr *addr, socklen_t addrlen)
  {
 -      struct child_process cld = { 0 };
 +      struct child_process cld = { NULL };
        char addrbuf[300] = "REMOTE_ADDR=", portbuf[300];
        char *env[] = { addrbuf, portbuf, NULL };
  
@@@ -734,29 -738,6 +738,29 @@@ struct socketlist 
        size_t alloc;
  };
  
 +static const char *ip2str(int family, struct sockaddr *sin, socklen_t len)
 +{
 +#ifdef NO_IPV6
 +      static char ip[INET_ADDRSTRLEN];
 +#else
 +      static char ip[INET6_ADDRSTRLEN];
 +#endif
 +
 +      switch (family) {
 +#ifndef NO_IPV6
 +      case AF_INET6:
 +              inet_ntop(family, &((struct sockaddr_in6*)sin)->sin6_addr, ip, len);
 +              break;
 +#endif
 +      case AF_INET:
 +              inet_ntop(family, &((struct sockaddr_in*)sin)->sin_addr, ip, len);
 +              break;
 +      default:
 +              strcpy(ip, "<unknown>");
 +      }
 +      return ip;
 +}
 +
  #ifndef NO_IPV6
  
  static int setup_named_sock(char *listen_addr, int listen_port, struct socketlist *socklist)
@@@ -803,22 -784,15 +807,22 @@@
  #endif
  
                if (set_reuse_addr(sockfd)) {
 +                      logerror("Could not set SO_REUSEADDR: %s", strerror(errno));
                        close(sockfd);
                        continue;
                }
  
                if (bind(sockfd, ai->ai_addr, ai->ai_addrlen) < 0) {
 +                      logerror("Could not bind to %s: %s",
 +                               ip2str(ai->ai_family, ai->ai_addr, ai->ai_addrlen),
 +                               strerror(errno));
                        close(sockfd);
                        continue;       /* not fatal */
                }
                if (listen(sockfd, 5) < 0) {
 +                      logerror("Could not listen to %s: %s",
 +                               ip2str(ai->ai_family, ai->ai_addr, ai->ai_addrlen),
 +                               strerror(errno));
                        close(sockfd);
                        continue;       /* not fatal */
                }
@@@ -865,23 -839,16 +869,23 @@@ static int setup_named_sock(char *liste
                return 0;
  
        if (set_reuse_addr(sockfd)) {
 +              logerror("Could not set SO_REUSEADDR: %s", strerror(errno));
                close(sockfd);
                return 0;
        }
  
        if ( bind(sockfd, (struct sockaddr *)&sin, sizeof sin) < 0 ) {
 +              logerror("Could not listen to %s: %s",
 +                       ip2str(AF_INET, (struct sockaddr *)&sin, sizeof(sin)),
 +                       strerror(errno));
                close(sockfd);
                return 0;
        }
  
        if (listen(sockfd, 5) < 0) {
 +              logerror("Could not listen to %s: %s",
 +                       ip2str(AF_INET, (struct sockaddr *)&sin, sizeof(sin)),
 +                       strerror(errno));
                close(sockfd);
                return 0;
        }