Merge trunk changes (from r2196 up to 2259) into branch

[jelmer/openchange.git] / libmapi / IProfAdmin.c

diff --git a/libmapi/IProfAdmin.c b/libmapi/IProfAdmin.c
index 0dda4260f82ff47b7235ad0dc5e7a247b3196e3a..19f46d3dcea5dbc44d06d843e919cc3fe3e158e8 100644 (file)
--- a/libmapi/IProfAdmin.c
+++ b/libmapi/IProfAdmin.c
@@ -705,10 +705,9 @@ _PUBLIC_ enum MAPISTATUS OpenProfile(struct mapi_context *mapi_ctx,
        enum MAPISTATUS retval;
 
        OPENCHANGE_RETVAL_IF(!mapi_ctx, MAPI_E_NOT_INITIALIZED, NULL);
-       OPENCHANGE_RETVAL_IF(!mapi_ctx->session, MAPI_E_NOT_INITIALIZED, NULL);
        OPENCHANGE_RETVAL_IF(!mapi_ctx->ldb_ctx, MAPI_E_NOT_INITIALIZED, NULL);
 
-       mem_ctx = (TALLOC_CTX *) mapi_ctx->session;
+       mem_ctx = (TALLOC_CTX *) mapi_ctx;
        
        /* find the profile in ldb store */
        retval = ldb_load_profile(mem_ctx, mapi_ctx->ldb_ctx, profile, profname, password);