daemon.c 16.2 KB
Newer Older
1 2
#include <signal.h>
#include <sys/wait.h>
3
#include <sys/socket.h>
J
Jason Riedy 已提交
4
#include <sys/time.h>
P
Peter Anvin 已提交
5
#include <sys/poll.h>
6
#include <netdb.h>
7
#include <netinet/in.h>
P
Petr Baudis 已提交
8
#include <arpa/inet.h>
9
#include <syslog.h>
10 11
#include "pkt-line.h"
#include "cache.h"
12
#include "exec_cmd.h"
P
Petr Baudis 已提交
13

14
static int log_syslog;
P
Petr Baudis 已提交
15
static int verbose;
16
static int reuseaddr;
P
Petr Baudis 已提交
17

18 19
static const char daemon_usage[] =
"git-daemon [--verbose] [--syslog] [--inetd | --port=n] [--export-all]\n"
P
Petr Baudis 已提交
20
"           [--timeout=n] [--init-timeout=n] [--strict-paths]\n"
21 22
"           [--base-path=path] [--user-path | --user-path=path]\n"
"           [--reuseaddr] [directory...]";
23 24 25

/* List of acceptable pathname prefixes */
static char **ok_paths = NULL;
26
static int strict_paths = 0;
27 28 29

/* If this is set, git-daemon-export-ok is not required */
static int export_all_trees = 0;
P
Petr Baudis 已提交
30

P
Petr Baudis 已提交
31 32 33
/* Take all paths relative to this one if non-NULL */
static char *base_path = NULL;

34 35 36 37 38 39
/* If defined, ~user notation is allowed and the string is inserted
 * after ~user/.  E.g. a request to git://host/~alice/frotz would
 * go to /home/alice/pub_git/frotz with --user-path=pub_git.
 */
static char *user_path = NULL;

40 41 42
/* Timeout, and initial timeout */
static unsigned int timeout = 0;
static unsigned int init_timeout = 0;
P
Petr Baudis 已提交
43

44
static void logreport(int priority, const char *err, va_list params)
P
Petr Baudis 已提交
45 46 47 48 49 50 51 52
{
	/* We should do a single write so that it is atomic and output
	 * of several processes do not get intermingled. */
	char buf[1024];
	int buflen;
	int maxlen, msglen;

	/* sizeof(buf) should be big enough for "[pid] \n" */
J
Junio C Hamano 已提交
53
	buflen = snprintf(buf, sizeof(buf), "[%ld] ", (long) getpid());
P
Petr Baudis 已提交
54 55 56 57

	maxlen = sizeof(buf) - buflen - 1; /* -1 for our own LF */
	msglen = vsnprintf(buf + buflen, maxlen, err, params);

58 59 60 61 62
	if (log_syslog) {
		syslog(priority, "%s", buf);
		return;
	}

P
Petr Baudis 已提交
63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79
	/* maxlen counted our own LF but also counts space given to
	 * vsnprintf for the terminating NUL.  We want to make sure that
	 * we have space for our own LF and NUL after the "meat" of the
	 * message, so truncate it at maxlen - 1.
	 */
	if (msglen > maxlen - 1)
		msglen = maxlen - 1;
	else if (msglen < 0)
		msglen = 0; /* Protect against weird return values. */
	buflen += msglen;

	buf[buflen++] = '\n';
	buf[buflen] = '\0';

	write(2, buf, buflen);
}

80
static void logerror(const char *err, ...)
P
Petr Baudis 已提交
81 82 83
{
	va_list params;
	va_start(params, err);
84
	logreport(LOG_ERR, err, params);
P
Petr Baudis 已提交
85 86 87
	va_end(params);
}

88
static void loginfo(const char *err, ...)
P
Petr Baudis 已提交
89 90 91 92 93
{
	va_list params;
	if (!verbose)
		return;
	va_start(params, err);
94
	logreport(LOG_INFO, err, params);
P
Petr Baudis 已提交
95 96
	va_end(params);
}
97

