diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2014-07-29 17:08:50 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2014-07-29 18:16:23 +0300 |
commit | d745c522f462e01aa576c6f93b94cbad6c631f73 (patch) | |
tree | 854738e411b0f993ecaea3d5d3fb05280a621642 /lib/GitACL.pm | |
parent | ba7a48a2b88b33c6c49511fd4422d255264fac98 (diff) | |
download | gitaclhook-d745c522f462e01aa576c6f93b94cbad6c631f73.tar.gz gitaclhook-d745c522f462e01aa576c6f93b94cbad6c631f73.tar.bz2 |
Change namespace for the configuration variables: hooks.acl.*
Diffstat (limited to 'lib/GitACL.pm')
-rw-r--r-- | lib/GitACL.pm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/GitACL.pm b/lib/GitACL.pm index 9cd381d..cde9624 100644 --- a/lib/GitACL.pm +++ b/lib/GitACL.pm @@ -70,13 +70,13 @@ sub allow($$) { $self->debug(1, "allow $loc"); exit 0; } sub default_rule($) { my $self = shift; - my $def = GitACL::git_value('config', 'hooks.acldefault'); + my $def = GitACL::git_value('config', 'hooks.acl.default'); my $msg = "default rule"; if (defined($def)) { if ($def eq "allow") { $self->allow($msg); } elsif ($def ne "deny") { $msg .= " (warning: hooks.acldefault has invalid value)"; @@ -107,13 +107,13 @@ sub git_value(@) { close($fd); return $_; } sub match_primary_group($$) { my ($user_name,$group_name) = @_; - my ($name,$passwd,$uid,$gid,$members) = getpwnam($user_name) or return 0; + my ($name,$passwd,$uid,$gid) = getpwnam($user_name) or return 0; ($name) = getgrgid($gid) or return 0; return 1 if $name eq $group_name; return 0; } sub match_user($$) { @@ -187,39 +187,39 @@ sub new { $obj->deny("no GIT_DIR"); } if (defined($args{debug})) { $obj->{debug} = $args{debug}; } else { - $obj->{debug} = git_value('config', '--bool', 'hooks.acldebug') || + $obj->{debug} = git_value('config', '--bool', 'hooks.acl.debug') || $ENV{GIT_UPDATE_DEBUG} > 0; } if (defined($args{logfile})) { $obj->{logfile} = $args{logfile}; } else { - $obj->{logfile} = git_value('config', 'hooks.acllog'); + $obj->{logfile} = git_value('config', 'hooks.acl.log'); } if ($obj->{logfile} && $obj->{logfile} !~ /[>|]/) { $obj->{logfile} = ">>$obj->{logfile}"; } if (defined($args{quiet})) { $obj->{quiet} = $args{quiet}; } elsif (!$obj->{debug}) { - $obj->{quiet} = git_value('config', 'hooks.aclquiet'); + $obj->{quiet} = git_value('config', 'hooks.acl.quiet'); } if (defined($args{user})) { $obj->{user_name} = $args{user}; } else { my ($u) = getpwuid $<; $obj->{user_name} = $u; } $obj->deny("no such user") unless $obj->{user_name}; - my $httpdusr = git_value('config', 'hooks.httpd-user'); + my $httpdusr = git_value('config', 'hooks.acl.httpd-user'); if (defined($httpdusr) and $obj->{user_name} eq $httpdusr) { $obj->deny("need authenticated user") unless $ENV{AUTH_TYPE}; $obj->{user_name} = $ENV{REMOTE_USER}; } $obj->{project_name} = get_project_name($obj->{git_dir}); @@ -258,13 +258,13 @@ sub new { sub check { my $self = shift; $self->info("$self->{user_name} requested $opstr{$self->{op}} ". "on $self->{ref} in $self->{project_name}"); - my $type = git_value('config', 'hooks.acltype'); + my $type = git_value('config', 'hooks.acl.type'); $type = "File" unless $type; my $r = eval("use GitACL::$type; GitACL::$type->new(\$self);"); $self->deny("unsupported acltype: $@") unless $r; $r->check_acl; |