diff --git a/lam/HISTORY b/lam/HISTORY
index 56f49d05..a1631fcf 100644
--- a/lam/HISTORY
+++ b/lam/HISTORY
@@ -2,8 +2,9 @@ March 2020 7.1
- PHP 7 required
- Webauthn/FIDO2 support for 2-factor-authentication (requires PHP 7.2)
- Personal: support display name (hidden by default in server profile)
- - PPolicy: support for password check module
-
+ - LAM Pro:
+ -> PPolicy: support for password check module
+ -> Windows AD LDS support (users and groups)
21.12.2019 7.0
- Lamdaemon can be configured with directory prefix for homedirs
diff --git a/lam/docs/manual-sources/chapter-modules.xml b/lam/docs/manual-sources/chapter-modules.xml
index 502f034f..4962d7ea 100644
--- a/lam/docs/manual-sources/chapter-modules.xml
+++ b/lam/docs/manual-sources/chapter-modules.xml
@@ -1349,6 +1349,146 @@
+
+ AD LDS (formerly ADAM) (LAM Pro)
+
+ Please activate the account type "Users" in your LAM server
+ profile and then add the user module "AD LDS
+ (windowsLDSUser)(*)".
+
+
+
+
+
+
+
+
+
+ The default list attributes are for Unix and not suitable for AD
+ LDS (blank lines in account table). Please use
+ "#cn;#givenName;#sn;#mail" or select your own attributes to display in
+ the account list.
+
+
+
+
+
+
+
+
+
+ On tab "Module settings" you can specify the possible Windows
+ domain names.
+
+ You can also set maximum values for user photos in advanced
+ options.
+
+
+
+
+
+
+
+
+
+ Now you can manage your AD LDS users and e.g. assign groups. You
+ might want to set the default domain name in the profile editor.
+
+ Attention:
+
+ Password changes require a secure connection via ldaps://. Check
+ your LAM server profile if password changes are refused by the
+ server.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Wildcards
+
+ This module provides the following wildcards (others may be
+ provided by other modules):
+
+
+
+ $firstname: First name
+
+
+
+ $lastname: Last name
+
+
+
+ $user: User name
+
+
+
+ $commonname: Common name
+
+
+
+ $email: Email address
+
+
+
+ You can use them in the following input fields on user edit
+ screen:
+
+
+
+ Common name
+
+
+
+ Display name
+
+
+
+ Email
+
+
+
+ Email alias
+
+
+
+ Use this when some of your data always follows the same schema.
+ E.g. using "$firstname $lastname" in common name field can be used like
+ this to get "Demo User". You can set the wildcards in profile editor so
+ they are automatically applied for new users.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Filesystem quota (lamdaemon)
@@ -2580,6 +2720,52 @@ AuthorizedKeysCommandUser root
+
+ AD LDS (formerly ADAM) (LAM Pro)
+
+ LAM can manage your AD LDS groups. Please enable the account type
+ "Groups" in your LAM server profile and then add the group module "AD
+ LDS (windowsLDSGroup)(*)".
+
+
+
+
+
+
+
+
+
+ The default list attributes are for Unix and not suitable for AD
+ LDS (blank lines in account table). Please use
+ "#cn;#member;#description" or select your own attributes to display in
+ the account list.
+
+
+
+
+
+
+
+
+
+
+
+ Now you can edit your groups inside LAM. You can manage the group
+ name, description and its type. Of course, you can also set the group
+ members.
+
+ With "Show effective members" you can show a list of all members
+ of this group including members of subgroups and their subgroups.
+
+
+
+
+
+
+
+
+
+
Kolab
diff --git a/lam/docs/manual-sources/chapter-selfService.xml b/lam/docs/manual-sources/chapter-selfService.xml
index a3b72a40..f9ef6011 100644
--- a/lam/docs/manual-sources/chapter-selfService.xml
+++ b/lam/docs/manual-sources/chapter-selfService.xml
@@ -910,7 +910,7 @@
- Windows
+ Windows (AD, AD LDS, Samba 4)
Password
diff --git a/lam/docs/manual-sources/images/mod_adLds1.png b/lam/docs/manual-sources/images/mod_adLds1.png
new file mode 100644
index 00000000..28cce98b
Binary files /dev/null and b/lam/docs/manual-sources/images/mod_adLds1.png differ
diff --git a/lam/docs/manual-sources/images/mod_adLds2.png b/lam/docs/manual-sources/images/mod_adLds2.png
new file mode 100644
index 00000000..3f2428d1
Binary files /dev/null and b/lam/docs/manual-sources/images/mod_adLds2.png differ
diff --git a/lam/docs/manual-sources/images/mod_adLds3.png b/lam/docs/manual-sources/images/mod_adLds3.png
new file mode 100644
index 00000000..ba6225cd
Binary files /dev/null and b/lam/docs/manual-sources/images/mod_adLds3.png differ
diff --git a/lam/docs/manual-sources/images/mod_adLds4a.png b/lam/docs/manual-sources/images/mod_adLds4a.png
new file mode 100644
index 00000000..c022d040
Binary files /dev/null and b/lam/docs/manual-sources/images/mod_adLds4a.png differ
diff --git a/lam/docs/manual-sources/images/mod_adLds4b.png b/lam/docs/manual-sources/images/mod_adLds4b.png
new file mode 100644
index 00000000..423b6d01
Binary files /dev/null and b/lam/docs/manual-sources/images/mod_adLds4b.png differ
diff --git a/lam/docs/manual-sources/images/mod_adLds5a.png b/lam/docs/manual-sources/images/mod_adLds5a.png
new file mode 100644
index 00000000..0d4e287a
Binary files /dev/null and b/lam/docs/manual-sources/images/mod_adLds5a.png differ
diff --git a/lam/docs/manual-sources/images/mod_adLds5b.png b/lam/docs/manual-sources/images/mod_adLds5b.png
new file mode 100644
index 00000000..2d22bdc9
Binary files /dev/null and b/lam/docs/manual-sources/images/mod_adLds5b.png differ
diff --git a/lam/docs/manual-sources/images/mod_adLds6.png b/lam/docs/manual-sources/images/mod_adLds6.png
new file mode 100644
index 00000000..98537d69
Binary files /dev/null and b/lam/docs/manual-sources/images/mod_adLds6.png differ
diff --git a/lam/lib/modules/.gitignore b/lam/lib/modules/.gitignore
index 4e8cabc6..3f271f04 100644
--- a/lam/lib/modules/.gitignore
+++ b/lam/lib/modules/.gitignore
@@ -45,3 +45,5 @@
/nPosixUser.inc
/bindDLZXfr.inc
/webauthn.inc
+/windowsLDSGroup.inc
+/windowsLDSUser.inc