|
 |
17841d8 |
Patch by Robert Scheck <robert@fedoraproject.org> for Zarafa >= 7.1.12 which removes a wrongly introduced dependency to the
|
|
|
17841d8 |
proprietary zarafa-licensed. From Zarafa 7.1.11 to 7.1.12 there were some changes to the ValidateArchiverLicense() method;
|
|
|
17841d8 |
due to these changes rebuilding fails with "ArchiverSession.cpp:53:23: fatal error: ECLicense.h: No such file or directory"
|
|
|
17841d8 |
now. The patch just reverts the changes that were introduced from 7.1.11 to 7.1.12 to get the code building again.
|
|
|
17841d8 |
|
|
|
17841d8 |
--- zarafa-7.1.12/ECtools/zarafa-archiver/ArchiverSession.cpp 2015-04-07 13:10:12.000000000 +0200
|
|
|
17841d8 |
+++ zarafa-7.1.12/ECtools/zarafa-archiver/ArchiverSession.cpp.licensed-archiver 2015-04-07 15:55:07.000000000 +0200
|
|
|
17841d8 |
@@ -50,8 +50,6 @@
|
|
|
17841d8 |
#include "mapiext.h"
|
|
|
17841d8 |
#include "userutil.h"
|
|
|
17841d8 |
#include "ECMsgStore.h"
|
|
|
17841d8 |
-#include "ECLicense.h"
|
|
|
17841d8 |
-#include "ECMAPILicense.h"
|
|
|
17841d8 |
|
|
|
17841d8 |
typedef mapi_memory_ptr<ECSERVERLIST> ECServerListPtr;
|
|
|
17841d8 |
|
|
|
17841d8 |
@@ -879,38 +877,7 @@
|
|
|
17841d8 |
typedef mapi_object_ptr<ECMsgStore, IID_ECMsgStore> ECMsgStorePtr;
|
|
|
17841d8 |
|
|
|
17841d8 |
HRESULT ArchiverSession::ValidateArchiverLicense(bool attachnewuser /* = false*/) const {
|
|
|
17841d8 |
- IMsgStore *lpMsgStore = NULL;
|
|
|
17841d8 |
- IMsgStore *lpProxedMsgStore = NULL;
|
|
|
17841d8 |
- UnknownPtr ptrUnknown;
|
|
|
17841d8 |
- ECMsgStorePtr ptrOnlineStore;
|
|
|
17841d8 |
-
|
|
|
17841d8 |
- HRESULT hr = HrOpenDefaultStore(GetMAPISession(), MDB_WRITE | MDB_NO_DIALOG | MDB_NO_MAIL | MDB_TEMPORARY, &lpMsgStore);
|
|
|
17841d8 |
- if (hr != hrSuccess)
|
|
|
17841d8 |
- goto exit;
|
|
|
17841d8 |
-
|
|
|
17841d8 |
- hr = GetProxyStoreObject(lpMsgStore, &lpProxedMsgStore);
|
|
|
17841d8 |
- if (hr != hrSuccess)
|
|
|
17841d8 |
- goto exit;
|
|
|
17841d8 |
-
|
|
|
17841d8 |
- hr = lpProxedMsgStore->QueryInterface(IID_ECMsgStoreOnline, &ptrUnknown);
|
|
|
17841d8 |
- if (hr != hrSuccess)
|
|
|
17841d8 |
- goto exit;
|
|
|
17841d8 |
-
|
|
|
17841d8 |
- hr = ptrUnknown->QueryInterface(IID_ECMsgStore, &ptrOnlineStore);
|
|
|
17841d8 |
- if (hr != hrSuccess) {
|
|
|
17841d8 |
- m_lpLogger->Log(EC_LOGLEVEL_FATAL, "Unable to validate archived user count. Please check the archiver and licensed log for errors.");
|
|
|
17841d8 |
- hr = MAPI_E_NO_SUPPORT;
|
|
|
17841d8 |
- goto exit;
|
|
|
17841d8 |
- }
|
|
|
17841d8 |
-
|
|
|
17841d8 |
- hr = HrCheckLicense(&ptrOnlineStore->m_xMsgStore, SERVICE_TYPE_ARCHIVE, ZARAFA_ARCHIVE_DEFAULT);
|
|
|
17841d8 |
- if (hr != hrSuccess)
|
|
|
17841d8 |
- {
|
|
|
17841d8 |
- m_lpLogger->Log(EC_LOGLEVEL_FATAL, "No archiver license found.");
|
|
|
17841d8 |
- hr = MAPI_E_NO_SUPPORT;
|
|
|
17841d8 |
- }
|
|
|
17841d8 |
- else
|
|
|
17841d8 |
- {
|
|
|
17841d8 |
+ HRESULT hr;
|
|
|
17841d8 |
unsigned int ulArchivedUsers = 0;
|
|
|
17841d8 |
unsigned int ulMaxUsers = 0;
|
|
|
17841d8 |
|
|
|
17841d8 |
@@ -931,7 +898,6 @@
|
|
|
17841d8 |
} else if (ulArchivedUsers + 5 >= ulMaxUsers) { //@todo which warning limit?
|
|
|
17841d8 |
m_lpLogger->Log(EC_LOGLEVEL_FATAL, "You almost reached the archived user limit. Archived users %d of %d", ulArchivedUsers, ulMaxUsers);
|
|
|
17841d8 |
}
|
|
|
17841d8 |
- }
|
|
|
17841d8 |
|
|
|
17841d8 |
exit:
|
|
|
17841d8 |
return hr;
|
|
|
17841d8 |
--- zarafa-7.1.12/ECtools/zarafa-archiver/Makefile.am 2015-04-07 12:00:49.000000000 +0200
|
|
|
17841d8 |
+++ zarafa-7.1.12/ECtools/zarafa-archiver/Makefile.am.licensed-archiver 2015-04-07 15:59:42.000000000 +0200
|
|
|
17841d8 |
@@ -9,7 +9,6 @@
|
|
|
17841d8 |
-I${top_srcdir}/provider/client \
|
|
|
17841d8 |
-I${top_srcdir}/provider/include \
|
|
|
17841d8 |
-I${top_srcdir}/provider/soap \
|
|
|
17841d8 |
- -I${top_srcdir}/liblicense \
|
|
|
17841d8 |
-I${top_builddir}/provider/soap \
|
|
|
17841d8 |
$(GSOAP_CFLAGS) \
|
|
|
17841d8 |
-I${top_srcdir}/common \
|
|
|
17841d8 |
@@ -17,9 +16,7 @@
|
|
|
17841d8 |
|
|
|
17841d8 |
libarchiver_la_LIBADD = ${top_builddir}/mapi4linux/src/libmapi.la \
|
|
|
17841d8 |
${top_builddir}/common/libcommon_mapi.la \
|
|
|
17841d8 |
- ${top_builddir}/common/libcommon_util.la \
|
|
|
17841d8 |
- ${top_builddir}/liblicense/liblicense.la \
|
|
|
17841d8 |
- ${top_builddir}/liblicense/liblicense_mapi.la
|
|
|
17841d8 |
+ ${top_builddir}/common/libcommon_util.la
|
|
|
17841d8 |
|
|
|
17841d8 |
libarchiver_la_SOURCES = \
|
|
|
17841d8 |
ArchiverSession.cpp ArchiverSession.h ArchiverSessionPtr.h \
|
|
|
17841d8 |
--- zarafa-7.1.12/ECtools/zarafa-archiver/Makefile.in 2015-04-07 12:03:40.000000000 +0200
|
|
|
17841d8 |
+++ zarafa-7.1.12/ECtools/zarafa-archiver/Makefile.in.licensed-archiver 2015-04-07 16:00:15.000000000 +0200
|
|
|
17841d8 |
@@ -112,9 +112,7 @@
|
|
|
17841d8 |
libarchiver_la_DEPENDENCIES = \
|
|
|
17841d8 |
${top_builddir}/mapi4linux/src/libmapi.la \
|
|
|
17841d8 |
${top_builddir}/common/libcommon_mapi.la \
|
|
|
17841d8 |
- ${top_builddir}/common/libcommon_util.la \
|
|
|
17841d8 |
- ${top_builddir}/liblicense/liblicense.la \
|
|
|
17841d8 |
- ${top_builddir}/liblicense/liblicense_mapi.la
|
|
|
17841d8 |
+ ${top_builddir}/common/libcommon_util.la
|
|
|
17841d8 |
am_libarchiver_la_OBJECTS = ArchiverSession.lo archiver-common.lo \
|
|
|
17841d8 |
ArchiveManageImpl.lo ArchiveStateCollector.lo \
|
|
|
17841d8 |
ArchiveStateUpdater.lo ArchiveHelper.lo StoreHelper.lo \
|
|
|
17841d8 |
@@ -395,7 +393,6 @@
|
|
|
17841d8 |
-I${top_srcdir}/provider/client \
|
|
|
17841d8 |
-I${top_srcdir}/provider/include \
|
|
|
17841d8 |
-I${top_srcdir}/provider/soap \
|
|
|
17841d8 |
- -I${top_srcdir}/liblicense \
|
|
|
17841d8 |
-I${top_builddir}/provider/soap \
|
|
|
17841d8 |
$(GSOAP_CFLAGS) \
|
|
|
17841d8 |
-I${top_srcdir}/common \
|
|
|
17841d8 |
@@ -403,9 +400,7 @@
|
|
|
17841d8 |
|
|
|
17841d8 |
libarchiver_la_LIBADD = ${top_builddir}/mapi4linux/src/libmapi.la \
|
|
|
17841d8 |
${top_builddir}/common/libcommon_mapi.la \
|
|
|
17841d8 |
- ${top_builddir}/common/libcommon_util.la \
|
|
|
17841d8 |
- ${top_builddir}/liblicense/liblicense.la \
|
|
|
17841d8 |
- ${top_builddir}/liblicense/liblicense_mapi.la
|
|
|
17841d8 |
+ ${top_builddir}/common/libcommon_util.la
|
|
|
17841d8 |
|
|
|
17841d8 |
libarchiver_la_SOURCES = \
|
|
|
17841d8 |
ArchiverSession.cpp ArchiverSession.h ArchiverSessionPtr.h \
|