Browse Source

Merge branch 'fixes'

maint
Junio C Hamano 19 years ago
parent
commit
4ae22d96fe
  1. 12
      daemon.c

12
daemon.c

@ -145,11 +145,11 @@ static int set_dir(const char *dir)


if ( chdir(dir) ) if ( chdir(dir) )
return -1; return -1;

/* /*
* Security on the cheap. * Security on the cheap.
* *
* We want a readable HEAD, usable "objects" directory, and * We want a readable HEAD, usable "objects" directory, and
* a "git-daemon-export-ok" flag that says that the other side * a "git-daemon-export-ok" flag that says that the other side
* is ok with us doing this. * is ok with us doing this.
*/ */
@ -529,7 +529,7 @@ static int service_loop(int socknum, int *socklist)
} }


signal(SIGCHLD, child_handler); signal(SIGCHLD, child_handler);

for (;;) { for (;;) {
int i; int i;


@ -566,13 +566,13 @@ static int service_loop(int socknum, int *socklist)
static int serve(int port) static int serve(int port)
{ {
int socknum, *socklist; int socknum, *socklist;

socknum = socksetup(port, &socklist); socknum = socksetup(port, &socklist);
if (socknum == 0) if (socknum == 0)
die("unable to allocate any listen sockets on port %u", port); die("unable to allocate any listen sockets on port %u", port);

return service_loop(socknum, socklist); return service_loop(socknum, socklist);
} }


int main(int argc, char **argv) int main(int argc, char **argv)
{ {

Loading…
Cancel
Save