98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144
static int avoid_alias(char *p)
{
	int sl, ndot;

	/* 
	 * This resurrects the belts and suspenders paranoia check by HPA
	 * done in <435560F7.4080006@zytor.com> thread, now enter_repo()
	 * does not do getcwd() based path canonicalizations.
	 *
	 * sl becomes true immediately after seeing '/' and continues to
	 * be true as long as dots continue after that without intervening
	 * non-dot character.
	 */
	if (!p || (*p != '/' && *p != '~'))
		return -1;
	sl = 1; ndot = 0;
	p++;

	while (1) {
		char ch = *p++;
		if (sl) {
			if (ch == '.')
				ndot++;
			else if (ch == '/') {
				if (ndot < 3)
					/* reject //, /./ and /../ */
					return -1;
				ndot = 0;
			}
			else if (ch == 0) {
				if (0 < ndot && ndot < 3)
					/* reject /.$ and /..$ */
					return -1;
				return 0;
			}
			else
				sl = ndot = 0;
		}
		else if (ch == 0)
			return 0;
		else if (ch == '/') {
			sl = 1;
			ndot = 0;
		}
	}
}

145
static char *path_ok(char *dir)
146
{
147
	static char rpath[PATH_MAX];
148 149 150 151 152 153 154
	char *path;

	if (avoid_alias(dir)) {
		logerror("'%s': aliased", dir);
		return NULL;
	}

155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179
	if (*dir == '~') {
		if (!user_path) {
			logerror("'%s': User-path not allowed", dir);
			return NULL;
		}
		if (*user_path) {
			/* Got either "~alice" or "~alice/foo";
			 * rewrite them to "~alice/%s" or
			 * "~alice/%s/foo".
			 */
			int namlen, restlen = strlen(dir);
			char *slash = strchr(dir, '/');
			if (!slash)
				slash = dir + restlen;
			namlen = slash - dir;
			restlen -= namlen;
			loginfo("userpath <%s>, request <%s>, namlen %d, restlen %d, slash <%s>", user_path, dir, namlen, restlen, slash);
			snprintf(rpath, PATH_MAX, "%.*s/%s%.*s",
				 namlen, dir, user_path, restlen, slash);
			dir = rpath;
		}
	}
	else if (base_path) {
		if (*dir != '/') {
			/* Allow only absolute */
180
			logerror("'%s': Non-absolute path denied (base-path active)", dir);
P
Petr Baudis 已提交
181 182
			return NULL;
		}
183 184 185 186
		else {
			snprintf(rpath, PATH_MAX, "%s%s", base_path, dir);
			dir = rpath;
		}
P
Petr Baudis 已提交
187 188
	}

189
	path = enter_repo(dir, strict_paths);
190

191 192 193
	if (!path) {
		logerror("'%s': unable to chdir or not a git archive", dir);
		return NULL;
194 195 196
	}

	if ( ok_paths && *ok_paths ) {
J
Junio C Hamano 已提交
197
		char **pp;
198
		int pathlen = strlen(path);
199

J
Junio C Hamano 已提交
200
		/* The validation is done on the paths after enter_repo
201 202 203 204 205
		 * appends optional {.git,.git/.git} and friends, but 
		 * it does not use getcwd().  So if your /pub is
		 * a symlink to /mnt/pub, you can whitelist /pub and
		 * do not have to say /mnt/pub.
		 * Do not say /pub/.
J
Junio C Hamano 已提交
206
		 */
207 208
		for ( pp = ok_paths ; *pp ; pp++ ) {
			int len = strlen(*pp);
J
Junio C Hamano 已提交
209 210 211 212 213
			if (len <= pathlen &&
			    !memcmp(*pp, path, len) &&
			    (path[len] == '\0' ||
			     (!strict_paths && path[len] == '/')))
				return path;
214
		}
215 216 217 218 219
	}
	else {
		/* be backwards compatible */
		if (!strict_paths)
			return path;
220 221
	}

222 223
	logerror("'%s': not in whitelist", path);
	return NULL;		/* Fallthrough. Deny by default */
224
}
225

