mathieu: server/perl-kolab/lib/Kolab/LDAP/Backend syncrepl.pm, 1.5, 1.6

[cvs at kolab.org]

Author: mathieu

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

Modified Files:
	syncrepl.pm 
Log Message:
- defaults syncrepl_cookie_file to '/tmp/kolab_syncrepl_cookie_file'
- create if it doesn't exists


Index: syncrepl.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/LDAP/Backend/syncrepl.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- syncrepl.pm	19 Oct 2008 10:25:05 -0000	1.5
+++ syncrepl.pm	26 Nov 2008 22:26:44 -0000	1.6
@@ -60,10 +60,11 @@
 # giving an argument means: set
 sub cookie {
   my($cookie) = @_;
+  my $syncrepl_cookie_file = $Kolab::config{'syncrepl_cookie_file'} || '/tmp/kolab_syncrepl_cookie_file';
   if(defined($cookie)) {
-    if(!open(COOKIE_FILE, '>', $Kolab::config{'syncrepl_cookie_file'})) {
-        Kolab::log("SYNCREPL', 'Cannot open file `".$Kolab::config{'syncrepl_cookie_file'}.
-        "' for writing", KOLAB_DEBUG);
+    if(!open(COOKIE_FILE, '>', $syncrepl_cookie_file)) {
+        Kolab::log("SYNCREPL', 'Cannot open file `".$syncrepl_cookie_file.
+        "' for writing: $!", KOLAB_DEBUG);
         &abort;
     }
     Kolab::log("SYNCREPL', 'Writing cookie to file: ".$cookie, KOLAB_DEBUG);
@@ -71,9 +72,14 @@
     close(COOKIE_FILE);
     return $cookie;
   } else {
-    if(!open(COOKIE_FILE, '+<', $Kolab::config{'syncrepl_cookie_file'})) {
-        Kolab::log("SYNCREPL', 'Cannot open file `".$Kolab::config{'syncrepl_cookie_file'}.
-        "' for reading", KOLAB_DEBUG);
+    #create if it doesn't exists
+    if(! -f $syncrepl_cookie_file) {
+        open COOKIE_FILE, '>', $syncrepl_cookie_file;
+        close COOKIE_FILE;
+    }
+    if(!open(COOKIE_FILE, '+<', $syncrepl_cookie_file)) {
+        Kolab::log("SYNCREPL', 'Cannot open file `".$syncrepl_cookie_file.
+        "' for reading: $!", KOLAB_DEBUG);
         &abort;
     }
     read COOKIE_FILE, $cookie, 1024, 0;