deac/gitolite
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

delegation: allow includes in fragments, fixup doc

Browse source 
I could not think why we disallowed includes in subconfs, since an
include is the same as inserting all those lines inline anyway.
This commit is contained in:
Sitaram Chamarty 2011-08-28 09:28:01 +05:30
parent d01f6b1dbb
commit 0ec3d77761
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
doc/delegation.mkd
View file

@ -117,8 +117,9 @@ to the bottom of the main file.
### other notes ### other notes
The "include" statement cannot be used in fragment files, for security If you're in big-config mode (`GL_BIG_CONFIG` set to 1 in the rc file), a
reasons. fragment file cannot define any new groups; all groups have to be defined in
the main config file or in a file included from it.
---- ----

3
doc/gitolite.conf.mkd
View file

@ -80,9 +80,6 @@ config file exists.
Files that have been already processed once are skipped, with a warning. Files that have been already processed once are skipped, with a warning.
[Advanced users: the include statement cannot be used inside a delegated
config file, for security reasons].
<a name="_basic_access_control"></a> <a name="_basic_access_control"></a>
### basic access control ### basic access control

1
src/gl-compile-conf
View file

@ -257,7 +257,6 @@ sub parse_conf_line
{ {
my $include_glob = $1; my $include_glob = $1;
for my $file (glob($include_glob =~ m(^/) ? $include_glob : "conf/$include_glob")) { for my $file (glob($include_glob =~ m(^/) ? $include_glob : "conf/$include_glob")) {
die "$ABRT $fragment attempting to include configuration\n" if $fragment ne 'master';
die "$ABRT included file not found: '$file'\n" unless -f $file; die "$ABRT included file not found: '$file'\n" unless -f $file;
my $file_id = device_inode($file); my $file_id = device_inode($file);