diff options
| author | Jameson Graef Rollins <jrollins@phys.columbia.edu> | 2008-06-16 20:00:46 -0400 |
|---|---|---|
| committer | Jameson Graef Rollins <jrollins@phys.columbia.edu> | 2008-06-16 20:00:46 -0400 |
| commit | e619b23879fde5703da435141754324dcf7cfa53 (patch) | |
| tree | b469466288dbc7d2aa663c691bcf4095a5b65b53 /etc/monkeysphere-server.conf | |
| parent | 114c8d24c679e2a2339700395bc32929c3b4dcba (diff) | |
| parent | deb41134ca527508253244cfa8860a2031034825 (diff) | |
Merge branch 'master' into no-cache
Conflicts:
src/common
src/monkeysphere
src/monkeysphere-ssh-proxycommand
Diffstat (limited to 'etc/monkeysphere-server.conf')
| -rw-r--r-- | etc/monkeysphere-server.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/etc/monkeysphere-server.conf b/etc/monkeysphere-server.conf index 82da497..3915bf4 100644 --- a/etc/monkeysphere-server.conf +++ b/etc/monkeysphere-server.conf @@ -20,4 +20,5 @@ # Whether to add user controlled authorized_keys file to # monkeysphere-generated authorized_keys file. Should be path to file # where '%h' will be replaced by the home directory of the user. +# To not add any user-controlled file, put "-" #USER_CONTROLLED_AUTHORIZED_KEYS=%h/.ssh/authorized_keys |