X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=cgi-auth-flexible.pm;h=6d1c0e8577fb79dab7fb2ed2e99d735e48d2aa66;hb=c7fda90f0be4c210a36d13f0d20ef7f3f0da95e3;hp=613ee90c5609a3ce74cd9cf192dde7c775b433fc;hpb=c9e605bce445a9a645478f154271274524edeaf1;p=cgi-auth-flexible.git

diff --git a/cgi-auth-flexible.pm b/cgi-auth-flexible.pm
index 613ee90..6d1c0e8 100644
--- a/cgi-auth-flexible.pm
+++ b/cgi-auth-flexible.pm
@@ -353,6 +353,7 @@ sub srcdump_dirscan_prepare ($$) {
     };
     my %dirsdone;
     foreach my $item ($v->_ch('srcdump_listitems')) {
+	next unless defined $item;
 	if ($item eq '.' && $v->{S}{srcdump_filter_cwd}) {
 	    my @bad = grep { !m#^/# } values %INC;
 	    die "filtering . from srcdump items and \@INC but already".
@@ -477,11 +478,11 @@ sub new_verifier {
 	    },
 	    srcdump_process_item => \&srcdump_process_item,
 	    srcdump_vcs_dirs => [qw(.git .hg .bzr .svn)],
-	    srcdump_vcsscript => [git => "
+	    srcdump_vcsscript => {git => "
                  git ls-files -z
                  git ls-files -z --others --exclude-from=.gitignore
                  find .git -print0
-                            "],
+                            "},
 	    srcdump_byvcs => \&srcdump_byvcs,
 	    srcdump_novcs => \&srcdump_novcs,
 	    srcdump_excludes => [qw(*~ *.bak *.tmp), '#*#'],
@@ -500,14 +501,14 @@ sub new_verifier {
 	$verifier->{S}{$k} = $v;
     }
     $verifier->{S}{db_setup_stmts} //=
-	["CREATE TABLE $v->{S}{db_prefix}_assocs (".
+	["CREATE TABLE $verifier->{S}{db_prefix}_assocs (".
 	 " assochash VARCHAR PRIMARY KEY,".
 	 " username VARCHAR NOT NULL,".
 	 " last INTEGER NOT NULL".
 	 ")"
 	 ,
-	 "CREATE INDEX $v->{S}{db_prefix}_assocs_timeout_index".
-	 " ON $v->{S}{db_prefix}_assocs".
+	 "CREATE INDEX $verifier->{S}{db_prefix}_assocs_timeout_index".
+	 " ON $verifier->{S}{db_prefix}_assocs".
 	 " (last)"
 	];
     bless $verifier, $class;
@@ -655,12 +656,14 @@ sub construct_cookie ($$$) {
     my ($r, $cooks) = @_;
     return undef unless $cooks;
     my $c = $r->{Cgi};
-my @ca = (-name => $r->{S}{cookie_name},
-                             -value => $cooks,
-                             -path => $r->{S}{cookie_path},
-                             -domain => $r->_ch('get_cookie_domain'),
-                             -expires => '+'.$r->{S}{login_timeout}.'s',
-                             -secure => $r->{S}{encrypted_only});
+    my @ca = (
+	-name => $r->{S}{cookie_name},
+	-value => $cooks,
+	-path => $r->{S}{cookie_path},
+	-domain => $r->_ch('get_cookie_domain'),
+	-expires => '+'.$r->{S}{login_timeout}.'s',
+	-secure => $r->{S}{encrypted_only}
+	);
     my $cookie = $c->cookie(@ca);
 #print STDERR "CC $r $c $cooks $cookie (@ca).\n";
     return $cookie;