[interchange-cvs] [SCM] Interchange branch, master, updated. 64b75321bb51bfb4818f55f878fed728949b91d8

[Stefan Hornburg]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Interchange".

The branch, master has been updated
       via  64b75321bb51bfb4818f55f878fed728949b91d8 (commit)
       via  4f17bcc6c33d2f891be2256005a835061159e9b9 (commit)
      from  9662befda733c467db1f0817a30ce66968dd12ee (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 64b75321bb51bfb4818f55f878fed728949b91d8
Merge: 4f17bcc6c33d2f891be2256005a835061159e9b9 9662befda733c467db1f0817a30ce66968dd12ee
Author: Stefan Hornburg (Racke) <racke at linuxia.de>
Date:   Tue Sep 8 20:00:47 2009 +0200

    Merge branch 'master' of ssh://racke@git.icdevgroup.org/var/git/interchange

commit 4f17bcc6c33d2f891be2256005a835061159e9b9
Author: Stefan Hornburg (Racke) <racke at linuxia.de>
Date:   Tue Sep 8 19:57:42 2009 +0200

    check whether directory is allowed before, not after path expansion

-----------------------------------------------------------------------

Summary of changes and diff:
 lib/Vend/Config.pm |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/Vend/Config.pm b/lib/Vend/Config.pm
index 1be545b..ffdc918 100644
--- a/lib/Vend/Config.pm
+++ b/lib/Vend/Config.pm
@@ -3906,14 +3906,13 @@ sub parse_dir_array {
 	my($var, $value) = @_;
 	return [] unless $value;
 
-	$value = "$C->{VendRoot}/$value"
-		unless file_name_is_absolute($value);
-	$value =~ s./+$..;
-
 	unless (allowed_file($value)) {
 		config_error('Path %s not allowed in %s directive',
 					  $value, $var);
 	}
+	$value = "$C->{VendRoot}/$value"
+		unless file_name_is_absolute($value);
+	$value =~ s./+$..;
 
 	$C->{$var} = [] unless $C->{$var};
 	my $c = $C->{$var} || [];


hooks/post-receive
-- 
Interchange