226
static int upload(char *dir)
227
{
228 229 230 231 232
	/* Timeout as string */
	char timeout_buf[64];
	const char *path;

	loginfo("Request for '%s'", dir);
233

234
	if (!(path = path_ok(dir)))
235
		return -1;
H
H. Peter Anvin 已提交
236

237 238 239
	/*
	 * Security on the cheap.
	 *
240
	 * We want a readable HEAD, usable "objects" directory, and
241 242
	 * a "git-daemon-export-ok" flag that says that the other side
	 * is ok with us doing this.
243 244 245
	 *
	 * path_ok() uses enter_repo() and does whitelist checking.
	 * We only need to make sure the repository is exported.
246
	 */
247

248
	if (!export_all_trees && access("git-daemon-export-ok", F_OK)) {
249
		logerror("'%s': repository not exported.", path);
250 251 252 253
		errno = EACCES;
		return -1;
	}

254 255 256 257 258 259
	/*
	 * We'll ignore SIGTERM from now on, we have a
	 * good client.
	 */
	signal(SIGTERM, SIG_IGN);

260 261
	snprintf(timeout_buf, sizeof timeout_buf, "--timeout=%u", timeout);

262
	/* git-upload-pack only ever reads stuff, so this is safe */
263
	execl_git_cmd("upload-pack", "--strict", timeout_buf, ".", NULL);
264 265 266
	return -1;
}

267
static int execute(void)
268
{
269 270 271
	static char line[1000];
	int len;

272
	alarm(init_timeout ? init_timeout : timeout);
273
	len = packet_read_line(0, line, sizeof(line));
274
	alarm(0);
275 276 277 278

	if (len && line[len-1] == '\n')
		line[--len] = 0;

279
	if (!strncmp("git-upload-pack ", line, 16))
280
		return upload(line+16);
281

P
Petr Baudis 已提交
282
	logerror("Protocol error: '%s'", line);
283 284 285
	return -1;
}

286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302

/*
 * We count spawned/reaped separately, just to avoid any
 * races when updating them from signals. The SIGCHLD handler
 * will only update children_reaped, and the fork logic will
 * only update children_spawned.
 *
 * MAX_CHILDREN should be a power-of-two to make the modulus
 * operation cheap. It should also be at least twice
 * the maximum number of connections we will ever allow.
 */
#define MAX_CHILDREN 128

static int max_connections = 25;

/* These are updated by the signal handler */
static volatile unsigned int children_reaped = 0;
L
Linus Torvalds 已提交
303
static pid_t dead_child[MAX_CHILDREN];
304 305 306 307 308

/* These are updated by the main loop */
static unsigned int children_spawned = 0;
static unsigned int children_deleted = 0;

L
Linus Torvalds 已提交
309
static struct child {
310
	pid_t pid;
J
Junio C Hamano 已提交
311
	int addrlen;
312
	struct sockaddr_storage address;
313 314
} live_child[MAX_CHILDREN];

J
Junio C Hamano 已提交
315
static void add_child(int idx, pid_t pid, struct sockaddr *addr, int addrlen)
316 317 318
{
	live_child[idx].pid = pid;
	live_child[idx].addrlen = addrlen;
319
	memcpy(&live_child[idx].address, addr, addrlen);
320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365
}

/*
 * Walk from "deleted" to "spawned", and remove child "pid".
 *
 * We move everything up by one, since the new "deleted" will
 * be one higher.
 */
static void remove_child(pid_t pid, unsigned deleted, unsigned spawned)
{
	struct child n;

	deleted %= MAX_CHILDREN;
	spawned %= MAX_CHILDREN;
	if (live_child[deleted].pid == pid) {
		live_child[deleted].pid = -1;
		return;
	}
	n = live_child[deleted];
	for (;;) {
		struct child m;
		deleted = (deleted + 1) % MAX_CHILDREN;
		if (deleted == spawned)
			die("could not find dead child %d\n", pid);
		m = live_child[deleted];
		live_child[deleted] = n;
		if (m.pid == pid)
			return;
		n = m;
	}
}

/*
 * This gets called if the number of connections grows
 * past "max_connections".
 *
 * We _should_ start off by searching for connections
 * from the same IP, and if there is some address wth
 * multiple connections, we should kill that first.
 *
 * As it is, we just "randomly" kill 25% of the connections,
 * and our pseudo-random generator sucks too. I have no
 * shame.
 *
 * Really, this is just a place-holder for a _real_ algorithm.
 */
366
static void kill_some_children(int signo, unsigned start, unsigned stop)
367 368 369 370 371
{
	start %= MAX_CHILDREN;
	stop %= MAX_CHILDREN;
	while (start != stop) {
		if (!(start & 3))
372
			kill(live_child[start].pid, signo);
373 374 375 376
		start = (start + 1) % MAX_CHILDREN;
	}
}

