Merge remote-tracking branch 'upstream/master'

config/sample-config2.yaml

@@ -1,6 +1,6 @@
 # With this sample config the distinction between LDAP-synchronized
 # groups/users from is done by the membership to ldap_user and
-# ldap_group. These two roles has to be defined manally before
+# ldap_group. These two roles have to be defined manally before
 # pg_ldap_sync can run.
 
 # Connection parameters to LDAP server
@@ -25,6 +25,8 @@ ldap_users:
   name_attribute: sAMAccountName
   # lowercase name for use as PG role name
   lowercase_name: true
+  # Add lowercase name *and* original name for use as PG role names (useful for migrating between case types)
+  bothcase_name: false
 
 # Search parameters for LDAP groups which should be synchronized
 ldap_groups:

config/schema.yaml

@@ -23,6 +23,9 @@ mapping:
       "uppercase_name":
         type: bool
         required:  no
+      "bothcase_name":
+        type: bool
+        required:  no
 
   "ldap_groups":
     type: map
@@ -43,6 +46,9 @@ mapping:
       "uppercase_name":
         type: bool
         required:  no
+      "bothcase_name":
+        type: bool
+        required:  no
       "member_attribute":
         type: str
         required:  yes