mathieu: server/perl-kolab/lib/Kolab Conf.pm,1.2,1.3

[cvs at kolab.org]

Author: mathieu

Update of /kolabrepository/server/perl-kolab/lib/Kolab
In directory doto:/tmp/cvs-serv14673/perl-kolab/lib/Kolab

Modified Files:
	Conf.pm 
Log Message:
kolab/issue3321 (slapd.replicas.template and slapd.access.template can be absent)


Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/Conf.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Conf.pm	17 Nov 2008 19:37:08 -0000	1.2
+++ Conf.pm	30 Dec 2008 14:11:58 -0000	1.3
@@ -484,6 +484,10 @@
     my $templatedir = $Kolab::config{"templatedir"};
 
     my $keytemplate = "$templatedir/slapd.access.template";
+    if( ! -f $keytemplate ) {
+        Kolab::log('T', "No LDAP access file `$keytemplate', skipping", KOLAB_DEBUG);
+        return;
+    }
     my $cfg = $templates{$keytemplate};
     my $oldcfg = $cfg . '.old';
 
@@ -578,6 +582,10 @@
     my $templatedir = $Kolab::config{"templatedir"};
 
     my $keytemplate = "$templatedir/slapd.replicas.template";
+    if( ! -f $keytemplate ) {
+        Kolab::log('T', "No LDAP replicas `$keytemplate', skipping", KOLAB_DEBUG);
+        return;
+    }
     my $cfg = $templates{$keytemplate};
     my $oldcfg = $cfg . '.old';