ZCS-13176: change in LDAP attribute Id

Zimbra · Jul 11, 2024 · 4ef5e2b · 4ef5e2b
1 parent 00a5d4d
commit 4ef5e2b
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 40 deletions.
diff --git a/common/src/java/com/zimbra/common/account/ZAttrProvisioning.java b/common/src/java/com/zimbra/common/account/ZAttrProvisioning.java
@@ -7218,7 +7218,7 @@ public static TwoFactorAuthSecretEncoding fromString(String s) throws ServiceExc
      *
      * @since ZCS 10.1.0
      */
-    @ZAttr(id=4110)
+    @ZAttr(id=4135)
     public static final String A_zimbraFeatureMailRecallSecretKey = "zimbraFeatureMailRecallSecretKey";
 
     /**
@@ -7516,9 +7516,9 @@ public static TwoFactorAuthSecretEncoding fromString(String s) throws ServiceExc
     public static final String A_zimbraFeatureSearchHistoryEnabled = "zimbraFeatureSearchHistoryEnabled";
 
     /**
-     * Feature to enable/disable the mobile sync for shared folders. Default 
-     * value is TRUE. The option to sync the shared folders to the Mobile 
-     * will be enabled for the users in the webclient. The option will only 
+     * Feature to enable/disable the mobile sync for shared folders. Default
+     * value is TRUE. The option to sync the shared folders to the Mobile
+     * will be enabled for the users in the webclient. The option will only
      * be enabled for shared folders having Admin or Manager permission
      *
      * @since ZCS 10.1.0

diff --git a/common/src/java/com/zimbra/common/service/ServiceException.java b/common/src/java/com/zimbra/common/service/ServiceException.java
@@ -302,7 +302,7 @@ public static ServiceException FAILURE(String message, Throwable cause) {
     public static ServiceException LICENSE_ERROR(String message, Throwable cause) {
         return new ServiceException("license error: "+message, LICENSE_ERROR, RECEIVERS_FAULT, cause);
     }
-    
+
     public static ServiceException ERROR_MESSAGE(String str, Throwable cause){
         return new ServiceException("error: " + str, null, SENDERS_FAULT, cause);
     }

diff --git a/store/src/java/com/zimbra/cs/account/ZAttrAccount.java b/store/src/java/com/zimbra/cs/account/ZAttrAccount.java
@@ -21018,9 +21018,9 @@ public Map<String,Object> unsetFeatureSearchHistoryEnabled(Map<String,Object> at
     }
 
     /**
-     * Feature to enable/disable the mobile sync for shared folders. Default 
-     * value is TRUE. The option to sync the shared folders to the Mobile 
-     * will be enabled for the users in the webclient. The option will only 
+     * Feature to enable/disable the mobile sync for shared folders. Default
+     * value is TRUE. The option to sync the shared folders to the Mobile
+     * will be enabled for the users in the webclient. The option will only
      * be enabled for shared folders having Admin or Manager permission
      *
      * @return zimbraFeatureSharedFolderMobileSyncEnabled, or true if unset
@@ -21033,9 +21033,9 @@ public boolean isFeatureSharedFolderMobileSyncEnabled() {
     }
 
     /**
-     * Feature to enable/disable the mobile sync for shared folders. Default 
-     * value is TRUE. The option to sync the shared folders to the Mobile 
-     * will be enabled for the users in the webclient. The option will only 
+     * Feature to enable/disable the mobile sync for shared folders. Default
+     * value is TRUE. The option to sync the shared folders to the Mobile
+     * will be enabled for the users in the webclient. The option will only
      * be enabled for shared folders having Admin or Manager permission
      *
      * @param zimbraFeatureSharedFolderMobileSyncEnabled new value
@@ -21051,9 +21051,9 @@ public void setFeatureSharedFolderMobileSyncEnabled(boolean zimbraFeatureSharedF
     }
 
     /**
-     * Feature to enable/disable the mobile sync for shared folders. Default 
-     * value is TRUE. The option to sync the shared folders to the Mobile 
-     * will be enabled for the users in the webclient. The option will only 
+     * Feature to enable/disable the mobile sync for shared folders. Default
+     * value is TRUE. The option to sync the shared folders to the Mobile
+     * will be enabled for the users in the webclient. The option will only
      * be enabled for shared folders having Admin or Manager permission
      *
      * @param zimbraFeatureSharedFolderMobileSyncEnabled new value
@@ -21070,9 +21070,9 @@ public Map<String,Object> setFeatureSharedFolderMobileSyncEnabled(boolean zimbra
     }
 
     /**
-     * Feature to enable/disable the mobile sync for shared folders. Default 
-     * value is TRUE. The option to sync the shared folders to the Mobile 
-     * will be enabled for the users in the webclient. The option will only 
+     * Feature to enable/disable the mobile sync for shared folders. Default
+     * value is TRUE. The option to sync the shared folders to the Mobile
+     * will be enabled for the users in the webclient. The option will only
      * be enabled for shared folders having Admin or Manager permission
      *
      * @throws com.zimbra.common.service.ServiceException if error during update
@@ -21087,9 +21087,9 @@ public void unsetFeatureSharedFolderMobileSyncEnabled() throws com.zimbra.common
     }
 
     /**
-     * Feature to enable/disable the mobile sync for shared folders. Default 
-     * value is TRUE. The option to sync the shared folders to the Mobile 
-     * will be enabled for the users in the webclient. The option will only 
+     * Feature to enable/disable the mobile sync for shared folders. Default
+     * value is TRUE. The option to sync the shared folders to the Mobile
+     * will be enabled for the users in the webclient. The option will only
      * be enabled for shared folders having Admin or Manager permission
      *
      * @param attrs existing map to populate, or null to create a new map

diff --git a/store/src/java/com/zimbra/cs/account/ZAttrConfig.java b/store/src/java/com/zimbra/cs/account/ZAttrConfig.java
@@ -18830,7 +18830,7 @@ public Map<String,Object> unsetFeatureMailRecallEnabled(Map<String,Object> attrs
      *
      * @since ZCS 10.1.0
      */
