[Monotone-commits-diffs] net.venge.monotone.levitte.permissions-directories: 3ad331818f20ac4123f47b286c8d1f9809b64fb4

[code]

revision:            3ad331818f20ac4123f47b286c8d1f9809b64fb4
date:                2011-01-01T12:23:10
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone.levitte.permissions-directories
changelog:
Document the added permissions directories

manifest:
format_version "1"

new_manifest [604142170845e3fcded4be66b504558e8aa2c78c]

old_revision [83c0403c272c27635da26e4802bb5f24e00ebf08]

patch "NEWS"
 from [7216d7870a01f5caaa0f309482d269d9345f3c38]
   to [fb4eaa2e21b6929022555e345f127034e0028d49]

patch "monotone.texi"
 from [996de20305e89ab85cba2370f0a109ac5d4b8299]
   to [ba72de0b6fa7910773f053127a6b9c631fc64e68]
============================================================
--- NEWS	7216d7870a01f5caaa0f309482d269d9345f3c38
+++ NEWS	fb4eaa2e21b6929022555e345f127034e0028d49
@@ -16,6 +16,11 @@ XXX XXX XX XX:XX:XX UTC 2010
           Steve Petruzzello <address@hidden> for the outstanding
           work!
 
+        - get_netsync_(read|write)_permitted have been extended to not
+          only read the files read-permissions and write-permissions,
+          but also the files in the subdirectories read_permissions.d
+          and write_permissions.d.
+
         New Features
 
         - 'mtn conflicts store' now outputs a count of the conflicts,
============================================================
--- monotone.texi	996de20305e89ab85cba2370f0a109ac5d4b8299
+++ monotone.texi	ba72de0b6fa7910773f053127a6b9c631fc64e68
@@ -11625,8 +11625,11 @@ @subsection Netsync Permission Hooks
 Returns @code{true} if a peer authenticated as key @var{key_identity}
 should be allowed to read from your database certs, revisions,
 manifests, and files associated with @var{branch}; otherwise @code{false}.
-The default definition of this hook reads a file @file{read-permissions} in
-the configuration directory. This file looks like
+The default definition of this hook reads a file @file{read-permissions}
+and all files in the subdirectory @file{read-permissions.d} in the
+configuration directory. All the files are treated as if they were one
+file, with @file{read-permissions} first followed by the files in
address@hidden in alphanumerical order. The files look like
 @smallexample
 @group
 pattern "address@hidden,address@hidden"
@@ -11663,11 +11666,13 @@ @subsection Netsync Permission Hooks
 
 @item get_netsync_write_permitted (@var{key_identity})
 
-Returns @code{true} if a peer authenticated as key @var{key_identity} should
-be allowed to write into your database certs, revisions, manifests, and
-files; otherwise @code{false}. The default definition of this hook reads a file
address@hidden in the configuration directory which contains a list
-of key hashes or local key names, one per line, which are allowed write access.
+Returns @code{true} if a peer authenticated as key @var{key_identity}
+should be allowed to write into your database certs, revisions,
+manifests, and files; otherwise @code{false}. The default definition of
+this hook reads a file @file{write-permissions} and all files in the
+subdirectory @file{write-permissions.d} in the configuration directory
+which contains a list of key hashes or local key names, one per line,
+which are allowed write access.
 The special value
 @code{*} means to allow access to anyone whose public key we already have.