From 205156cdda4b202ed5cb8f3411d387efbd1d0549 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Apr 12 2016 17:33:55 +0000
Subject: import openchange-2.0-10.el7_2


---

diff --git a/SOURCES/openchange-1.0-fix-connection-args.patch b/SOURCES/openchange-1.0-fix-connection-args.patch
new file mode 100644
index 0000000..6b415ef
--- /dev/null
+++ b/SOURCES/openchange-1.0-fix-connection-args.patch
@@ -0,0 +1,38 @@
+diff -up openchange-1.0-BORG/libmapi/IMSProvider.c.fix-samba-args openchange-1.0-BORG/libmapi/IMSProvider.c
+--- openchange-1.0-BORG/libmapi/IMSProvider.c.fix-samba-args	2016-04-07 18:27:16.678401391 +0200
++++ openchange-1.0-BORG/libmapi/IMSProvider.c	2016-04-07 18:29:00.321613700 +0200
+@@ -90,6 +90,7 @@ static char *build_binding_string(struct
+ 				  struct mapi_profile *profile)
+ {
+ 	char	*binding;
++	bool	any_string_added = false;
+ 
+ 	/* Sanity Checks */
+ 	if (!profile) return NULL;
+@@ -100,15 +101,23 @@ static char *build_binding_string(struct
+ 
+ 	/* If dump-data option is enabled */
+ 	if (mapi_ctx->dumpdata == true) {
+-		binding = talloc_strdup_append(binding, "print,");
++		binding = talloc_strdup_append(binding, "print");
++		any_string_added = true;
+ 	}
+ 	/* If seal option is enabled in the profile */
+ 	if (profile->seal == true) {
+-		binding = talloc_strdup_append(binding, "seal,");
++		if (any_string_added) {
++			binding = talloc_strdup_append(binding, ",");
++		}
++		binding = talloc_strdup_append(binding, "seal");
++		any_string_added = true;
+ 	}
+ 	/* If localaddress parameter is available in the profile */
+ 	if (profile->localaddr) {
+-		binding = talloc_asprintf_append(binding, "localaddress=%s,", profile->localaddr);
++		if (any_string_added) {
++			binding = talloc_strdup_append(binding, ",");
++		}
++		binding = talloc_asprintf_append(binding, "localaddress=%s", profile->localaddr);
+ 	}
+ 	
+ 	binding = talloc_strdup_append(binding, "]");
diff --git a/SPECS/openchange.spec b/SPECS/openchange.spec
index f7b1c54..486a5aa 100644
--- a/SPECS/openchange.spec
+++ b/SPECS/openchange.spec
@@ -19,7 +19,7 @@
 
 Name: openchange
 Version: 2.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 Group: Applications/System
 Summary: Provides access to Microsoft Exchange servers using native protocols
 License: GPLv3+ and Public Domain
@@ -80,6 +80,9 @@ Patch5: openchange-1.0-freebusy.patch
 # RH bug #1238537
 Patch6: openchange-2.0-samba-4.2.patch
 
+# Fix connection arguments for newer samba
+Patch7: openchange-1.0-fix-connection-args.patch
+
 %description
 OpenChange provides libraries to access Microsoft Exchange servers
 using native protocols.
@@ -146,6 +149,7 @@ This package provides the server elements for OpenChange.
 %patch4 -p1 -b .symbol-clash
 %patch5 -p1 -b .freebusy
 %patch6 -p1 -b .samba-4.2
+%patch7 -p1 -b .fix-connection-args
 
 %build
 ./autogen.sh
@@ -289,6 +293,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Apr 07 2016 Milan Crha <mcrha@redhat.com> - 2.0-10
+- Add a patch to fix connection string (Related: #1322690)
+
 * Mon Jul 20 2015 Milan Crha <mcrha@redhat.com> - 2.0-9
 - Rebuild against updated samba