From 73edd45a967ddb867fcf37d7c17de115ba9bff7e Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 12 Jan 2022 16:01:07 -0500
Subject: [PATCH] fix(eas): handle module constraints

Fixes #5456
---
 ActiveSync/SOGoActiveSyncDispatcher.m | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m
index e36cbce21..8ddb9aada 100644
--- a/ActiveSync/SOGoActiveSyncDispatcher.m
+++ b/ActiveSync/SOGoActiveSyncDispatcher.m
@@ -834,17 +834,18 @@ void handle_eas_terminate(int signum)
   int status, command_count, i, type, fi, count;
   BOOL first_sync;
 
-  metadata = [self globalMetadataForDevice];
-  syncKey = [[(id)[theDocumentElement getElementsByTagName: @"SyncKey"] lastObject] textValue];
-  s = [NSMutableString string];
-  personalFolderName = [[[context activeUser] personalCalendarFolderInContext: context] nameInContainer];
-
   first_sync = NO;
   status = 1;
   command_count = 0;
+  personalFolderName = nil;
   commands = [NSMutableString string];
-
   processedFolders = [NSMutableArray array];
+  s = [NSMutableString string];
+
+  metadata = [self globalMetadataForDevice];
+  syncKey = [[(id)[theDocumentElement getElementsByTagName: @"SyncKey"] lastObject] textValue];
+  if ([[context activeUser] canAccessModule: @"Calendar"])
+    personalFolderName = [[[context activeUser] personalCalendarFolderInContext: context] nameInContainer];
 
   [s appendString: @"<?xml version=\"1.0\" encoding=\"utf-8\"?>"];
   [s appendString: @"<!DOCTYPE ActiveSync PUBLIC \"-//MICROSOFT//DTD ActiveSync//EN\" \"http://www.microsoft.com/\">"];