amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-24 12:55:24 +00:00
Code Issues Projects Releases Wiki Activity

oc: Do compile with Samba 4.1

Browse Source 
As requested by @extrafu to maintain sogo packages for a little while
This commit is contained in:
Enrique J. Hernández Blasco
2015-12-18 10:43:46 +01:00
parent 2a25675b3a
commit 7fe1b5f046
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OpenChange/MAPIStoreSamDBUtils.m
+15 -5
View File
@@ -25,6 +25,7 @@
#include <talloc.h>
#include <ldb.h>
#include <libmapiproxy.h>
#include <samba/version.h>
#import "NSData+MAPIStore.h"
@@ -52,11 +53,20 @@ MAPIStoreSamDBUserAttribute (struct mapistore_connection_info *connInfo,
attrs[0] = [attributeName UTF8String];
searchFormat
= [NSString stringWithFormat: @"(&(objectClass=user)(%@=%%s))", userKey];
ret = safe_ldb_search(&connInfo->sam_ctx, memCtx, &res,
ldb_get_default_basedn(connInfo->sam_ctx),
LDB_SCOPE_SUBTREE, attrs,
[searchFormat UTF8String],
[value UTF8String]);
#if SAMBA_VERSION_MAJOR <= 4 && SAMBA_VERSION_MINOR < 3
ret = ldb_search (connInfo->sam_ctx, memCtx, &res,
ldb_get_default_basedn(connInfo->sam_ctx),
LDB_SCOPE_SUBTREE, attrs,
[searchFormat UTF8String],
[value UTF8String]);
#else
ret = safe_ldb_search (&connInfo->sam_ctx, memCtx, &res,
ldb_get_default_basedn(connInfo->sam_ctx),
LDB_SCOPE_SUBTREE, attrs,
[searchFormat UTF8String],
[value UTF8String]);
#endif
if (ret == LDB_SUCCESS && res->count == 1)
{
result = ldb_msg_find_attr_as_string (res->msgs[0], attrs[0], NULL);