From 7fe1b5f0468caa4543d12bc8ad634b811079b521 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enrique=20J=2E=20Hern=C3=A1ndez=20Blasco?=
 <ejhernandez@zentyal.com>
Date: Fri, 18 Dec 2015 10:43:46 +0100
Subject: [PATCH] oc: Do compile with Samba 4.1

As requested by @extrafu to maintain sogo packages for a little while
---
 OpenChange/MAPIStoreSamDBUtils.m | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/OpenChange/MAPIStoreSamDBUtils.m b/OpenChange/MAPIStoreSamDBUtils.m
index 4b0db76ae..f26d173c2 100644
--- a/OpenChange/MAPIStoreSamDBUtils.m
+++ b/OpenChange/MAPIStoreSamDBUtils.m
@@ -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);