summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-08-27 17:51:42 -0700
committerJunio C Hamano <junkio@cox.net>2006-08-27 17:51:42 -0700
commitd5d0a0e748025bf253db5f0cde7b22cb0feeced2 (patch)
tree7aa97a9e700362e9e662be79a9298078c95b6511 /Documentation
parentb32d37a3a6817ba307062fe2f7b6d9cfb85a1ebd (diff)
parent678dac6b45437d65fa958c03ca47f4a0337efad4 (diff)
downloadgit-d5d0a0e748025bf253db5f0cde7b22cb0feeced2.tar.gz
Merge branch 'ts/daemon'
* ts/daemon: Added support for dropping privileges to git-daemon.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-daemon.txt14
1 files changed, 13 insertions, 1 deletions
diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index 0f7d274eab..17619a3f57 100644
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@ -11,7 +11,8 @@ SYNOPSIS
'git-daemon' [--verbose] [--syslog] [--inetd | --port=n] [--export-all]
[--timeout=n] [--init-timeout=n] [--strict-paths]
[--base-path=path] [--user-path | --user-path=path]
- [--reuseaddr] [--detach] [--pid-file=file] [directory...]
+ [--reuseaddr] [--detach] [--pid-file=file]
+ [--user=user [--group=group]] [directory...]
DESCRIPTION
-----------
@@ -93,6 +94,17 @@ OPTIONS
--pid-file=file::
Save the process id in 'file'.
+--user=user, --group=group::
+ Change daemon's uid and gid before entering the service loop.
+ When only `--user` is given without `--group`, the
+ primary group ID for the user is used. The values of
+ the option are given to `getpwnam(3)` and `getgrnam(3)`
+ and numeric IDs are not supported.
++
+Giving these options is an error when used with `--inetd`; use
+the facility of inet daemon to achieve the same before spawning
+`git-daemon` if needed.
+
<directory>::
A directory to add to the whitelist of allowed directories. Unless
--strict-paths is specified this will also include subdirectories