Change namespace for the configuration variables: hooks.acl.*

3 files changed, 9 insertions, 9 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;
diff --git a/lib/GitACL/File.pm b/lib/GitACL/File.pm
index efabfd4..f72c16d 100644
--- a/lib/GitACL/File.pm
+++ b/lib/GitACL/File.pm
@@ -20,13 +20,13 @@ use parent 'GitACL';
 sub check_acl {
     my $self = shift;
     my $fd;
     my $line = 0;
     my @ret;
     
-    my $filename = GitACL::git_value('config', 'hooks.aclfile');
+    my $filename = GitACL::git_value('config', 'hooks.acl.file');
     $self->allow("no ACL configured for ".$self->{project_name})
 	unless defined($filename);
 
     open($fd, "<", $filename)
 	or $self->deny("cannot open configuration file: $!");
     while (<$fd>) {
diff --git a/lib/GitACL/LDAP.pm b/lib/GitACL/LDAP.pm
index 22bfd8d..ac8fd06 100644
--- a/lib/GitACL/LDAP.pm
+++ b/lib/GitACL/LDAP.pm
@@ -18,13 +18,13 @@ package GitACL::LDAP;
 use parent 'GitACL';
 use strict;
 use Net::LDAP;
 
 sub parse_ldap_conf {
     my $self = shift;
-    my $filename = GitACL::git_value('config', 'hooks.aclldapconf') ||
+    my $filename = GitACL::git_value('config', 'hooks.acl.ldapconf') ||
 	           "/etc/ldap.conf";
 
     my $fd;
     open($fd, "<", $filename) or
 	$self->deny("cannot open file $filename: $!");
     while (<$fd>) {