377
static void check_max_connections(void)
378
{
379
	for (;;) {
380
		int active;
381
		unsigned spawned, reaped, deleted;
382

383 384 385 386 387 388 389 390 391 392 393 394
		spawned = children_spawned;
		reaped = children_reaped;
		deleted = children_deleted;

		while (deleted < reaped) {
			pid_t pid = dead_child[deleted % MAX_CHILDREN];
			remove_child(pid, deleted, spawned);
			deleted++;
		}
		children_deleted = deleted;

		active = spawned - deleted;
395 396
		if (active <= max_connections)
			break;
397

398 399 400 401 402 403 404 405 406 407 408
		/* Kill some unstarted connections with SIGTERM */
		kill_some_children(SIGTERM, deleted, spawned);
		if (active <= max_connections << 1)
			break;

		/* If the SIGTERM thing isn't helping use SIGKILL */
		kill_some_children(SIGKILL, deleted, spawned);
		sleep(1);
	}
}

J
Junio C Hamano 已提交
409
static void handle(int incoming, struct sockaddr *addr, int addrlen)
410 411
{
	pid_t pid = fork();
P
Petr Baudis 已提交
412 413
	char addrbuf[256] = "";
	int port = -1;
414 415 416 417 418 419 420 421 422 423 424

	if (pid) {
		unsigned idx;

		close(incoming);
		if (pid < 0)
			return;

		idx = children_spawned % MAX_CHILDREN;
		children_spawned++;
		add_child(idx, pid, addr, addrlen);
425

426
		check_max_connections();
427 428 429 430 431 432
		return;
	}

	dup2(incoming, 0);
	dup2(incoming, 1);
	close(incoming);
P
Petr Baudis 已提交
433 434 435 436 437 438

	if (addr->sa_family == AF_INET) {
		struct sockaddr_in *sin_addr = (void *) addr;
		inet_ntop(AF_INET, &sin_addr->sin_addr, addrbuf, sizeof(addrbuf));
		port = sin_addr->sin_port;

P
Peter Anvin 已提交
439
#ifndef NO_IPV6
P
Petr Baudis 已提交
440 441 442 443 444 445 446 447 448
	} else if (addr->sa_family == AF_INET6) {
		struct sockaddr_in6 *sin6_addr = (void *) addr;

		char *buf = addrbuf;
		*buf++ = '['; *buf = '\0'; /* stpcpy() is cool */
		inet_ntop(AF_INET6, &sin6_addr->sin6_addr, buf, sizeof(addrbuf) - 1);
		strcat(buf, "]");

		port = sin6_addr->sin6_port;
P
Peter Anvin 已提交
449
#endif
P
Petr Baudis 已提交
450
	}
451
	loginfo("Connection from %s:%d", addrbuf, port);
P
Petr Baudis 已提交
452

453
	exit(execute());
454 455
}

456 457 458
static void child_handler(int signo)
{
	for (;;) {
459 460
		int status;
		pid_t pid = waitpid(-1, &status, WNOHANG);
461 462 463 464 465

		if (pid > 0) {
			unsigned reaped = children_reaped;
			dead_child[reaped % MAX_CHILDREN] = pid;
			children_reaped = reaped + 1;
P
Petr Baudis 已提交
466
			/* XXX: Custom logging, since we don't wanna getpid() */
467 468 469 470 471 472 473 474 475
			if (verbose) {
				char *dead = "";
				if (!WIFEXITED(status) || WEXITSTATUS(status) > 0)
					dead = " (with error)";
				if (log_syslog)
					syslog(LOG_INFO, "[%d] Disconnected%s", pid, dead);
				else
					fprintf(stderr, "[%d] Disconnected%s\n", pid, dead);
			}
476 477 478 479 480 481
			continue;
		}
		break;
	}
}

482 483 484 485 486 487 488 489 490 491
static int set_reuse_addr(int sockfd)
{
	int on = 1;

	if (!reuseaddr)
		return 0;
	return setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR,
			  &on, sizeof(on));
}

P
Peter Anvin 已提交
492 493 494
#ifndef NO_IPV6

