steffen: server/perl-kolab/Kolab-Conf Conf.pm,1.49,1.50

cvs at intevation.de cvs at intevation.de
Tue Apr 19 12:59:24 CEST 2005


Author: steffen

Update of /kolabrepository/server/perl-kolab/Kolab-Conf
In directory doto:/tmp/cvs-serv28174/Kolab-Conf

Modified Files:
	Conf.pm 
Log Message:
prevent endless loop if subst. value is @@@attr@@@

Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- Conf.pm	20 Jan 2005 22:33:48 -0000	1.49
+++ Conf.pm	19 Apr 2005 10:59:22 -0000	1.50
@@ -168,6 +168,7 @@
                         $val = $Kolab::config{$attr};
                     }
                     s/\@{3}(\S+?)(\|.+?)?\@{3}/$val/;
+		    last if ( $val eq "\@\@\@$attr\@\@\@" ); # prevent endless loop
                 } else {
                     Kolab::log('T', "No configuration variable corresponding to `$1' exists", KOLAB_WARN);
                     s/\@{3}(\S+?)\@{3}//;





More information about the commits mailing list