Merge branch 'debian'

[hcoop/debian/exim4.git] / debian / patches / 50-relax-appendfile-chown-openafs.patch

--- a/src/transports/appendfile.c
+++ b/src/transports/appendfile.c
@@ -2613,13 +2613,24 @@
     /* Why are these here? Put in because they are present in the non-maildir
     directory case above. */
 
-    if(Uchown(filename, uid, gid) || Uchmod(filename, mode))
-      {
-      addr->basic_errno = errno;
-      addr->message = string_sprintf("while setting perms on maildir %s",
-        filename);
-      return FALSE;
-      }
+    /* Ignore failed chown if check_owner is disabled. */
+      if(Uchown(filename, uid, gid) && ob->check_owner)
+        {
+        addr->basic_errno = errno;
+        addr->message = string_sprintf("while setting owner on maildir %s",
+          filename);
+        addr->transport_return = FAIL;
+        goto RETURN;
+        }
+
+      if(Uchmod(filename, mode))
+	{
+        addr->basic_errno = errno;
+        addr->message = string_sprintf("while setting chmod on maildir %s",
+          filename);
+        addr->transport_return = FAIL;
+        goto RETURN;
+	}
     }
 
   #endif  /* SUPPORT_MAILDIR */
@@ -2772,12 +2783,21 @@
   /* In all cases of writing to a new file, ensure that the file which is
   going to be renamed has the correct ownership and mode. */
 
-  if(Uchown(filename, uid, gid) || Uchmod(filename, mode))
+  /* Ignore failed chown if check_owner is disabled. */
+  if(Uchown(filename, uid, gid) && ob->check_owner)
     {
-    addr->basic_errno = errno;
-    addr->message = string_sprintf("while setting perms on file %s",
-      filename);
-    return FALSE;
+      addr->basic_errno = errno;
+      addr->message = string_sprintf("while setting owner on file before write %s",
+				     filename);
+      return FALSE;
+    }
+  
+  if(Uchmod(filename, mode))
+    {
+      addr->basic_errno = errno;
+      addr->message = string_sprintf("while setting chmod on file before write %s",
+				     filename);
+      return FALSE;
     }
   }