static int socksetup(int port, int **socklist_p)
495
{
496 497 498
	int socknum = 0, *socklist = NULL;
	int maxfd = -1;
	char pbuf[NI_MAXSERV];
499

P
Peter Anvin 已提交
500 501
	struct addrinfo hints, *ai0, *ai;
	int gai;
502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535

	sprintf(pbuf, "%d", port);
	memset(&hints, 0, sizeof(hints));
	hints.ai_family = AF_UNSPEC;
	hints.ai_socktype = SOCK_STREAM;
	hints.ai_protocol = IPPROTO_TCP;
	hints.ai_flags = AI_PASSIVE;

	gai = getaddrinfo(NULL, pbuf, &hints, &ai0);
	if (gai)
		die("getaddrinfo() failed: %s\n", gai_strerror(gai));

	for (ai = ai0; ai; ai = ai->ai_next) {
		int sockfd;
		int *newlist;

		sockfd = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
		if (sockfd < 0)
			continue;
		if (sockfd >= FD_SETSIZE) {
			error("too large socket descriptor.");
			close(sockfd);
			continue;
		}

#ifdef IPV6_V6ONLY
		if (ai->ai_family == AF_INET6) {
			int on = 1;
			setsockopt(sockfd, IPPROTO_IPV6, IPV6_V6ONLY,
				   &on, sizeof(on));
			/* Note: error is not fatal */
		}
#endif

536 537
		if (set_reuse_addr(sockfd)) {
			close(sockfd);
538
			continue;
539 540
		}

541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562
		if (bind(sockfd, ai->ai_addr, ai->ai_addrlen) < 0) {
			close(sockfd);
			continue;	/* not fatal */
		}
		if (listen(sockfd, 5) < 0) {
			close(sockfd);
			continue;	/* not fatal */
		}

		newlist = realloc(socklist, sizeof(int) * (socknum + 1));
		if (!newlist)
			die("memory allocation failed: %s", strerror(errno));

		socklist = newlist;
		socklist[socknum++] = sockfd;

		if (maxfd < sockfd)
			maxfd = sockfd;
	}

	freeaddrinfo(ai0);

P
Peter Anvin 已提交
563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582
	*socklist_p = socklist;
	return socknum;
}

#else /* NO_IPV6 */

static int socksetup(int port, int **socklist_p)
{
	struct sockaddr_in sin;
	int sockfd;

	sockfd = socket(AF_INET, SOCK_STREAM, 0);
	if (sockfd < 0)
		return 0;

	memset(&sin, 0, sizeof sin);
	sin.sin_family = AF_INET;
	sin.sin_addr.s_addr = htonl(INADDR_ANY);
	sin.sin_port = htons(port);

583 584 585 586 587
	if (set_reuse_addr(sockfd)) {
		close(sockfd);
		return 0;
	}

P
Peter Anvin 已提交
588 589 590 591
	if ( bind(sockfd, (struct sockaddr *)&sin, sizeof sin) < 0 ) {
		close(sockfd);
		return 0;
	}
592

593 594 595 596 597
	if (listen(sockfd, 5) < 0) {
		close(sockfd);
		return 0;
	}

H
H. Peter Anvin 已提交
598
	*socklist_p = xmalloc(sizeof(int));
P
Peter Anvin 已提交
599
	**socklist_p = sockfd;
600
	return 1;
P
Peter Anvin 已提交
601 602 603 604 605 606 607 608 609
}

#endif

static int service_loop(int socknum, int *socklist)
{
	struct pollfd *pfd;
	int i;

H
H. Peter Anvin 已提交
610
	pfd = xcalloc(socknum, sizeof(struct pollfd));
P
Peter Anvin 已提交
611 612 613 614 615

	for (i = 0; i < socknum; i++) {
		pfd[i].fd = socklist[i];
		pfd[i].events = POLLIN;
	}
616 617

	signal(SIGCHLD, child_handler);
618 619

	for (;;) {
620
		int i;
P
Peter Anvin 已提交
621

622
		if (poll(pfd, socknum, -1) < 0) {
623
			if (errno != EINTR) {
P
Peter Anvin 已提交
624
				error("poll failed, resuming: %s",
625 626 627
				      strerror(errno));
				sleep(1);
			}
628 629 630 631
			continue;
		}

		for (i = 0; i < socknum; i++) {
P
Peter Anvin 已提交
632
			if (pfd[i].revents & POLLIN) {
633
				struct sockaddr_storage ss;
634
				unsigned int sslen = sizeof(ss);
P
Peter Anvin 已提交
635
				int incoming = accept(pfd[i].fd, (struct sockaddr *)&ss, &sslen);
636 637 638 639 640 641 642 643 644 645 646
				if (incoming < 0) {
					switch (errno) {
					case EAGAIN:
					case EINTR:
					case ECONNABORTED:
						continue;
					default:
						die("accept returned %s", strerror(errno));
					}
				}
				handle(incoming, (struct sockaddr *)&ss, sslen);
647 648 649 650 651
			}
		}
	}
}

