fixed an issue with missing Sieve scripts

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@427 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-mime/ChangeLog b/sope-mime/ChangeLog
index 57ba72f117febf4025a9055edac0c43b39d46f74..35a55a53d1e3915253b8d43d044defe57ef9e0e9 100644 (file)
--- a/sope-mime/ChangeLog
+++ b/sope-mime/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-03  Helge Hess  <helge.hess@skyrix.com>
+
+       * NGImap4: fixed an error handler in the Sieve client (v4.5.203)
+
 2004-11-30  Helge Hess  <helge.hess@skyrix.com>
 
        * NGMail: fixed a bug in NGSendMail (v4.5.202)

diff --git a/sope-mime/NGImap4/ChangeLog b/sope-mime/NGImap4/ChangeLog
index 502f05d74ca8a8d048ea79408b26c1494a903a3e..1d7ec86c99e84542d47e02593a9fb51e20bd206d 100644 (file)
--- a/sope-mime/NGImap4/ChangeLog
+++ b/sope-mime/NGImap4/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-03  Helge Hess  <helge.hess@skyrix.com>
+
+       * NGSieveClient.m: fixed error processing on missing scripts
+
 2004-11-28  Helge Hess  <helge.hess@skyrix.com>
 
        * NGSieveClient.m: can init using a URL, prepared some parsing methods,

diff --git a/sope-mime/NGImap4/NGSieveClient.m b/sope-mime/NGImap4/NGSieveClient.m
index 182b7324fb29b5433bad7c910f29aef7e896fe84..e1bc357cf4ab6203a10c8e7b8610b787b1227434 100644 (file)
--- a/sope-mime/NGImap4/NGSieveClient.m
+++ b/sope-mime/NGImap4/NGSieveClient.m
@@ -365,6 +365,16 @@ static BOOL     debugImap4         = NO;
   if ((script = [[self readString] autorelease]) == nil)
     return nil;
   
+  if ([script hasPrefix:@"O "] || [script hasPrefix:@"NO "]) {
+    // TODO: not exactly correct, script could begin with this signature
+    // Note: readString read 'NO ...', but the first char is consumed
+    
+    [self logWithFormat:@"ERROR: status line reports: '%@'", script];
+    return nil;
+  }
+  
+  NSLog(@"str: %@", script);
+  
   /* read response code */
   
   if ((s = [self readStringToCRLF]) == nil) {
@@ -829,7 +839,8 @@ static BOOL     debugImap4         = NO;
     return [self readQuoted];
   if (c1 == '{')
     return [self readLiteral];
-  
+
+  // Note: this does not return the first char!
   return [self readStringToCRLF];
 }
 

diff --git a/sope-mime/Version b/sope-mime/Version
index 7b780dd464e18e5dc8b03f80f4fe168c02617adc..1b20d9637cf40378234ba6f26802342563b4d2fa 100644 (file)
--- a/sope-mime/Version
+++ b/sope-mime/Version
@@ -2,6 +2,6 @@
 
 MAJOR_VERSION:=4
 MINOR_VERSION:=5
-SUBMINOR_VERSION:=202
+SUBMINOR_VERSION:=203
 
 # v4.2.149 requires libNGStreams v4.2.34