source: npl/mailserver/zarafa7/zarafa-archiver-license-build-depenceny.patch @ c5c522c

gcc484ntopperl-5.22
Last change on this file since c5c522c was c5c522c, checked in by Edwin Eefting <edwin@datux.nl>, 8 years ago

initial commit, transferred from cleaned syn3 svn tree
  • Property mode set to 100644
File size: 4.2 KB
RevLine 
[c5c522c]1diff -u -r zarafa-7.1.12/ECtools/zarafa-archiver/ArchiverSession.cpp zarafa-7.1.12-licensepatch/ECtools/zarafa-archiver/ArchiverSession.cpp
2--- zarafa-7.1.12/ECtools/zarafa-archiver/ArchiverSession.cpp   2015-05-08 13:09:04.000000000 +0000
3+++ zarafa-7.1.12-licensepatch/ECtools/zarafa-archiver/ArchiverSession.cpp      2015-06-04 13:25:20.000000000 +0000
4@@ -50,8 +50,8 @@
5 #include "mapiext.h"
6 #include "userutil.h"
7 #include "ECMsgStore.h"
8-#include "ECLicense.h"
9-#include "ECMAPILicense.h"
10+//#include "ECLicense.h"
11+//#include "ECMAPILicense.h"
12 
13 typedef mapi_memory_ptr<ECSERVERLIST> ECServerListPtr;
14 
15@@ -879,60 +879,5 @@
16 typedef mapi_object_ptr<ECMsgStore, IID_ECMsgStore>    ECMsgStorePtr;
17 
18 HRESULT ArchiverSession::ValidateArchiverLicense(bool attachnewuser /* = false*/) const {
19-       IMsgStore *lpMsgStore = NULL;
20-       IMsgStore *lpProxedMsgStore = NULL;
21-       UnknownPtr ptrUnknown;
22-       ECMsgStorePtr ptrOnlineStore;
23-
24-       HRESULT hr = HrOpenDefaultStore(GetMAPISession(), MDB_WRITE | MDB_NO_DIALOG | MDB_NO_MAIL | MDB_TEMPORARY, &lpMsgStore);
25-       if (hr != hrSuccess)
26-               goto exit;
27-
28-       hr = GetProxyStoreObject(lpMsgStore, &lpProxedMsgStore);
29-       if (hr != hrSuccess)
30-               goto exit;
31-
32-       hr = lpProxedMsgStore->QueryInterface(IID_ECMsgStoreOnline, &ptrUnknown);
33-       if (hr != hrSuccess)
34-               goto exit;
35-
36-       hr = ptrUnknown->QueryInterface(IID_ECMsgStore, &ptrOnlineStore);
37-       if (hr != hrSuccess) {
38-               m_lpLogger->Log(EC_LOGLEVEL_FATAL, "Unable to validate archived user count. Please check the archiver and licensed log for errors.");
39-               hr = MAPI_E_NO_SUPPORT;
40-               goto exit;
41-       }
42-
43-       hr = HrCheckLicense(&ptrOnlineStore->m_xMsgStore, SERVICE_TYPE_ARCHIVE, ZARAFA_ARCHIVE_DEFAULT);
44-       if (hr != hrSuccess)
45-       {
46-               m_lpLogger->Log(EC_LOGLEVEL_FATAL, "No archiver license found.");
47-               hr = MAPI_E_NO_SUPPORT;
48-       }
49-       else
50-       {
51-               unsigned int ulArchivedUsers = 0;
52-               unsigned int ulMaxUsers = 0;
53-
54-               hr = ValidateArchivedUserCount(m_lpLogger, this->GetMAPISession(), this->GetSSLPath(), this->GetSSLPass(), &ulArchivedUsers, &ulMaxUsers);
55-               if (FAILED(hr)) {
56-                       m_lpLogger->Log(EC_LOGLEVEL_FATAL, "Unable to validate archived user count. Please check the archiver and licensed log for errors.");
57-                       goto exit;
58-               }
59-
60-               if (ulMaxUsers == 0) {
61-                       m_lpLogger->Log(EC_LOGLEVEL_INFO, "Not all commercial features will be available.");
62-                       // continue!
63-               } else if (ulArchivedUsers >= ulMaxUsers) {
64-                       m_lpLogger->Log(EC_LOGLEVEL_FATAL, "You are over your archived user limit of %d users. Please remove an archived user relation or obtain an additional cal.", ulMaxUsers);
65-                       m_lpLogger->Log(EC_LOGLEVEL_FATAL, "Licensed extended archive features will be disabled until the archived user limit is decreased.");
66-                       hr = MAPI_E_NOT_FOUND; //@todo which error ?
67-                       goto exit;
68-               } else if (ulArchivedUsers + 5 >= ulMaxUsers) { //@todo which warning limit?
69-                       m_lpLogger->Log(EC_LOGLEVEL_FATAL, "You almost reached the archived user limit. Archived users %d of %d", ulArchivedUsers, ulMaxUsers);
70-               }
71-       }
72-
73-exit:
74-       return hr;
75+       return hrSuccess;
76 }
77diff -u -r zarafa-7.1.12/ECtools/zarafa-archiver/Makefile.in zarafa-7.1.12-licensepatch/ECtools/zarafa-archiver/Makefile.in
78--- zarafa-7.1.12/ECtools/zarafa-archiver/Makefile.in   2015-05-08 12:21:08.000000000 +0000
79+++ zarafa-7.1.12-licensepatch/ECtools/zarafa-archiver/Makefile.in      2015-06-04 13:30:02.000000000 +0000
80@@ -112,9 +112,7 @@
81 libarchiver_la_DEPENDENCIES =  \
82        ${top_builddir}/mapi4linux/src/libmapi.la \
83        ${top_builddir}/common/libcommon_mapi.la \
84-       ${top_builddir}/common/libcommon_util.la \
85-       ${top_builddir}/liblicense/liblicense.la \
86-       ${top_builddir}/liblicense/liblicense_mapi.la
87+       ${top_builddir}/common/libcommon_util.la
88 am_libarchiver_la_OBJECTS = ArchiverSession.lo archiver-common.lo \
89        ArchiveManageImpl.lo ArchiveStateCollector.lo \
90        ArchiveStateUpdater.lo ArchiveHelper.lo StoreHelper.lo \
91@@ -403,9 +401,7 @@
92 
93 libarchiver_la_LIBADD = ${top_builddir}/mapi4linux/src/libmapi.la \
94        ${top_builddir}/common/libcommon_mapi.la \
95-       ${top_builddir}/common/libcommon_util.la \
96-       ${top_builddir}/liblicense/liblicense.la \
97-       ${top_builddir}/liblicense/liblicense_mapi.la
98+       ${top_builddir}/common/libcommon_util.la
99 
100 libarchiver_la_SOURCES = \
101        ArchiverSession.cpp ArchiverSession.h ArchiverSessionPtr.h \
Note: See TracBrowser for help on using the repository browser.