-    @ZAttr(id=4110)
+    @ZAttr(id=4135)
     public String getFeatureMailRecallSecretKey() {
         return getAttr(Provisioning.A_zimbraFeatureMailRecallSecretKey, null, true);
     }
@@ -18843,7 +18843,7 @@ public String getFeatureMailRecallSecretKey() {
      *
      * @since ZCS 10.1.0
      */
-    @ZAttr(id=4110)
+    @ZAttr(id=4135)
     public void setFeatureMailRecallSecretKey(String zimbraFeatureMailRecallSecretKey) throws com.zimbra.common.service.ServiceException {
         HashMap<String,Object> attrs = new HashMap<String,Object>();
         attrs.put(Provisioning.A_zimbraFeatureMailRecallSecretKey, zimbraFeatureMailRecallSecretKey);
@@ -18859,7 +18859,7 @@ public void setFeatureMailRecallSecretKey(String zimbraFeatureMailRecallSecretKe
      *
      * @since ZCS 10.1.0
      */
-    @ZAttr(id=4110)
+    @ZAttr(id=4135)
     public Map<String,Object> setFeatureMailRecallSecretKey(String zimbraFeatureMailRecallSecretKey, Map<String,Object> attrs) {
         if (attrs == null) attrs = new HashMap<String,Object>();
         attrs.put(Provisioning.A_zimbraFeatureMailRecallSecretKey, zimbraFeatureMailRecallSecretKey);
@@ -18873,7 +18873,7 @@ public Map<String,Object> setFeatureMailRecallSecretKey(String zimbraFeatureMail
      *
      * @since ZCS 10.1.0
      */
-    @ZAttr(id=4110)
+    @ZAttr(id=4135)
     public void unsetFeatureMailRecallSecretKey() throws com.zimbra.common.service.ServiceException {
         HashMap<String,Object> attrs = new HashMap<String,Object>();
         attrs.put(Provisioning.A_zimbraFeatureMailRecallSecretKey, "");
@@ -18888,7 +18888,7 @@ public void unsetFeatureMailRecallSecretKey() throws com.zimbra.common.service.S
      *
      * @since ZCS 10.1.0
      */
-    @ZAttr(id=4110)
+    @ZAttr(id=4135)
     public Map<String,Object> unsetFeatureMailRecallSecretKey(Map<String,Object> attrs) {
         if (attrs == null) attrs = new HashMap<String,Object>();
         attrs.put(Provisioning.A_zimbraFeatureMailRecallSecretKey, "");

diff --git a/store/src/java/com/zimbra/cs/account/ZAttrCos.java b/store/src/java/com/zimbra/cs/account/ZAttrCos.java
@@ -15407,9 +15407,9 @@ public Map<String,Object> unsetFeatureSearchHistoryEnabled(Map<String,Object> at
     }
 
     /**
-     * Feature to enable/disable the mobile sync for shared folders. Default 
-     * value is TRUE. The option to sync the shared folders to the Mobile 
-     * will be enabled for the users in the webclient. The option will only 
+     * Feature to enable/disable the mobile sync for shared folders. Default
+     * value is TRUE. The option to sync the shared folders to the Mobile
+     * will be enabled for the users in the webclient. The option will only
      * be enabled for shared folders having Admin or Manager permission
      *
      * @return zimbraFeatureSharedFolderMobileSyncEnabled, or true if unset
@@ -15422,9 +15422,9 @@ public boolean isFeatureSharedFolderMobileSyncEnabled() {
     }
 
     /**
-     * Feature to enable/disable the mobile sync for shared folders. Default 
-     * value is TRUE. The option to sync the shared folders to the Mobile 
-     * will be enabled for the users in the webclient. The option will only 
+     * Feature to enable/disable the mobile sync for shared folders. Default
+     * value is TRUE. The option to sync the shared folders to the Mobile
+     * will be enabled for the users in the webclient. The option will only
      * be enabled for shared folders having Admin or Manager permission
      *
      * @param zimbraFeatureSharedFolderMobileSyncEnabled new value
@@ -15440,9 +15440,9 @@ public void setFeatureSharedFolderMobileSyncEnabled(boolean zimbraFeatureSharedF
     }
 
     /**
-     * Feature to enable/disable the mobile sync for shared folders. Default 
-     * value is TRUE. The option to sync the shared folders to the Mobile 
-     * will be enabled for the users in the webclient. The option will only 
+     * Feature to enable/disable the mobile sync for shared folders. Default
+     * value is TRUE. The option to sync the shared folders to the Mobile
+     * will be enabled for the users in the webclient. The option will only
      * be enabled for shared folders having Admin or Manager permission
      *
      * @param zimbraFeatureSharedFolderMobileSyncEnabled new value
@@ -15459,9 +15459,9 @@ public Map<String,Object> setFeatureSharedFolderMobileSyncEnabled(boolean zimbra
     }
 
     /**
-     * Feature to enable/disable the mobile sync for shared folders. Default 
-     * value is TRUE. The option to sync the shared folders to the Mobile 
-     * will be enabled for the users in the webclient. The option will only 
+     * Feature to enable/disable the mobile sync for shared folders. Default
+     * value is TRUE. The option to sync the shared folders to the Mobile
+     * will be enabled for the users in the webclient. The option will only
      * be enabled for shared folders having Admin or Manager permission
      *
      * @throws com.zimbra.common.service.ServiceException if error during update
@@ -15476,9 +15476,9 @@ public void unsetFeatureSharedFolderMobileSyncEnabled() throws com.zimbra.common
     }
 
     /**
-     * Feature to enable/disable the mobile sync for shared folders. Default 
-     * value is TRUE. The option to sync the shared folders to the Mobile 
-     * will be enabled for the users in the webclient. The option will only 
+     * Feature to enable/disable the mobile sync for shared folders. Default
+     * value is TRUE. The option to sync the shared folders to the Mobile
+     * will be enabled for the users in the webclient. The option will only
      * be enabled for shared folders having Admin or Manager permission
      *
      * @param attrs existing map to populate, or null to create a new map