P
Peter Anvin 已提交
652 653 654
static int serve(int port)
{
	int socknum, *socklist;
J
Junio C Hamano 已提交
655

P
Peter Anvin 已提交
656 657 658
	socknum = socksetup(port, &socklist);
	if (socknum == 0)
		die("unable to allocate any listen sockets on port %u", port);
J
Junio C Hamano 已提交
659

P
Peter Anvin 已提交
660
	return service_loop(socknum, socklist);
J
Junio C Hamano 已提交
661
}
P
Peter Anvin 已提交
662

663 664 665
int main(int argc, char **argv)
{
	int port = DEFAULT_GIT_PORT;
666
	int inetd_mode = 0;
667 668 669 670 671 672 673 674 675 676 677 678 679 680
	int i;

	for (i = 1; i < argc; i++) {
		char *arg = argv[i];

		if (!strncmp(arg, "--port=", 7)) {
			char *end;
			unsigned long n;
			n = strtoul(arg+7, &end, 0);
			if (arg[7] && !*end) {
				port = n;
				continue;
			}
		}
681 682
		if (!strcmp(arg, "--inetd")) {
			inetd_mode = 1;
A
Andreas Ericsson 已提交
683
			log_syslog = 1;
684 685
			continue;
		}
P
Petr Baudis 已提交
686 687 688 689
		if (!strcmp(arg, "--verbose")) {
			verbose = 1;
			continue;
		}
690 691 692 693
		if (!strcmp(arg, "--syslog")) {
			log_syslog = 1;
			continue;
		}
694 695 696 697
		if (!strcmp(arg, "--export-all")) {
			export_all_trees = 1;
			continue;
		}
698 699
		if (!strncmp(arg, "--timeout=", 10)) {
			timeout = atoi(arg+10);
A
Andreas Ericsson 已提交
700
			continue;
701
		}
702
		if (!strncmp(arg, "--init-timeout=", 15)) {
703
			init_timeout = atoi(arg+15);
A
Andreas Ericsson 已提交
704
			continue;
705
		}
706 707 708 709
		if (!strcmp(arg, "--strict-paths")) {
			strict_paths = 1;
			continue;
		}
P
Petr Baudis 已提交
710 711 712 713
		if (!strncmp(arg, "--base-path=", 12)) {
			base_path = arg+12;
			continue;
		}
714 715 716 717
		if (!strcmp(arg, "--reuseaddr")) {
			reuseaddr = 1;
			continue;
		}
718 719 720 721 722 723 724 725
		if (!strcmp(arg, "--user-path")) {
			user_path = "";
			continue;
		}
		if (!strncmp(arg, "--user-path=", 12)) {
			user_path = arg + 12;
			continue;
		}
726 727 728 729 730 731 732
		if (!strcmp(arg, "--")) {
			ok_paths = &argv[i+1];
			break;
		} else if (arg[0] != '-') {
			ok_paths = &argv[i];
			break;
		}
733

734 735 736
		usage(daemon_usage);
	}

A
Andreas Ericsson 已提交
737 738 739
	if (log_syslog)
		openlog("git-daemon", 0, LOG_DAEMON);

740 741 742 743 744 745 746 747
	if (strict_paths && (!ok_paths || !*ok_paths)) {
		if (!inetd_mode)
			die("git-daemon: option --strict-paths requires a whitelist");

		logerror("option --strict-paths requires a whitelist");
		exit (1);
	}

748 749
	if (inetd_mode) {
		fclose(stderr); //FIXME: workaround
750
		return execute();
751
	}
752 753

	return serve(port);
754
}