Merge r3397, 3398, 3399 from sogo branch

diff --git a/libmapi/conf/mapi-properties b/libmapi/conf/mapi-properties
index ffd747e025a3e2ae942ba989e0410079ee561ea3..19b1ed5770a6ac8fd4de5073d80087b254b55aee 100644 (file)
--- a/libmapi/conf/mapi-properties
+++ b/libmapi/conf/mapi-properties
@@ -213,6 +213,8 @@
 0x0e250102  PR_ORIGINATING_MTA_CERTIFICATE
 0x0e260102  PR_PROOF_OF_SUBMISSION
 0x0e270102  PR_NT_SECURITY_DESCRIPTOR                          PidTagSecurityDescriptor
+0x0e28001f  PR_PRIMARY_SEND_ACCT
+0x0e29001f  PR_NEXT_SEND_ACCT
 0x0e580102  PR_CREATOR_SID
 0x0e590102  PR_LAST_MODIFIER_SID
 0x0e5e0048  PR_MIME_HANDLER_CLASSIDS
@@ -315,6 +317,7 @@
 0x300b0102  PR_SEARCH_KEY                              PidTagSearchKey
 0x300c0102  PR_PROVIDER_UID
 0x300d0003  PR_PROVIDER_ORDINAL
+0x30100102  PR_TARGET_ENTRYID
 0x3301001e  PR_FORM_VERSION
 0x33020048  PR_FORM_CLSID
 0x3303001e  PR_FORM_CONTACT_NAME

diff --git a/mapiproxy/servers/default/emsmdb/emsmdbp_object.c b/mapiproxy/servers/default/emsmdb/emsmdbp_object.c
index 4613010d3cf5248b006e0cad537bc3c4a0c0ebeb..5872d454ff4270a7f7bc3aa37b2832bcc24797ee 100644 (file)
--- a/mapiproxy/servers/default/emsmdb/emsmdbp_object.c
+++ b/mapiproxy/servers/default/emsmdb/emsmdbp_object.c
@@ -1180,13 +1180,8 @@ _PUBLIC_ struct emsmdbp_object *emsmdbp_object_message_open(TALLOC_CTX *mem_ctx,
                /* mapistore implementation goes here */
                message_object = emsmdbp_object_message_init(mem_ctx, emsmdbp_ctx, messageID, folder_object);
                contextID = emsmdbp_get_contextID(folder_object);
-               if (mapistore_folder_open_message(emsmdbp_ctx->mstore_ctx, contextID, folder_object->backend_object, message_object,
-                                                 messageID, &message_object->backend_object) != MAPISTORE_SUCCESS) {
-                       talloc_free(message_object);
-                       message_object = NULL;
-               }
-
-               if (mapistore_message_get_message_data(emsmdbp_ctx->mstore_ctx, contextID, message_object->backend_object, mem_ctx, msgp) != MAPISTORE_SUCCESS) {
+               if (mapistore_folder_open_message(emsmdbp_ctx->mstore_ctx, contextID, folder_object->backend_object, message_object, messageID, &message_object->backend_object) != MAPISTORE_SUCCESS
+                   || mapistore_message_get_message_data(emsmdbp_ctx->mstore_ctx, contextID, message_object->backend_object, mem_ctx, msgp) != MAPISTORE_SUCCESS) {
                        talloc_free(message_object);
                        message_object = NULL;
                }

diff --git a/mapiproxy/servers/default/emsmdb/oxcprpt.c b/mapiproxy/servers/default/emsmdb/oxcprpt.c
index 5369e5bda6fd33b8a9ce16ee5f4fff54668a5836..ed3db3e9b8c559126fe81084b070871f55d91203 100644 (file)
--- a/mapiproxy/servers/default/emsmdb/oxcprpt.c
+++ b/mapiproxy/servers/default/emsmdb/oxcprpt.c
@@ -585,15 +585,9 @@ _PUBLIC_ enum MAPISTATUS EcDoRpc_RopOpenStream(TALLOC_CTX *mem_ctx,
                        else {
                                talloc_free(data_pointers);
                                talloc_free(retvals);
-                               if (request->OpenModeFlags == OpenStream_ReadWrite) {
-                                       object->object.stream->stream.buffer.data = talloc_zero(object->object.stream, uint8_t);
-                                       object->object.stream->stream.buffer.length = 0;
-                               }
-                               else {
-                                       mapi_repl->error_code = retvals[0];
-                                       talloc_free(object);
-                                       goto end;
-                               }
+                               mapi_repl->error_code = retvals[0];
+                               talloc_free(object);
+                               goto end;
                        }
                }
        }