.github/FUNDING.yml

@@ -1,3 +0,0 @@
-
-github: [LDAPAccountManager]
-

.github/codeql/codeql-config.yml

@@ -1,11 +0,0 @@
-name: "LAM CodeQL config"
-
-queries:
-  - uses: security-and-quality
-
-paths-ignore:
-  - '**/3rdParty/**/*.*'
-  - '**/lib/extra/**/*.*'
-  - '**/lib/*jquery*.js'
-paths:
-  - lam

.github/workflows/codeql-analysis.yml

@@ -1,56 +0,0 @@
-name: "CodeQL"
-
-on:
-  push:
-    branches: [develop]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [develop]
-  schedule:
-    - cron: '0 10 * * 0'
-
-jobs:
-  analyse:
-    name: Analyse
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
-
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      # Override language selection by uncommenting this and choosing your languages
-      # with:
-      #   languages: go, javascript, csharp, python, cpp, java
-      with:
-        config-file: ./.github/codeql/codeql-config.yml
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1

.gitignore

@@ -1,9 +1,3 @@
 /.settings/
 /.buildpath
 /.project
-/.Readme.md.html
-/vendor/
-/composer.lock
-/code-coverage/
-/.phpunit.result.cache
-/lam/lib/3rdParty/composer/bin/

.travis.yml

@@ -1,18 +0,0 @@
-language: php
-addons:
-  sonarcloud:
-    organization: "ldap-account-manager"
-php:
-  - '7.3'
-
-cache:
-  directories:
-    - '$HOME/.sonar/cache'
-
-script:
-  - phpunit
-  - ls -l code-coverage/*
-  - sonar-scanner
-  - pip install --user codespell
-  - cd lam
-  - ./codespell.sh

Readme.md

@@ -3,16 +3,9 @@ LDAP Account Manager
 
 LDAP Account Manager (LAM) is a webfrontend for managing entries (e.g. users, groups, DHCP settings) stored in an LDAP directory. LAM was designed to make LDAP management as easy as possible for the user. It abstracts from the technical details of LDAP and allows persons without technical background to manage LDAP entries. If needed, power users may still directly edit LDAP entries via the integrated LDAP browser.
 
-![LAM](https://www.ldap-account-manager.org/lamcms/sites/default/files/styles/slideshow/public/userList.png)
-
-![LAM](https://www.ldap-account-manager.org/lamcms/sites/default/files/styles/slideshow/public/user_0.png)
-
 # Download
 You can get the newest version at https://www.ldap-account-manager.org/.
 
-# Documentation
-Please see the [documentation area](https://www.ldap-account-manager.org/lamcms/documentation).
-
 # Source code
 
 There are two modules. Usually, you only need the files inside "lam".
@@ -25,4 +18,4 @@ There are two modules. Usually, you only need the files inside "lam".
 LAM is published under the GNU General Public License.
 The complete list of licenses can be found in the copyright file.
 
-Copyright (C) 2003 - 2020 Roland Gruber <post@rolandgruber.de>
+Copyright (C) 2003 - 2017 Roland Gruber <post@rolandgruber.de>

SECURITY.md

@@ -1,9 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-Security updates are always created based on the latest release.
-
-## Reporting a Vulnerability
-
-Please report all security issues to post@rolandgruber.de. Reports will be answered within 48h.

composer.json

@@ -1,10 +1,6 @@
 {
   "require-dev" : {
-    "phpunit/phpunit" : "8.5.2",
-    "squizlabs/php_codesniffer" : "3.4.0"
-  },
-  "require": {
-    "ext-ldap": "*",
-    "ext-json": "*"
+    "phpunit/phpunit" : "4.5.0",
+    "squizlabs/php_codesniffer" : "2.7.1"
   }
 }

copyright

@@ -1 +0,0 @@
-Please see lam/copyright.

lam-packaging/RPM/lam.apache.conf

@@ -4,7 +4,13 @@ Alias /lam /usr/share/ldap-account-manager
 <Directory /usr/share/ldap-account-manager>
   Options +FollowSymLinks
   AllowOverride All
+  <IfModule !mod_authz_core.c>
+    Order allow,deny
+    Allow from all
+  </IfModule>
+  <IfModule mod_authz_core.c>
     Require all granted
+  </IfModule>
   DirectoryIndex index.html
 </Directory>
 
@@ -14,31 +20,67 @@ Alias /lam /usr/share/ldap-account-manager
 
 <Directory /var/lib/ldap-account-manager/tmp/internal>
   Options -Indexes
+  <IfModule !mod_authz_core.c>
+    Order allow,deny
+    Deny from all
+  </IfModule>
+  <IfModule mod_authz_core.c>
     Require all denied
+  </IfModule>
 </Directory>
 
 <Directory /var/lib/ldap-account-manager/sess>
   Options -Indexes
+  <IfModule !mod_authz_core.c>
+    Order allow,deny
+    Deny from all
+  </IfModule>
+  <IfModule mod_authz_core.c>
     Require all denied
+  </IfModule>
 </Directory>
 
 <Directory /var/lib/ldap-account-manager/config>
   Options -Indexes
+  <IfModule !mod_authz_core.c>
+    Order allow,deny
+    Deny from all
+  </IfModule>
+  <IfModule mod_authz_core.c>
     Require all denied
+  </IfModule>
 </Directory>
 
 <Directory /usr/share/ldap-account-manager/lib>
   Options -Indexes
+  <IfModule !mod_authz_core.c>
+    Order allow,deny
+    Deny from all
+  </IfModule>
+  <IfModule mod_authz_core.c>
     Require all denied
+  </IfModule>
 </Directory>
 
 <Directory /usr/share/ldap-account-manager/help>
   Options -Indexes
+  <IfModule !mod_authz_core.c>
+    Order allow,deny
+    Deny from all
+  </IfModule>
+  <IfModule mod_authz_core.c>
     Require all denied
+  </IfModule>
 </Directory>
 
 <Directory /usr/share/ldap-account-manager/locale>
   Options -Indexes
+  <IfModule !mod_authz_core.c>
+    Order allow,deny
+    Deny from all
+  </IfModule>
+  <IfModule mod_authz_core.c>
     Require all denied
+  </IfModule>
 </Directory>
 

lam-packaging/RPM/lam.nginx.conf

@@ -5,10 +5,9 @@ location /lam {
 
 	location ~ \.php$ {
 		fastcgi_split_path_info ^(.+\.php)(/.+)$;
-		fastcgi_pass unix:/var/run/php7-fpm.sock;
+		fastcgi_pass unix:/var/run/php5-fpm.sock;
 		fastcgi_index index.php;
 		include fastcgi_params;
-		fastcgi_param SCRIPT_FILENAME $request_filename;
 	}
 
 	location ~ /lam/(tmp/internal|sess|config|lib|help|locale) {

lam-packaging/RPM/ldap-account-manager.spec

@@ -22,6 +22,17 @@ Vendor:		Roland Gruber
 Packager:	Roland Gruber <post@rolandgruber.de>
 BuildArch:	noarch
 AutoReqProv:  no
+%if %is_suse
+Requires:      php5
+Requires:      php5-ldap
+Requires:      php5-hash
+Requires:      php5-gd
+Requires:      php5-gettext
+Requires:      perl
+%endif
+%if %is_fedora
+Requires:      perl
+%endif
 
 Source1:      lam.nginx.conf
 Source2:      lam.apache.conf
@@ -59,7 +70,6 @@ Requires:      sudo
 %endif
 %if %is_fedora
 Requires:      perl
-Requires:      perl-Sys-Syslog
 Requires:      sudo
 %endif
 
@@ -98,9 +108,9 @@ ln -s /var/lib/%{lam_dir}/tmp $RPM_BUILD_ROOT/usr/share/%{lam_dir}/tmp
 mv $RPM_BUILD_ROOT/usr/share/%{lam_dir}/sess $RPM_BUILD_ROOT/var/lib/%{lam_dir}
 ln -s /var/lib/%{lam_dir}/sess $RPM_BUILD_ROOT/usr/share/%{lam_dir}/sess
 mkdir -p $RPM_BUILD_ROOT%{httpd_confdir}
-cp $RPM_SOURCE_DIR/lam.apache.conf $RPM_BUILD_ROOT%{httpd_confdir}/
+cp $RPM_BUILD_DIR/lam.apache.conf $RPM_BUILD_ROOT%{httpd_confdir}/
 mkdir -p $RPM_BUILD_ROOT/etc/%{lam_dir}
-cp $RPM_SOURCE_DIR/lam.nginx.conf $RPM_BUILD_ROOT/etc/%{lam_dir}/
+cp $RPM_BUILD_DIR/lam.nginx.conf $RPM_BUILD_ROOT/etc/%{lam_dir}/
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT

lam-packaging/autoconf/Makefile.in

@@ -39,7 +39,7 @@ DOCS = COPYING HISTORY README copyright docs/schema/dhcp.schema
 
 HTML_DOCS = devel manual
 
-LIST1 = graphics help index.html lib locale style templates VERSION pwa_worker.js
+LIST1 = graphics help index.html lib locale style templates VERSION
 LIST2 = sess tmp tmp/internal
 LIST3 = config
 
@@ -72,7 +72,7 @@ install-lam:
 	LIST4="`(cd $(srcdir)/$(LIST3) ; ls -d *)`" ; \
 	(cd $(srcdir)/$(LIST3) ; $(TAR) cf - .) | \
 		(cd $(DESTDIR)$(sysconfdir) ; $(TAR) xf -) ; \
-	[ -e ${LIST3} ] || $(LN_S) $(sysconfdir) ${LIST3} ; \
+	$(LN_S) $(sysconfdir) ${LIST3} ; \
 	(cd $(srcdir) ; $(TAR) cf - $(LIST1)) | $(TAR) xf - ; \
 	[ -d $(DESTDIR)$(prefix)/docs ]  ||  \
 		$(MKDIR) -p $(DESTDIR)$(prefix)/docs  ||  exit 1 ; \

lam-packaging/buildPackages

@@ -4,7 +4,7 @@
 
 if [ $# -lt 1 ]
 then
-echo -e "Usage: buildPackage <tag>, buildPackage develop, buildPackage -b branch"
+echo -e "Usage: buildPackage <tag>"
 exit
 fi
 
@@ -15,53 +15,51 @@ cd /daten/projekte/lam/pakete
 if [ "$1" = "develop" ]
 then
 	export REPO_BRANCH="develop"
-elif [ "$1" = "-b" ]
-then
-	export REPO_BRANCH="$2"
 else
-	export REPO_BRANCH="$1"
+	export REPO_BRANCH="tags/$1"
 fi
 
 # minifies the JavaScript files
 function minify {
 	local dir="$1"
 	echo "Minify JS files in $dir"
-	local outFile=$dir/100_lam.${VERSION}.min.js
 	local files=`ls $dir/*.js`
-	local jsFiles=""
 	for file in $files; do
-		jsFiles="$jsFiles $file"
-	done
-	uglifyjs -o $outFile $jsFiles
-	rm $files
+		closure-compiler --charset UTF-8 --js $file --js_output_file ${file}-MIN
+		rm $file
+		mv ${file}-MIN $file
 		# add final new line to supress Debian warnings
-	echo "" >> $outFile
+		echo "" >> $file
+	done
 }
 
 # minifies the CSS files
 function minifyCSS {
 	local dir="$1"
 	echo "Minify CSS files in $dir"
-	local outFile=$dir/100_lam.${VERSION}.min.css
 	local files=`ls $dir/*.css`
-	cat $files | cleancss --skip-rebase -o $outFile
-	rm $files
+	for file in $files; do
+		cleancss -o ${file}-MIN $file
+		rm $file
+		mv ${file}-MIN $file
 		# add final new line to supress Debian warnings
-	echo "" >> $outFile
+		echo "" >> $file
+	done
 }
 
 echo "Getting files..."
-git clone --depth 1 -b $REPO_BRANCH --single-branch git@github.com:LDAPAccountManager/lam.git github
+git clone git@github.com:LDAPAccountManager/lam.git github
 cd github
+git checkout $REPO_BRANCH
 mv lam ../
 mv lam-packaging ../
 cd ..
 rm -rf github
 
-git clone --depth 1 -b $REPO_BRANCH --single-branch git@gitlab.com:LDAPAccountManager/lamPro.git lamPro
+git clone git@gitlab.com:LDAPAccountManager/lamPro.git lamPro
 cd lamPro
+git checkout $REPO_BRANCH
 rm -rf .git
-rm -rf docker
 cd ..
 
 cp lam-packaging/getVersion ./
@@ -70,8 +68,7 @@ export VERSION=`./getVersion`
 # remove files which are not in the final release
 rm -r lam/po
 rm -r lam/tests
-rm -f lam/lib/3rdParty/tcpdf/fonts/*.ttf
-rm -r lam/templates/lib/extra/ckeditor/plugins/*/dev
+rm lam/lib/font/*.ttf
 find . -name .svnignore -exec rm {} \;
 find . -name .gitignore -exec rm {} \;
 mv lam ldap-account-manager-$VERSION
@@ -137,14 +134,8 @@ cd ..
 
 # Debian
 cp -r lam-packaging/debian Debian/ldap-account-manager-$VERSION/
-cp -ar Debian Debian-Upload
 cd Debian/ldap-account-manager-$VERSION
-debuild -k478730308FBD512ADF09D38E7F3D136B2BCD7990
-cd ..
-rm -r ldap-account-manager-$VERSION
-cd ..
-cd Debian-Upload/ldap-account-manager-$VERSION
-debuild -S -k478730308FBD512ADF09D38E7F3D136B2BCD7990
+debuild
 cd ..
 rm -r ldap-account-manager-$VERSION
 cd ..
@@ -153,7 +144,7 @@ cd ..
 cd LAMPro
 cp -r ../lam-packaging/debian Debian/ldap-account-manager-$VERSION/
 cd Debian/ldap-account-manager-$VERSION
-debuild -k478730308FBD512ADF09D38E7F3D136B2BCD7990
+debuild
 cd ..
 rm -r ldap-account-manager-$VERSION
 cd ..
@@ -182,7 +173,7 @@ mkdir LAMPro/RPM
 cp ldap-account-manager-$VERSION.tar.bz2 ~/rpmbuild/SOURCES
 cp lam-packaging/RPM/lam.apache.conf ~/rpmbuild/SOURCES
 cp lam-packaging/RPM/lam.nginx.conf ~/rpmbuild/SOURCES
-rpmbuild --clean --rmsource -bb lam-packaging/RPM/ldap-account-manager-fedora.spec
+rpmbuild --sign --clean --rmsource -bb lam-packaging/RPM/ldap-account-manager-fedora.spec
 mv ~/rpmbuild/RPMS/noarch/ldap-account-manager*-$VERSION-*1.noarch.rpm RPM/
 
 # Fedora RPM for LAM Pro
@@ -190,7 +181,7 @@ cd LAMPro
 cp ldap-account-manager-$VERSION.tar.bz2 ~/rpmbuild/SOURCES/ldap-account-manager-$VERSION.tar.bz2
 cp ../lam-packaging/RPM/lam.apache.conf ~/rpmbuild/SOURCES
 cp ../lam-packaging/RPM/lam.nginx.conf ~/rpmbuild/SOURCES
-rpmbuild --clean --rmsource -bb ../lam-packaging/RPM/ldap-account-manager-fedora.spec
+rpmbuild --sign --clean --rmsource -bb ../lam-packaging/RPM/ldap-account-manager-fedora.spec
 mv ~/rpmbuild/RPMS/noarch/ldap-account-manager*-$VERSION-*1.noarch.rpm RPM/
 cd ..
 
@@ -198,7 +189,7 @@ cd ..
 cp ldap-account-manager-$VERSION.tar.bz2 ~/rpmbuild/SOURCES
 cp lam-packaging/RPM/lam.apache.conf ~/rpmbuild/SOURCES
 cp lam-packaging/RPM/lam.nginx.conf ~/rpmbuild/SOURCES
-rpmbuild --clean --rmsource -bb lam-packaging/RPM/ldap-account-manager-suse.spec
+rpmbuild --sign --clean --rmsource -bb lam-packaging/RPM/ldap-account-manager-suse.spec
 mv ~/rpmbuild/RPMS/noarch/ldap-account-manager*-$VERSION-*1.noarch.rpm RPM/
 
 # Suse RPM for LAM Pro
@@ -206,12 +197,10 @@ cd LAMPro
 cp ldap-account-manager-$VERSION.tar.bz2 ~/rpmbuild/SOURCES/ldap-account-manager-$VERSION.tar.bz2
 cp ../lam-packaging/RPM/lam.apache.conf ~/rpmbuild/SOURCES
 cp ../lam-packaging/RPM/lam.nginx.conf ~/rpmbuild/SOURCES
-rpmbuild --clean --rmsource -bb ../lam-packaging/RPM/ldap-account-manager-suse.spec
+rpmbuild --sign --clean --rmsource -bb ../lam-packaging/RPM/ldap-account-manager-suse.spec
 mv ~/rpmbuild/RPMS/noarch/ldap-account-manager*-$VERSION-*1.noarch.rpm RPM/
 cd ..
 
-rpmsign --addsign RPM/*.rpm LAMPro/RPM/*.rpm
-
 # generate checksum files
 sha256sum *.tar.bz2 >> checksums.txt
 cd RPM

lam-packaging/debian/changelog

@@ -1,99 +1,3 @@
-ldap-account-manager (7.3.RC1-1) unstable; urgency=medium
-
-  * new upstream release
-
- -- Roland Gruber <post@rolandgruber.de>  Mon, 10 Aug 2020 19:25:33 +0200
-
-ldap-account-manager (7.2-1) unstable; urgency=medium
-
-  * new upstream release
-
- -- Roland Gruber <post@rolandgruber.de>  Fri, 01 May 2020 08:04:56 +0200
-
-ldap-account-manager (7.1-1) unstable; urgency=medium
-
-  * new upstream release
-
- -- Roland Gruber <post@rolandgruber.de>  Mon, 16 Mar 2020 21:24:23 +0100
-
-ldap-account-manager (7.0-1) unstable; urgency=medium
-
-  * new upstream release
-
- -- Roland Gruber <post@rolandgruber.de>  Sat, 21 Dec 2019 19:53:45 +0100
-
-ldap-account-manager (6.9-1) unstable; urgency=medium
-
-  * new upstream release
-
- -- Roland Gruber <post@rolandgruber.de>  Sun, 29 Sep 2019 09:12:37 +0200
-
-ldap-account-manager (6.8-1) unstable; urgency=medium
-
-  * new upstream release
-
- -- Roland Gruber <post@rolandgruber.de>  Tue, 02 Jul 2019 12:26:45 +0200
-
-ldap-account-manager (6.7-1) unstable; urgency=medium
-
-  * new upstream release
-  * Fix "Depends on tcpdf which is considered unfit for buster" removed
-    dependency and embedded required parts (Closes: #923736)
-
- -- Roland Gruber <post@rolandgruber.de>  Mon, 25 Mar 2019 17:21:36 +0100
-
-ldap-account-manager (6.6-1) unstable; urgency=medium
-
-  * new upstream release
-
- -- Roland Gruber <post@rolandgruber.de>  Fri, 28 Dec 2018 11:08:14 +0100
-
-ldap-account-manager (6.5-1) unstable; urgency=medium
-
-  * new upstream release
-  * Fix "Embedded code copies" by adding dependency to phpseclib
-    (phpLDAPadmin code is customized and cannot be reused)
-    (Closes: #781419)
-
- -- Roland Gruber <post@rolandgruber.de>  Tue, 25 Sep 2018 17:37:41 +0200
-
-ldap-account-manager (6.4-1) unstable; urgency=medium
-
-  * new upstream release
-
- -- Roland Gruber <post@rolandgruber.de>  Wed, 20 Jun 2018 09:21:48 +0200
-
-ldap-account-manager (6.3-1) unstable; urgency=medium
-
-  * new upstream release
-
- -- Roland Gruber <post@rolandgruber.de>  Mon, 19 Mar 2018 16:25:31 +0200
-
-ldap-account-manager (6.2.1-1) unstable; urgency=medium
-
-  * new upstream release
-
- -- Roland Gruber <post@rolandgruber.de>  Sun, 04 Feb 2018 17:43:51 +0100
-
-ldap-account-manager (6.2-1) unstable; urgency=medium
-
-  * new upstream release
-  * LP: #1673595 PHP 7 support
-
- -- Roland Gruber <post@rolandgruber.de>  Wed, 13 Dec 2017 08:02:05 +0200
-
-ldap-account-manager (6.1-1) unstable; urgency=medium
-
-  * new upstream release
-
- -- Roland Gruber <post@rolandgruber.de>  Tue, 19 Sep 2017 18:24:35 +0200
-
-ldap-account-manager (6.0.1-1) unstable; urgency=medium
-
-  * new upstream release
-
- -- Roland Gruber <post@rolandgruber.de>  Wed, 19 Jul 2017 20:50:22 +0200
-
 ldap-account-manager (6.0-1) unstable; urgency=medium
 
   * new upstream release

lam-packaging/debian/control

@@ -1,27 +1,24 @@
 Source: ldap-account-manager
 Maintainer: Roland Gruber <post@rolandgruber.de>
 Section: web
-Priority: optional
-Standards-Version: 4.5.0
-Build-Depends: debhelper (>= 9), po-debconf, cleancss, node-uglify
+Priority: extra
+Standards-Version: 3.9.8
+Build-Depends: debhelper (>= 9), po-debconf, cleancss, closure-compiler
 Homepage: https://www.ldap-account-manager.org/
 
 Package: ldap-account-manager
 Architecture: all
-Depends: php (>= 7), php-ldap,
- php-gd | php-imagick,
- php-json, php-curl,
- php-zip, php-xml, php-gmp,
- libapache2-mod-php | libapache2-mod-fcgid | php-fpm,
- php-phpseclib (>= 2.0), php-monolog,
- apache2 (>= 2.4.0) | httpd, fonts-dejavu, debconf (>= 0.2.26) | debconf-2.0, ${misc:Depends}
-Recommends: php-opcache
-Suggests: ldap-server, php-mcrypt, ldap-account-manager-lamdaemon, perl
-Conflicts: libapache2-mod-php5, php5, php5-fpm
+Depends: php5 (>= 5.4.26) | php (>= 21), php5-ldap | php-ldap, php5-gd | php-gd,
+ php5-json | php-json, php5-imagick | php-imagick, php5-curl | php-curl,
+ php5 | php-zip, php5 | php-xml,
+ libapache2-mod-php5 | libapache2-mod-php | php5-fpm | php-fpm,
+ apache2 | httpd, fonts-dejavu, debconf (>= 0.2.26) | debconf-2.0, ${misc:Depends}
+Recommends: php-apc | php-opcache
+Suggests: ldap-server, php5-mcrypt | php-mcrypt, ldap-account-manager-lamdaemon, perl
 Description: webfrontend for managing accounts in an LDAP directory
  LDAP Account Manager (LAM) runs on an existing webserver.
  It manages user, group and host accounts. Currently LAM
- supports these account types: Samba 3/4, Unix, Kolab,
+ supports these account types: Samba 3/4, Unix, Kolab 2/3,
  address book entries, NIS mail aliases and MAC addresses.
  There is an integrated LDAP browser to allow access to the
  raw LDAP attributes. You can use templates

lam-packaging/debian/lam.apache.conf

@@ -4,7 +4,13 @@ Alias /lam /usr/share/ldap-account-manager
 <Directory /usr/share/ldap-account-manager>
   Options +FollowSymLinks
   AllowOverride All
+  <IfModule !mod_authz_core.c>
+    Order allow,deny
+    Allow from all
+  </IfModule>
+  <IfModule mod_authz_core.c>
     Require all granted
+  </IfModule>
   DirectoryIndex index.html
 </Directory>
 
@@ -14,31 +20,67 @@ Alias /lam /usr/share/ldap-account-manager
 
 <Directory /var/lib/ldap-account-manager/tmp/internal>
   Options -Indexes
+  <IfModule !mod_authz_core.c>
+    Order allow,deny
+    Deny from all
+  </IfModule>
+  <IfModule mod_authz_core.c>
     Require all denied
+  </IfModule>
 </Directory>
 
 <Directory /var/lib/ldap-account-manager/sess>
   Options -Indexes
+  <IfModule !mod_authz_core.c>
+    Order allow,deny
+    Deny from all
+  </IfModule>
+  <IfModule mod_authz_core.c>
     Require all denied
+  </IfModule>
 </Directory>
 
 <Directory /var/lib/ldap-account-manager/config>
   Options -Indexes
+  <IfModule !mod_authz_core.c>
+    Order allow,deny
+    Deny from all
+  </IfModule>
+  <IfModule mod_authz_core.c>
     Require all denied
+  </IfModule>
 </Directory>
 
 <Directory /usr/share/ldap-account-manager/lib>
   Options -Indexes
+  <IfModule !mod_authz_core.c>
+    Order allow,deny
+    Deny from all
+  </IfModule>
+  <IfModule mod_authz_core.c>
     Require all denied
+  </IfModule>
 </Directory>
 
 <Directory /usr/share/ldap-account-manager/help>
   Options -Indexes
+  <IfModule !mod_authz_core.c>
+    Order allow,deny
+    Deny from all
+  </IfModule>
+  <IfModule mod_authz_core.c>
     Require all denied
+  </IfModule>
 </Directory>
 
 <Directory /usr/share/ldap-account-manager/locale>
   Options -Indexes
+  <IfModule !mod_authz_core.c>
+    Order allow,deny
+    Deny from all
+  </IfModule>
+  <IfModule mod_authz_core.c>
     Require all denied
+  </IfModule>
 </Directory>
 

lam-packaging/debian/lam.nginx.conf

@@ -4,9 +4,10 @@ location /lam {
 	autoindex off;
 
 	location ~ \.php$ {
-		include snippets/fastcgi-php.conf;
-		fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;
-		fastcgi_param SCRIPT_FILENAME $request_filename;
+		fastcgi_split_path_info ^(.+\.php)(/.+)$;
+		fastcgi_pass unix:/var/run/php5-fpm.sock;
+		fastcgi_index index.php;
+		include fastcgi_params;
 	}
 
 	location ~ /lam/(tmp/internal|sess|config|lib|help|locale) {

lam-packaging/debian/minify

@@ -1,24 +1,22 @@
 #!/bin/bash
 
 set -e
-outFile=templates/lib/100_lam.${SOURCE_DATE_EPOCH}.min.js
-if [ ! -e $outFile ]; then
-	files=`ls templates/lib/*.js`
-	jsFiles=""
-	for file in $files; do
-		jsFiles="$jsFiles $file"
-	done
-	uglifyjs -o $outFile $jsFiles
-	rm $files
+
+files=`ls templates/lib/*.js`
+for file in $files; do
+	closure-compiler --charset UTF-8 --js $file --js_output_file ${file}-MIN
+	rm $file
+	mv ${file}-MIN $file
 	# add final new line to supress Debian warnings
-	echo "" >> $outFile
-fi
+	echo "" >> $file
+done
 
 files=`ls style/*.css`
-outFile=style/100_lam.${SOURCE_DATE_EPOCH}.min.css
-if [ ! -e $outFile ]; then
-	cat $files | cleancss --skip-rebase -o ${outFile}
-	rm $files
+for file in $files; do
+	cleancss -o ${file}-MIN $file
+	rm $file
+	mv ${file}-MIN $file
 	# add final new line to supress Debian warnings
-	echo "" >> $outFile
-fi
+	echo "" >> $file
+done
+

lam-packaging/debian/postinst

@@ -9,14 +9,6 @@ fi
 . /usr/share/debconf/confmodule
 db_version 2.0 || [ $? -lt 30 ]
 
-# 3rd party libs
-phpThirdPartyLibs='phpseclib Monolog Psr'
-for phpThirdPartyLib in $phpThirdPartyLibs; do
-	if [ ! -L /usr/share/ldap-account-manager/lib/3rdParty/${phpThirdPartyLib} ] ; then
-		ln -s /usr/share/php/${phpThirdPartyLib} /usr/share/ldap-account-manager/lib/3rdParty/${phpThirdPartyLib}
-	fi
-done
-
 cd /usr/share/ldap-account-manager/config-samples/profiles
 files=`ls -a default.*`
 for file in $files; do
@@ -36,15 +28,12 @@ files=`ls -a *.jpg`
 for file in $files; do
 	cp $file /var/lib/ldap-account-manager/config/templates/pdf/logos/$file
 done
-if [ ! -h /usr/share/ldap-account-manager/config ]; then
-  ln -s /var/lib/ldap-account-manager/config /usr/share/ldap-account-manager/config
-fi
-if [ ! -h /usr/share/ldap-account-manager/sess ]; then
-  ln -s /var/lib/ldap-account-manager/sess /usr/share/ldap-account-manager/sess
-fi
-if [ ! -h /usr/share/ldap-account-manager/tmp ]; then
-  ln -s /var/lib/ldap-account-manager/tmp /usr/share/ldap-account-manager/tmp
-fi
+if [ ! -h /usr/share/ldap-account-manager/config ]; then\
+  ln -s /var/lib/ldap-account-manager/config /usr/share/ldap-account-manager/config; fi
+if [ ! -h /usr/share/ldap-account-manager/sess ]; then\
+  ln -s /var/lib/ldap-account-manager/sess /usr/share/ldap-account-manager/sess; fi
+if [ ! -h /usr/share/ldap-account-manager/tmp ]; then\
+  ln -s /var/lib/ldap-account-manager/tmp /usr/share/ldap-account-manager/tmp; fi
 chown www-data /etc/ldap-account-manager/config.cfg
 chmod 600 /etc/ldap-account-manager/config.cfg
 chown www-data /var/lib/ldap-account-manager/sess
@@ -54,14 +43,9 @@ chown www-data /var/lib/ldap-account-manager/tmp/internal
 chmod 700 /var/lib/ldap-account-manager/tmp
 chown -R www-data /var/lib/ldap-account-manager/config
 chmod 700 /var/lib/ldap-account-manager/config
-set +e
-ls -l /var/lib/ldap-account-manager/config/*.conf &> /dev/null
-cfgFilesExist=$?
-set -e
-if [ $cfgFilesExist -ne 0 ]; then
-  cp /var/lib/ldap-account-manager/config/unix.conf.sample /var/lib/ldap-account-manager/config/lam.conf
-	chown www-data /var/lib/ldap-account-manager/config/lam.conf
-fi
+if [ ! -f /var/lib/ldap-account-manager/config/lam.conf ]; \
+   then cp /var/lib/ldap-account-manager/config/unix.conf.sample /var/lib/ldap-account-manager/config/lam.conf; \
+	chown www-data /var/lib/ldap-account-manager/config/lam.conf; fi
 chmod 600 /var/lib/ldap-account-manager/config/*.conf
 if [ "$1" = "configure" ]; then
     db_get "ldap-account-manager/alias"
@@ -96,7 +80,11 @@ if [ "$1" = "configure" ]; then
    if [ "$RET" = "true" ]; then
        for server in $restart; do
            server=${server%,}
-           if [ `which invoke-rc.d` ]; then
+           if [ `which systemctl` ]; then
+               if [ "`systemctl is-active ${server}.service`" = "active" ]; then
+                   systemctl reload ${server}.service
+               fi
+           elif [ `which invoke-rc.d` ]; then
                invoke-rc.d $server reload
            elif [ `which service` ]; then
                service $server reload

lam-packaging/debian/postrm

@@ -41,7 +41,11 @@ if [ -f /usr/share/debconf/confmodule ]; then
 		set -e
 		for server in $restart; do
 				server=${server%,}
-				if [ `which invoke-rc.d` ]; then
+				if [ `which systemctl` ]; then
+				    if [ "`systemctl is-active ${server}.service`" = "active" ]; then
+						systemctl reload ${server}.service
+				    fi
+				elif [ `which invoke-rc.d` ]; then
 					invoke-rc.d $server reload
 				elif [ `which service` ]; then
 					service $server reload
@@ -49,15 +53,6 @@ if [ -f /usr/share/debconf/confmodule ]; then
 		done
 	fi
 
-	# 3rd party libs
-	phpThirdPartyLibs='phpseclib tcpdf Monolog Psr'
-	for phpThirdPartyLib in $phpThirdPartyLibs; do
-		if [ -L /usr/share/ldap-account-manager/lib/3rdParty/${phpThirdPartyLib} ] ; then
-			rm /usr/share/ldap-account-manager/lib/3rdParty/${phpThirdPartyLib}
-		fi
-	done
-
-
 	set -e
 	if [ "$1" = "purge" ]; then
 		rm -r -f /usr/share/ldap-account-manager

lam-packaging/debian/preinst

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [ "$1" != "upgrade" ]; then
-    exit 0
-fi
-
-# 3rd party libs
-phpThirdPartyLibs='phpseclib tcpdf Monolog Psr'
-for phpThirdPartyLib in $phpThirdPartyLibs; do
-	if [ -L /usr/share/ldap-account-manager/lib/3rdParty/${phpThirdPartyLib} ] ; then
-		rm /usr/share/ldap-account-manager/lib/3rdParty/${phpThirdPartyLib}
-	fi
-done
-
-#DEBHELPER#

lam-packaging/debian/rules

@@ -23,7 +23,6 @@ install:
 
 	install -D --mode=644 index.html debian/ldap-account-manager/usr/share/ldap-account-manager/index.html
 	install -D --mode=644 VERSION debian/ldap-account-manager/usr/share/ldap-account-manager/VERSION
-	install -D --mode=644 pwa_worker.js debian/ldap-account-manager/usr/share/ldap-account-manager/pwa_worker.js
 	install -D --mode=644 tmp/.htaccess debian/ldap-account-manager/var/lib/ldap-account-manager/tmp/.htaccess
 	install -D --mode=644 tmp/internal/.htaccess debian/ldap-account-manager/var/lib/ldap-account-manager/tmp/internal/.htaccess
 	install -D --mode=644 config/.htaccess debian/ldap-account-manager/var/lib/ldap-account-manager/config/.htaccess
@@ -41,17 +40,12 @@ install:
 	install -D --mode=644 lib/.htaccess debian/ldap-account-manager/usr/share/ldap-account-manager/lib/.htaccess
 	install -D --mode=644 lib/*.inc debian/ldap-account-manager/usr/share/ldap-account-manager/lib
 	install -D --mode=755 lib/*.sh debian/ldap-account-manager/usr/share/ldap-account-manager/lib
+	install -D --mode=644 lib/ufpdf.php debian/ldap-account-manager/usr/share/ldap-account-manager/lib/ufpdf.php
+	cp -r lib/font debian/ldap-account-manager/usr/share/ldap-account-manager/lib/
 	cp -r lib/modules debian/ldap-account-manager/usr/share/ldap-account-manager/lib/
 	cp -r lib/types debian/ldap-account-manager/usr/share/ldap-account-manager/lib/
 	cp -r lib/tools debian/ldap-account-manager/usr/share/ldap-account-manager/lib/
-
-	# 3rd party libs are linked
-	install -d --mode=755 debian/ldap-account-manager/usr/share/ldap-account-manager/lib/3rdParty
-	cp -r lib/3rdParty/composer debian/ldap-account-manager/usr/share/ldap-account-manager/lib/3rdParty/
-	cp -r lib/3rdParty/yubico debian/ldap-account-manager/usr/share/ldap-account-manager/lib/3rdParty/
-	cp -r lib/3rdParty/tcpdf debian/ldap-account-manager/usr/share/ldap-account-manager/lib/3rdParty/
-	cp -r lib/3rdParty/duo debian/ldap-account-manager/usr/share/ldap-account-manager/lib/3rdParty/
-
+	cp -r lib/3rdParty debian/ldap-account-manager/usr/share/ldap-account-manager/lib/
 	cp -r locale debian/ldap-account-manager/usr/share/ldap-account-manager/
 	install -D --mode=644 sess/.htaccess debian/ldap-account-manager/var/lib/ldap-account-manager/sess/.htaccess
 	cp -r style debian/ldap-account-manager/usr/share/ldap-account-manager/
@@ -72,6 +66,8 @@ binary-indep: build install
 	dh_install
 	dh_compress
 	dh_fixperms
+	dh_link /usr/share/fonts/truetype/dejavu/DejaVuSerif.ttf /usr/share/ldap-account-manager/lib/font/DejaVuSerif.ttf
+	dh_link /usr/share/fonts/truetype/dejavu/DejaVuSerif-Bold.ttf /usr/share/ldap-account-manager/lib/font/DejaVuSerif-Bold.ttf
 	dh_link /usr/share/doc/ldap-account-manager/docs /usr/share/ldap-account-manager/docs
 	install -D --mode=644 debian/lam.apache.conf debian/ldap-account-manager/etc/ldap-account-manager/apache.conf
 	install -D --mode=644 debian/lam.nginx.conf debian/ldap-account-manager/etc/ldap-account-manager/nginx.conf

lam-packaging/docker/.env

@@ -1,36 +0,0 @@
-#
-# LAM setup
-#
-# skip LAM preconfiguration (lam.conf + config.cfg), values: (true/false)
-# If set to false the other variables below have no effect.
-LAM_SKIP_PRECONFIGURE=false
-# domain of LDAP database root entry, will be converted to dc=...,dc=...
-LDAP_DOMAIN=my-domain.com
-# LDAP base DN to overwrite value generated by LDAP_DOMAIN
-LDAP_BASE_DN=dc=my-domain,dc=com
-# LDAP users DN to overwrite value provided by LDAP_BASE_DN
-LDAP_USERS_DN=ou=people,dc=my-domain,dc=com
-# LDAP groups DN to overwrite value provided by LDAP_BASE_DN
-LDAP_GROUPS_DN=ou=groups,dc=my-domain,dc=com
-
-# LDAP server URL
-LDAP_SERVER=ldap://ldap:389
-# LDAP admin user (set as login user for LAM)
-LDAP_USER=cn=admin,dc=my-domain,dc=com
-# default language, e.g. en_US, de_DE, fr_FR, ...
-LAM_LANG=en_US
-# LAM configuration master password and password for server profile "lam"
-LAM_PASSWORD=lam
-
-# deactivate TLS certificate checks, activate for development only
-LAM_DISABLE_TLS_CHECK=false
-
-#
-# docker-compose only, LDAP server setup
-#
-# LDAP organisation name for OpenLDAP
-LDAP_ORGANISATION="LDAP Account Manager Demo"
-# LDAP admin password
-LDAP_ADMIN_PASSWORD=adminpw
-# password for LDAP read-only user
-LDAP_READONLY_USER_PASSWORD=readonlypw

lam-packaging/docker/Dockerfile

@@ -1,112 +0,0 @@
-#
-#  Docker image for LDAP Account Manager
-
-#  This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-#  Copyright (C) 2019 - 2020  Roland Gruber
-
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-#
-#  Usage: run this command: docker run -p 8080:80 -it -d ldapaccountmanager/lam:stable
-#
-#  Then access LAM at http://localhost:8080/
-#  You can change the port 8080 if needed.
-#  See possible environment variables here: https://github.com/LDAPAccountManager/lam/blob/develop/lam-packaging/docker/.env
-#
-
-FROM debian:buster-slim
-LABEL maintainer="Roland Gruber <post@rolandgruber.de>"
-
-ARG LAM_RELEASE=7.3.RC1
-EXPOSE 80
-
-ENV \
-    DEBIAN_FRONTEND=noninteractive \
-    DEBUG=''
-
-RUN apt-get update && \
-    apt-get upgrade -y
-
-# install locales
-RUN apt-get install -y locales
-RUN sed -i 's/^# *\(ca_ES.UTF-8\)/\1/' /etc/locale.gen && \
-        sed -i 's/^# *\(cz_CZ.UTF-8\)/\1/' /etc/locale.gen && \
-        sed -i 's/^# *\(de_DE.UTF-8\)/\1/' /etc/locale.gen && \
-        sed -i 's/^# *\(en_GB.UTF-8\)/\1/' /etc/locale.gen && \
-        sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen && \
-        sed -i 's/^# *\(es_ES.UTF-8\)/\1/' /etc/locale.gen && \
-        sed -i 's/^# *\(fr_FR.UTF-8\)/\1/' /etc/locale.gen && \
-        sed -i 's/^# *\(it_IT.UTF-8\)/\1/' /etc/locale.gen && \
-        sed -i 's/^# *\(hu_HU.UTF-8\)/\1/' /etc/locale.gen && \
-        sed -i 's/^# *\(nl_NL.UTF-8\)/\1/' /etc/locale.gen && \
-        sed -i 's/^# *\(pl_PL.UTF-8\)/\1/' /etc/locale.gen && \
-        sed -i 's/^# *\(pt_BR.UTF-8\)/\1/' /etc/locale.gen && \
-        sed -i 's/^# *\(ru_RU.UTF-8\)/\1/' /etc/locale.gen && \
-        sed -i 's/^# *\(sk_SK.UTF-8\)/\1/' /etc/locale.gen && \
-        sed -i 's/^# *\(tr_TR.UTF-8\)/\1/' /etc/locale.gen && \
-        sed -i 's/^# *\(uk_UA.UTF-8\)/\1/' /etc/locale.gen && \
-        sed -i 's/^# *\(ja_JP.UTF-8\)/\1/' /etc/locale.gen && \
-        sed -i 's/^# *\(zh_TW.UTF-8\)/\1/' /etc/locale.gen && \
-        sed -i 's/^# *\(zh_CN.UTF-8\)/\1/' /etc/locale.gen && \
-        locale-gen
-
-RUN apt-get install --no-install-recommends -y \
-        apache2 \
-        ca-certificates \
-        dumb-init \
-        fonts-dejavu \
-        libapache2-mod-php \
-        php \
-        php-curl \
-        php-gd \
-        php-imagick \
-        php-ldap \
-        php-monolog \
-        php-phpseclib \
-        php-xml \
-        php-zip \
-        php-imap \
-        php-gmp \
-        wget \
-    && \
-    rm /etc/apache2/sites-enabled/*default* && \
-    rm -rf /var/cache/apt /var/lib/apt/lists/*
-
-# install LAM
-RUN wget http://prdownloads.sourceforge.net/lam/ldap-account-manager_${LAM_RELEASE}-1_all.deb?download \
-    -O /tmp/ldap-account-manager_${LAM_RELEASE}-1_all.deb && \
-    dpkg -i /tmp/ldap-account-manager_${LAM_RELEASE}-1_all.deb && \
-    rm -f /tmp/ldap-account-manager_${LAM_RELEASE}-1_all.deb
-
-# redirect Apache logging
-RUN sed -e 's,^ErrorLog.*,ErrorLog "|/bin/cat",' -i /etc/apache2/apache2.conf
-# because there is no logging set in the lam vhost logging goes to other_vhost_access.log
-RUN ln -sf /dev/stdout /var/log/apache2/other_vhosts_access.log
-
-# add redirect for /
-RUN a2enmod rewrite
-RUN echo "RewriteEngine on" >> /etc/apache2/conf-enabled/laminit.conf \
- && echo "RewriteRule   ^/$  /lam/ [R,L]" >> /etc/apache2/conf-enabled/laminit.conf
-
-COPY start.sh /usr/local/bin/start.sh
-
-WORKDIR /var/lib/ldap-account-manager/config
-
-# start Apache when container starts
-ENTRYPOINT ["/usr/bin/dumb-init", "--"]
-CMD [ "/usr/local/bin/start.sh" ]
-
-HEALTHCHECK --interval=1m --timeout=10s \
-    CMD wget -qO- http://localhost/lam/ | grep -q '<title>LDAP Account Manager</title>'

lam-packaging/docker/docker-compose.yml

@@ -1,42 +0,0 @@
-version: '3.5'
-services:
-  ldap-account-manager:
-    build:
-      context: .
-    image: ldapaccountmanager/lam:7.3.RC1
-    restart: unless-stopped
-    ports:
-      - "8080:80"
-    volumes:
-      - lametc/:/etc/ldap-account-manager
-      - lamconfig/:/var/lib/ldap-account-manager/config
-      - lamsession/:/var/lib/ldap-account-manager/sess
-    environment:
-      - LAM_PASSWORD=${LAM_PASSWORD}
-      - LAM_LANG=en_US
-      - LDAP_SERVER=${LDAP_SERVER}
-      - LDAP_DOMAIN=${LDAP_DOMAIN}
-      - LDAP_BASE_DN=${LDAP_BASE_DN}
-      - ADMIN_USER=cn=admin,${LDAP_BASE_DN}
-      - DEBUG=true
-  ldap:
-    image: osixia/openldap:latest
-    restart: unless-stopped
-    environment:
-      - LDAP_ORGANISATION=${LDAP_ORGANISATION}
-      - LDAP_DOMAIN=${LDAP_DOMAIN}
-      - LDAP_BASE_DN=${LDAP_BASE_DN}
-      - LDAP_ADMIN_PASSWORD=${LDAP_ADMIN_PASSWORD}
-      - LDAP_READONLY_USER=true
-      - LDAP_READONLY_USER_PASSWORD=${LDAP_READONLY_USER_PASSWORD}
-    command: "--loglevel info --copy-service"
-    volumes:
-      - ldap:/var/lib/ldap
-      - slapd:/etc/ldap/slapd.d
-
-volumes:
-  lametc:
-  lamconfig:
-  lamsession:
-  ldap:
-  slapd:

lam-packaging/docker/start.sh

@@ -1,66 +0,0 @@
-#!/bin/bash
-#
-#  Docker start script for LDAP Account Manager
-
-#  This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-#  Copyright (C) 2019  Felix Bartels
-
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-set -eu # unset variables are errors & non-zero return values exit the whole script
-[ "$DEBUG" ] && set -x
-
-if [ "${LAM_DISABLE_TLS_CHECK:-}" == "true" ]; then
-  ln -s /etc/ldap/ldap.conf /etc/ldap.conf
-  echo "TLS_REQCERT never" >> /etc/ldap/ldap.conf
-fi
-
-LAM_SKIP_PRECONFIGURE="${LAM_SKIP_PRECONFIGURE:-false}"
-if [ "$LAM_SKIP_PRECONFIGURE" != "true" ]; then
-
-  LAM_LANG="${LAM_LANG:-en_US}"
-  export LAM_PASSWORD="${LAM_PASSWORD:-lam}"
-  LAM_PASSWORD_SSHA=$(php -r '$password = getenv("LAM_PASSWORD"); mt_srand((microtime() * 1000000)); $rand = abs(hexdec(bin2hex(openssl_random_pseudo_bytes(5)))); $salt0 = substr(pack("h*", md5($rand)), 0, 8); $salt = substr(pack("H*", sha1($salt0 . $password)), 0, 4); print "{SSHA}" . base64_encode(pack("H*", sha1($password . $salt))) . " " . base64_encode($salt) . "\n";')
-  LDAP_SERVER="${LDAP_SERVER:-ldap://ldap:389}"
-  LDAP_DOMAIN="${LDAP_DOMAIN:-my-domain.com}"
-  LDAP_BASE_DN="${LDAP_BASE_DN:-dc=${LDAP_DOMAIN//\./,dc=}}"
-  LDAP_USERS_DN="${LDAP_USERS_DN:-${LDAP_BASE_DN}}"
-  LDAP_GROUPS_DN="${LDAP_GROUPS_DN:-${LDAP_BASE_DN}}"
-  LDAP_ADMIN_USER="${LDAP_USER:-cn=admin,${LDAP_BASE_DN}}"
-  
-  sed -i -f- /etc/ldap-account-manager/config.cfg <<- EOF
-    s|^password:.*|password: ${LAM_PASSWORD_SSHA}|;
-EOF
-  unset LAM_PASSWORD
-
-  sed -i -f- /var/lib/ldap-account-manager/config/lam.conf <<- EOF
-    s|^ServerURL:.*|ServerURL: ${LDAP_SERVER}|;
-    s|^Admins:.*|Admins: ${LDAP_ADMIN_USER}|;
-    s|^Passwd:.*|Passwd: ${LAM_PASSWORD_SSHA}|;
-    s|^treesuffix:.*|treesuffix: ${LDAP_BASE_DN}|;
-    s|^defaultLanguage:.*|defaultLanguage: ${LAM_LANG}.utf8|;
-    s|^.*suffix_user:.*|types: suffix_user: ${LDAP_USERS_DN}|;
-    s|^.*suffix_group:.*|types: suffix_group: ${LDAP_GROUPS_DN}|;
-EOF
-
-fi
-
-echo "Starting Apache"
-rm -f /run/apache2/apache2.pid
-set +u
-# shellcheck disable=SC1091
-source /etc/apache2/envvars
-exec /usr/sbin/apache2 -DFOREGROUND

lam/.htaccess

@@ -1,5 +1,11 @@
 <Files *>
   Options +FollowSymLinks
+  <IfModule !mod_authz_core.c>
+    Order allow,deny
+    Allow from all
+  </IfModule>
+  <IfModule mod_authz_core.c>
     Require all granted
+  </IfModule>
   DirectoryIndex index.html
 </Files>

lam/COPYING

@@ -5,624 +5,283 @@ See the copyright file for a detailed list of licenses.
 
 
 		    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
+		       Version 2, June 1991
 
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
 			    Preamble
 
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
 
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
 
   For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
 
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
 
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
 
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
 this License.
 
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
 
-  13. Use with the GNU Affero General Public License.
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
 
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
 
-  14. Revised Versions of this License.
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
 
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
 
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
 
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
+			    NO WARRANTY
 
-  15. Disclaimer of Warranty.
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
 
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
 
@@ -634,15 +293,15 @@ free software which everyone can redistribute and change under these terms.
 
   To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
+convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
     Copyright (C) <year>  <name of author>
 
-    This program is free software: you can redistribute it and/or modify
+    This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
+    the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
@@ -651,30 +310,37 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
 
 Also add information on how to contact you by electronic and paper mail.
 
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
 
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
 
 The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
 
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
 
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

lam/HISTORY

@@ -1,182 +1,3 @@
-September 2020
-  - PHP 7.4 compatibility
-  - Configuration export and import
-  - Server profiles support to specify a part of the DN to hide
-  - Show password prompt when a user with expired password logs into LAM admin interface (requires PHP 7.2)
-  - Better error messages on login when account is expired/deactivated/...
-  - Personal/Windows: photo can be uploaded via webcam
-  - Windows users: group display format can be configured (cn/dn)
-  - LAM Pro:
-   -> Windows: new cron job to send users a summary of their managed groups
-  - Fixed bugs:
-   -> Unix groups: memberUid was not deleted correctly when forced sync with group of names is active
-
-01.05.2020 7.2
-  - Unix: allow to create group with same name during user creation
-  - LAM Pro:
-   -> EMail sending can be done via SMTP without local mail server
-   -> License expiration warning can be sent via email or disabled
-  - Fixed bugs:
-   -> Captcha don't show anymore in Self Service login page (213)
-   -> Unix memberships cannot be changed. This issue can also affect other membership relations.
-   -> Missing locales on Docker image
-
-
-17.03.2020 7.1
-  - PHP 7 required
-  - WebAuthn/FIDO2 support for 2-factor-authentication (requires PHP 7.2)
-  - IMAP: changed library to support latest TLS versions
-  - Personal: support display name (hidden by default in server profile)
-  - Windows users: support allowed workstations, more profile options
-  - Reactivated Polish translation
-  - LAM Pro:
-   -> PPolicy: support for password check module
-   -> Windows AD LDS support (users and groups)
-   -> User self registration: support Active Directory/Samba4
-
-
-21.12.2019 7.0
-  - Lamdaemon can be configured with directory prefix for homedirs
-  - Account list filters match on substrings instead of whole value
-  - YubiKey: support to configure multiple verification servers
-  - Windows hosts: added last password change and last login
-  - Deactivated non-maintained translations: Catalan, Czech, Hungarian, Polish and Turkish
-    Contact us if you would like to take over. Translators get LAM Pro for free (commercial use included).
-  - Docker updates
-  - Fixed bugs:
-   -> Missing CSS for Duo
-   -> Editing of DNs with comma on Windows (210)
-
-
-29.09.2019 6.9
-  - Group account types can show member+owner count in list view
-  - 2-factor authentication:
-   -> Duo support
-   -> user name attribute for privacyIDEA can be specified
-  - LAM Pro:
-   -> New self service settings for login and main page footer
-   -> Custom fields: custom labels for LDAP search select list
-  - Fixed bugs:
-   -> Configuration issue with Unix user/host module (206)
-
-
-02.07.2019 6.8
-  - Parallel editing of multiple entries in different browser tabs supported
-  - LAM supports the progressive web app standard which allows to install LAM as an icon on home screen
-  - Windows: added home drive and force password change to profile editor
-  - Unix: password management can be disabled in module settings
-  - LAM Pro:
-   -> Bind DLZ: entry table can show record data (use special attribute "#records" in server profile)
-   -> Self service: support legacy attribute "email" for password self reset and user self registration
-  - Fixed bugs:
-   -> Users: No drop-down filter box for account status (200)
-   -> Custom fields: Account type "Groups" not saving/deleting fields (66)
-
-
-25.03.2019 6.7
-  - Added YubiKey as 2-factor authentication provider
-  - Support logging to remote syslog server
-  - PHP 7.3 support
-  - LAM Pro:
-   -> Allow to mark text and text area fields as required
-   -> New self service fields:
-    -> Mail routing
-    -> Windows proxy addresses + mail alias
-    -> Shadow account expiration date
-    -> Unix and group of names memberships
-   -> Base URL for emails in self service can be configured in self service profile
-   -> Bind DLZ: support DNAME+XFR records and descriptions in records (requires latest LDAP schema)
-   -> Cron jobs: added Shadow account expiration notification job
-  - Fixed bugs:
-   -> Allow tree-only configurations without any other tab
-
-
-28.12.2018 6.6
-  - New import/export in tools menu
-  - YubiKey support
-  - Windows users:
-    -> Manage "departmentNumber" (needs to be activated via LAM server profile)
-    -> Sync group memberships from Unix and group of names
-  - LAM Pro:
-    -> Easy setting of background color in self service profile
-    -> Cron jobs: added Windows/Qmail/FreeRadius account expiration notification jobs
-    -> Bind DLZ: usability improvements and small fixes
-
-
-25.09.2018 6.5
-  - Password change possible via LDAP EXOP operation (set LDAP_EXOP as password hash, requires PHP 7.2)
-  - Support Imagick and GD
-  - Dropped support for Apache 2.2
-  - Upload: allow to overwrite existing accounts
-  - Personal: photos can be printed in PDF export
-  - Kolab updates
-  - LAM Pro:
-   -> Auto deletion of entries with dynamic directory services support (requires PHP 7.2)
-  - Fixed bugs:
-   -> Issue when changing key case of uid (#197)
-
-
-20.06.2018 6.4
-  - Imagick PHP extension required
-  - Passwords can be checked against external service (e.g. https://api.pwnedpasswords.com/range)
-  - Personal/Windows: image cropping support
-  - Better filtering of account lists
-  - Unix: Unix, Windows and group of names memberships can be synced in group selection
-  - IMAP: create mailbox via file upload
-  - PHP 7.2 support
-  - Support for "," in DN
-  - LAM Pro:
-   -> Better support for 389ds password expiration
-  - Fixed bugs:
-   -> Error on password reset page when custom fields is used (194)
-
-
-19.03.2018 6.3
-  - Server profile: added option if referential integrity overlay is active to skip cleanup actions
-  - Unix: several options are now specific to subaccount types (reconfiguration required!)
-  - Fixed bugs:
-   -> Security fixes (XSS vulnerabilities CVE-2018-8763 and CSRF token in URL CVE-2018-8764)
-   -> Quota for Windows groups did not work
-  - LAM Pro:
-   -> Support custom structural object classes with new custom type
-   -> Support dynamic lists
-   -> Self service login and password self reset can be secured with captcha
-
-
-04.02.2018 6.2.1
-  - Fixed bugs:
-   -> Login page not working when no server profile exists (44)
-   -> LAM Pro: Password Self Reset has issues when both security question and confirmation mail are activated.
-   -> LAM main configuration: certificate buttons do not work
-
-
-13.12.2017 6.2
-  - License changed from GPL v2 to GPL v3
-  - PHP 5.6 and Internet Explorer 11 or later required
-  - PDF export supports Chinese, Japan and Korean
-  - Account status also shows expired accounts
-  - Quota: support k/m/g/t/K/M/G/T to specify values in e.g. kB
-  - LAM Pro:
-   -> Cron jobs include better logging and support dry-run
-
-
-19.09.2017 6.1
-  - Automatically trim input fields to avoid trailing/leading spaces
-  - LAM Pro:
-   -> Custom fields: support wildcards in text fields such as $firstname
-   -> Custom fields: specify minimum/maximum count for multi-value entries
-   -> Custom fields: new type for constant values
-  - Fixed bugs:
-   -> Password modify page reports error on password change when posixAccount is present for users
-   -> Nginx configuration files did not include "fastcgi_param SCRIPT_FILENAME $request_filename;" (193)
-
-
-20.07.2017 6.0.1
-  - Fixed bugs:
-   -> Configuration file fills up with empty values
-   -> Tool visibility settings
-
-
 26.06.2017 6.0
   - Support multiple configurations for same account type
   - PHP 7.1 compatibility
@@ -338,7 +159,7 @@ September 2020
   - LAM Pro:
    -> Password self reset and user self registration support to set a header text
    -> Sudo roles: support latest schema
-   -> Bind DLZ: automatic PTR management (disabled by default) and better formatting of e.g. TTL values
+   -> Bind DLZ: automatic PTR management (disabled by default) and better formating of e.g. TTL values
 
 
 18.03.2014 4.5
@@ -530,7 +351,7 @@ September 2020
    -> support to read user name from uid attribute
    -> added quota management
   - Personal: added additional options for account profiles
-  - Mail aliases: sort recipients (RFE 3170336)
+  - Mail aliases: sort receipients (RFE 3170336)
   - Asterisk: support all attributes (can be disabled in configuration)
   - Samba 3/Shadow: allow to sync expiration date (RFE 3147751)
   - LAM Pro:
@@ -657,7 +478,7 @@ September 2020
 21.01.2009 2.5.0
   - LAM Pro:
    -> supports rfc2307bis schema for Unix groups (RFE 2111694)
-   -> added alias management (object classes alias + uidObject) (RFE 1912779)
+   -> added alias manangement (object classes alias + uidObject) (RFE 1912779)
   - Shadow: module is now optional when creating new accounts
   - Kolab:
    -> account extension is now optional
@@ -846,7 +667,7 @@ September 2020
    - security: LAM checks the session id and client IP
    - fixed bugs:
     -> Samba 3: hash values were wrong in some rare cases (1440021)
-    -> Samba 3: re-added time zone selection for logon hours (1407761)
+    -> Samba 3: readded time zone selection for logon hours (1407761)
     -> Unix: call of unknown function (1450464)
 
 
@@ -983,7 +804,7 @@ September 2020
    -> dynamic configuration options (based on modules)
   - all pages in UTF-8
   - added developer documentation
-  - PHPDoc formatted comments
+  - PHPDoc formated comments
   - new plugin for managing MAC addresses (RFE 926017)
   - new plugin for managing NIS mail aliases (RFE 1050036)
   - new plugin for managing mail routing with inetLocalMailRecipient (RFE 1092137)
@@ -1045,7 +866,7 @@ September 2020
       if magic_quotes_gpc in php.ini is was set to "Off", several pages did not work
       some smaller bugs in mass upload
       Samba hash values for hosts were not correct
-      Unix passwords could be disabled but not re-enabled
+      Unix passwords could be disabled but not reenabled
       fixed problem with eval() in status.inc (894433)
 
 
@@ -1068,7 +889,7 @@ September 2020
   - better error handling at login
   - support spaces in DNs
   - PDF text for users
-  - create missing OUs recursively
+  - create missing OUs recursivly
   - fixed bugs:
       SMD5 passwords were wrong
       primaryGroupSID wrong if SID has no relation to Algorithmic RID Base

lam/README

@@ -3,16 +3,19 @@ LAM - Readme
 ============
 
   LDAP Account Manager (LAM) manages user, group and host accounts in an LDAP
-  directory. LAM runs on any webserver with PHP7 support and connects to your
+  directory. LAM runs on any webserver with PHP5 support and connects to your
   LDAP server unencrypted or via SSL/TLS.
-  Currently LAM supports these account types: Samba 3/4, Unix, Kolab,
+  Currently LAM supports these account types: Samba 3/4, Unix, Kolab 2,
   address book entries, NIS mail aliases and MAC addresses. There is a tree
   viewer included to allow access to the raw LDAP attributes. You can use
   templates for account creation and use multiple configuration profiles.
+  LAM is translated to Catalan, Chinese (Traditional + Simplified), Czech,
+  Dutch, English, French, German, Hungarian, Italian, Japanese, Polish,
+  Portuguese, Russian, Slovak, Spanish, Turkish and Ukrainian.
 
   https://www.ldap-account-manager.org/
 
-    Copyright (C) 2003 - 2020 Roland Gruber <post@rolandgruber.de>
+    Copyright (C) 2003 - 2016 Roland Gruber <post@rolandgruber.de>
 
   Installation and documentation:
     Please see the LAM manual in docs/manual/index.html.

lam/VERSION

@@ -1 +1 @@
-7.3.RC1
+6.0

lam/codespell.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-~/.local/bin/codespell --skip '*3rdParty*,*/ckeditor/*,*/po/*,*/locale/*,tmp,sess,config,graphics,*/style/images/*,*/style/*.gif,*/style/*.png,*/docs/manual-onePage/*,*/docs/manual-sources/images/*,*/templates/lib/*jquery*,*~,*/docs/phpdoc/*,*/docs/manual/*,*/docs/devel/images/*,*/docs/manual-pdf/*,*.sh,*/cropper.js,*/lib/extra/duo/*' --ignore-words-list "tim,te,pres,files'"

lam/composer.json

@@ -1,18 +0,0 @@
-{
-  "config": {
-    "vendor-dir": "lib/3rdParty/composer"
-  },
-  "repositories": [
-    {
-      "type": "pear",
-      "url": "https://pear.horde.org"
-    }
-  ],
-  "require" : {
-    "web-auth/webauthn-lib" : "2.1.7",
-    "symfony/http-foundation" : "5.0.7",
-    "symfony/psr-http-message-bridge" : "1.3.0",
-    "pear-pear.horde.org/Horde_Imap_Client" : "2.30.1",
-    "phpmailer/phpmailer": "~6.1"
-  }
-}

lam/config/.gitignore

@@ -3,4 +3,3 @@ config.cfg
 /serverCerts.pem
 /pdf/
 /profiles/
-*.sqlite

lam/config/.htaccess

@@ -1,3 +1,9 @@
 <Files *>
+  <IfModule !mod_authz_core.c>
+    Order allow,deny
+    Deny from all
+  </IfModule>
+  <IfModule mod_authz_core.c>
     Require all denied
+  </IfModule>
 </Files>

lam/config/addressbook.conf.sample

@@ -39,12 +39,12 @@ searchLimit: 0
 
 # Module settings
 
-modules: posixAccount_user_minUID: 10000
-modules: posixAccount_user_maxUID: 30000
-modules: posixAccount_host_minMachine: 50000
-modules: posixAccount_host_maxMachine: 60000
-modules: posixGroup_group_minGID: 10000
-modules: posixGroup_group_maxGID: 20000
+modules: posixAccount_minUID: 10000
+modules: posixAccount_maxUID: 30000
+modules: posixAccount_minMachine: 50000
+modules: posixAccount_maxMachine: 60000
+modules: posixGroup_minGID: 10000
+modules: posixGroup_maxGID: 20000
 modules: posixGroup_pwdHash: SSHA
 modules: posixAccount_pwdHash: SSHA
 

lam/config/language

@@ -6,10 +6,10 @@
 # the second is the character encoding and the third the language name.
 
 # Catalan
-# ca_ES.utf8:UTF-8:Català (Catalunya)
+ca_ES.utf8:UTF-8:Català (Catalunya)
 
 # Czech
-# cs_CZ.utf8:UTF-8:Čeština (Česko)
+cs_CZ.utf8:UTF-8:Čeština (Česko)
 
 # German
 de_DE.utf8:UTF-8:Deutsch (Deutschland)
@@ -30,7 +30,7 @@ fr_FR.utf8:UTF-8:Français (France)
 it_IT.utf8:UTF-8:Italiano (Italia)
 
 # Hungarian
-# hu_HU.utf8:UTF-8:Magyar (Magyarország)
+hu_HU.utf8:UTF-8:Magyar (Magyarország)
 
 # Dutch
 nl_NL.utf8:UTF-8:Nederlands (Nederland)
@@ -48,7 +48,7 @@ ru_RU.utf8:UTF-8:Русский (Россия)
 sk_SK.utf8:UTF-8:Slovenčina (Slovensko)
 
 # Turkish
-# tr_TR.utf8:UTF-8:Türkçe (Türkiye)
+tr_TR.utf8:UTF-8:Türkçe (Türkiye)
 
 # Ukrainian
 uk_UA.utf8:UTF-8:Українська (Україна)

lam/config/samba3.conf.sample

@@ -39,12 +39,12 @@ searchLimit: 0
 
 # Module settings
 
-modules: posixAccount_user_minUID: 10000
-modules: posixAccount_user_maxUID: 30000
-modules: posixAccount_host_minMachine: 50000
-modules: posixAccount_host_maxMachine: 60000
-modules: posixGroup_group_minGID: 10000
-modules: posixGroup_group_maxGID: 20000
+modules: posixAccount_minUID: 10000
+modules: posixAccount_maxUID: 30000
+modules: posixAccount_minMachine: 50000
+modules: posixAccount_maxMachine: 60000
+modules: posixGroup_minGID: 10000
+modules: posixGroup_maxGID: 20000
 modules: posixGroup_pwdHash: SSHA
 modules: posixAccount_pwdHash: SSHA
 
@@ -122,10 +122,10 @@ lamProMailIsHTML: false
 
 # Allow alternate address
 lamProMailAllowAlternateAddress: true
-modules: posixGroup_group_gidGenerator: range
-modules: posixGroup_group_sambaIDPoolDN:
-modules: posixGroup_group_gidCheckSuffix:
-modules: posixGroup_group_hidememberUid: false
+modules: posixGroup_gidGenerator: range
+modules: posixGroup_sambaIDPoolDN:
+modules: posixGroup_gidCheckSuffix:
+modules: posixGroup_hidememberUid: false
 modules: sambaSamAccount_timeZone: 0
 modules: sambaSamAccount_lmHash: yes
 modules: sambaSamAccount_hideHomeDrive: false
@@ -136,16 +136,16 @@ modules: sambaSamAccount_hideSambaPwdLastSet: false
 modules: sambaSamAccount_hideWorkstations: false
 modules: sambaSamAccount_hideLogonHours: false
 modules: sambaSamAccount_hideTerminalServer: false
-modules: posixAccount_user_uidGeneratorUsers: range
-modules: posixAccount_user_sambaIDPoolDNUsers:
-modules: posixAccount_user_uidCheckSuffixUser:
-modules: posixAccount_host_uidGeneratorHosts: range
-modules: posixAccount_host_sambaIDPoolDNHosts:
-modules: posixAccount_host_uidCheckSuffixHost:
+modules: posixAccount_uidGeneratorUsers: range
+modules: posixAccount_sambaIDPoolDNUsers:
+modules: posixAccount_uidCheckSuffixUser:
+modules: posixAccount_uidGeneratorHosts: range
+modules: posixAccount_sambaIDPoolDNHosts:
+modules: posixAccount_uidCheckSuffixHost:
 modules: posixAccount_shells: /bin/bash+::+/bin/csh+::+/bin/dash+::+/bin/false+::+/bin/ksh+::+/bin/sh
-modules: posixAccount_user_hidegecos: false
+modules: posixAccount_hidegecos: false
 modules: posixAccount_primaryGroupAsSecondary: false
-modules: posixAccount_user_userNameSuggestion: @givenname@%sn%
+modules: posixAccount_userNameSuggestion: @givenname@%sn%
 modules: inetOrgPerson_hideDescription: false
 modules: inetOrgPerson_hideStreet: false
 modules: inetOrgPerson_hidePostOfficeBox: false

lam/config/templates/pdf/default.customType.xml

@@ -1,4 +0,0 @@
-<pdf type="bind" filename="printLogo.jpg" headline="Custom entry" foldingmarks="no">
-	<section name="_main_dn">
-	</section>
-</pdf>

lam/config/templates/profiles/default.customType

@@ -1 +0,0 @@
-

lam/config/unix.conf.sample

@@ -5,22 +5,22 @@
 ###################################################################################################
 
 # server address (e.g. ldap://localhost:389 or ldaps://localhost:636)
-ServerURL: ldap://localhost:389
+serverURL: ldap://localhost:389
 
 # list of users who are allowed to use LDAP Account Manager
 # names have to be seperated by semicolons
 # e.g. admins: cn=admin,dc=yourdomain,dc=org;cn=root,dc=yourdomain,dc=org
-Admins: cn=Manager,dc=my-domain,dc=com
+admins: cn=Manager,dc=my-domain,dc=com
 
 # password to change these preferences via webfrontend (default: lam)
-Passwd: lam
+passwd: lam
 
 # suffix of tree view
 # e.g. dc=yourdomain,dc=org
 treesuffix: dc=yourdomain,dc=org
 
 # default language (a line from config/language)
-defaultLanguage: en_GB.utf8
+defaultLanguage: en_GB.utf8:UTF-8:English (Great Britain)
 
 # Path to external Script
 scriptPath:
@@ -39,12 +39,12 @@ searchLimit: 0
 
 # Module settings
 
-modules: posixAccount_user_minUID: 10000
-modules: posixAccount_user_maxUID: 30000
-modules: posixAccount_host_minMachine: 50000
-modules: posixAccount_host_maxMachine: 60000
-modules: posixGroup_group_minGID: 10000
-modules: posixGroup_group_maxGID: 20000
+modules: posixAccount_minUID: 10000
+modules: posixAccount_maxUID: 30000
+modules: posixAccount_minMachine: 50000
+modules: posixAccount_maxMachine: 60000
+modules: posixGroup_minGID: 10000
+modules: posixGroup_maxGID: 20000
 modules: posixGroup_pwdHash: SSHA
 modules: posixAccount_pwdHash: SSHA
 

lam/config/windows_samba4.conf.sample

@@ -39,12 +39,12 @@ searchLimit: 0
 
 # Module settings
 
-modules: posixAccount_user_minUID: 10000
-modules: posixAccount_user_maxUID: 30000
-modules: posixAccount_host_minMachine: 50000
-modules: posixAccount_host_maxMachine: 60000
-modules: posixGroup_group_minGID: 10000
-modules: posixGroup_group_maxGID: 20000
+modules: posixAccount_minUID: 10000
+modules: posixAccount_maxUID: 30000
+modules: posixAccount_minMachine: 50000
+modules: posixAccount_maxMachine: 60000
+modules: posixGroup_minGID: 10000
+modules: posixGroup_maxGID: 20000
 modules: posixGroup_pwdHash: SSHA
 modules: posixAccount_pwdHash: SSHA
 
@@ -177,16 +177,16 @@ types: hideNewButton_zarafaAddressListType:
 types: hideDeleteButton_zarafaAddressListType:
 modules: windowsGroup_hidemanagedBy: true
 modules: passwordSelfReset_questions: Bla1?+::+Bla2?
-modules: posixGroup_group_gidGenerator: range
-modules: posixGroup_group_sambaIDPoolDN:
-modules: posixGroup_group_gidCheckSuffix:
-modules: posixAccount_user_uidGeneratorUsers: range
-modules: posixAccount_user_sambaIDPoolDNUsers:
-modules: posixAccount_user_uidCheckSuffixUser:
+modules: posixGroup_gidGenerator: range
+modules: posixGroup_sambaIDPoolDN:
+modules: posixGroup_gidCheckSuffix:
+modules: posixAccount_uidGeneratorUsers: range
+modules: posixAccount_sambaIDPoolDNUsers:
+modules: posixAccount_uidCheckSuffixUser:
 modules: posixAccount_shells: /bin/bash+::+/bin/csh+::+/bin/dash+::+/bin/false+::+/bin/ksh+::+/bin/sh
-modules: posixAccount_user_hidegecos: false
+modules: posixAccount_hidegecos: false
 modules: posixAccount_primaryGroupAsSecondary: false
-modules: posixAccount_user_userNameSuggestion: @givenname@%sn%
+modules: posixAccount_userNameSuggestion: @givenname@%sn%
 modules: windowsUser_domains: my-domain.com
 modules: windowsUser_hidesAMAccountName: false
 tools: tool_hide_toolMultiEdit: false

lam/copyright

@@ -1,4 +1,4 @@
-This software is copyright (c) 2003 - 2020 by Roland Gruber
+This software is copyright (c) 2003 - 2016 by Roland Gruber
 
 If you purchased a copy of LDAP Account Manager Pro then the following
 files are licensed under the conditions which you accepted at purchase
@@ -15,12 +15,9 @@ time.
 * lib/modules/aliasEntry.inc
 * lib/modules/automount.inc
 * lib/modules/bindDLZ.inc
-* lib/modules/customBaseType.inc
 * lib/modules/customFields.inc
 * lib/modules/customScripts.inc
 * lib/modules/device.inc
-* lib/modules/autoDelete.inc
-* lib/modules/dynamicList.inc
 * lib/modules/groupOfNames.inc
 * lib/modules/groupOfNamesUser.inc
 * lib/modules/groupOfUniqueNames.inc
@@ -51,9 +48,8 @@ time.
 * lib/modules/zarafaServer.inc
 * lib/modules/zarafaUser.inc
 * lib/types/alias.inc
-* lib/types/automountType.inc
 * lib/types/bind.inc
-* lib/types/customType.inc
+* lib/types/automountType.inc
 * lib/types/gon.inc
 * lib/types/nisObjectType.inc
 * lib/types/nsview.inc
@@ -66,9 +62,10 @@ time.
 
 All other files are licensed under the conditions below.
 
-    This program is free software: you can redistribute it and/or modify
+
+  This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
+  the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
@@ -77,8 +74,8 @@ All other files are licensed under the conditions below.
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 The complete license can be found in the file COPYING.
 
@@ -86,6 +83,17 @@ The complete license can be found in the file COPYING.
 Some parts of this package have other, compatible licences. These are:
 
 A:
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software to use, copy, modify, distribute, sublicense, and/or sell
+  copies of the software, and to permit persons to whom the software is furnished
+  to do so.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED.
+
+
+B:
+
   DejaVu Fonts — License
 
   Fonts are © Bitstream (see below). DejaVu changes are in public domain. Explanation
@@ -176,9 +184,7 @@ A:
   Software without prior written authorization from Tavmjong Bah. For further
   information, contact: tavmjong @ free . fr.
 
-
-B:
-   MIT License
+C:
 
    Permission is hereby granted, free of charge, to any person obtaining
    a copy of this software and associated documentation files (the
@@ -200,792 +206,15 @@ B:
    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
-C:
-   New BSD License
-
-   Redistribution and use in source and binary forms, with or without modification,
-   are permitted provided that the following conditions are met:
-
-   1. Redistributions of source code must retain the above copyright notice, this list
-   of conditions and the following disclaimer.
-
-   2. Redistributions in binary form must reproduce the above copyright notice, this
-   list of conditions and the following disclaimer in the documentation and/or other
-   materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-   ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-   IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-   BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-   OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-   OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-D:
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
-   Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
-   Everyone is permitted to copy and distribute verbatim copies
-   of this license document, but changing it is not allowed.
-
-
-   This version of the GNU Lesser General Public License incorporates
-   the terms and conditions of version 3 of the GNU General Public
-   License, supplemented by the additional permissions listed below.
-
-   0. Additional Definitions.
-
-   As used herein, "this License" refers to version 3 of the GNU Lesser
-   General Public License, and the "GNU GPL" refers to version 3 of the GNU
-   General Public License.
-
-   "The Library" refers to a covered work governed by this License,
-   other than an Application or a Combined Work as defined below.
-
-   An "Application" is any work that makes use of an interface provided
-   by the Library, but which is not otherwise based on the Library.
-   Defining a subclass of a class defined by the Library is deemed a mode
-   of using an interface provided by the Library.
-
-   A "Combined Work" is a work produced by combining or linking an
-   Application with the Library.  The particular version of the Library
-   with which the Combined Work was made is also called the "Linked
-   Version".
-
-   The "Minimal Corresponding Source" for a Combined Work means the
-   Corresponding Source for the Combined Work, excluding any source code
-   for portions of the Combined Work that, considered in isolation, are
-   based on the Application, and not on the Linked Version.
-
-   The "Corresponding Application Code" for a Combined Work means the
-   object code and/or source code for the Application, including any data
-   and utility programs needed for reproducing the Combined Work from the
-   Application, but excluding the System Libraries of the Combined Work.
-
-   1. Exception to Section 3 of the GNU GPL.
-
-   You may convey a covered work under sections 3 and 4 of this License
-   without being bound by section 3 of the GNU GPL.
-
-   2. Conveying Modified Versions.
-
-   If you modify a copy of the Library, and, in your modifications, a
-   facility refers to a function or data to be supplied by an Application
-   that uses the facility (other than as an argument passed when the
-   facility is invoked), then you may convey a copy of the modified
-   version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-   3. Object Code Incorporating Material from Library Header Files.
-
-   The object code form of an Application may incorporate material from
-   a header file that is part of the Library.  You may convey such object
-   code under terms of your choice, provided that, if the incorporated
-   material is not limited to numerical parameters, data structure
-   layouts and accessors, or small macros, inline functions and templates
-   (ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-   4. Combined Works.
-
-   You may convey a Combined Work under terms of your choice that,
-   taken together, effectively do not restrict modification of the
-   portions of the Library contained in the Combined Work and reverse
-   engineering for debugging such modifications, if you also do each of
-   the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-   5. Combined Libraries.
-
-   You may place library facilities that are a work based on the
-   Library side by side in a single library together with other library
-   facilities that are not Applications and are not covered by this
-   License, and convey such a combined library under terms of your
-   choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-   6. Revised Versions of the GNU Lesser General Public License.
-
-   The Free Software Foundation may publish revised and/or new versions
-   of the GNU Lesser General Public License from time to time. Such new
-   versions will be similar in spirit to the present version, but may
-   differ in detail to address new problems or concerns.
-
-   Each version is given a distinguishing version number. If the
-   Library as you received it specifies that a certain numbered version
-   of the GNU Lesser General Public License "or any later version"
-   applies to it, you have the option of following the terms and
-   conditions either of that published version or of any later version
-   published by the Free Software Foundation. If the Library as you
-   received it does not specify a version number of the GNU Lesser
-   General Public License, you may choose any version of the GNU Lesser
-   General Public License ever published by the Free Software Foundation.
-
-   If the Library as you received it specifies that a proxy can decide
-   whether future versions of the GNU Lesser General Public License shall
-   apply, that proxy's public statement of acceptance of any version is
-   permanent authorization for you to choose that version for the
-   Library.
-
-
-E:
-  Duo
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
-
-  1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-  2. Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-  3. The name of the author may not be used to endorse or promote products
-     derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-F:  
-  3-Clause BSD License
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
-
-  1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-  2. Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-  3. Neither the name of the copyright holder nor the names of its
-     contributors may be used to endorse or promote products derived from
-     this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-G:
-  2-Clause BSD License
-
-  Redistribution and use in source and binary forms, with or without modification,
-  are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-
-  2. Redistributions in binary form must reproduce the above copyright notice,
-     this list of conditions and the following disclaimer in the documentation and/or
-     other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-  OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-  POSSIBILITY OF SUCH DAMAGE.
-
-
-H:
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-
-
 Programs and licenses with other licenses and/or authors than the
 main license and authors:
 
-lib/3rdParty/composer/beberlei                                       G  2013  Benjamin Eberlei
-lib/3rdParty/composer/composer                                       B        Nils Adermann, Jordi Boggiano
-lib/3rdParty/composer/fgrosse                                        B  2015  Friedrich Große
-lib/3rdParty/composer/nyholm                                         B  2016  Tobias Nyholm
-lib/3rdParty/composer/paragonie                                      B  2015  Paragon Initiative Enterprises
-lib/3rdParty/composer/pear-pear.horde.org/Horde_Crypt_Blowfish       H
-lib/3rdParty/composer/pear-pear.horde.org/Horde_Exception            H
-lib/3rdParty/composer/pear-pear.horde.org/Horde_Idna                 G
-lib/3rdParty/composer/pear-pear.horde.org/Horde_Imap_Client          H
-lib/3rdParty/composer/pear-pear.horde.org/Horde_ListHeaders          H
-lib/3rdParty/composer/pear-pear.horde.org/Horde_Mail                 G
-lib/3rdParty/composer/pear-pear.horde.org/Horde_Mime                 H
-lib/3rdParty/composer/pear-pear.horde.org/Horde_Secret               H
-lib/3rdParty/composer/pear-pear.horde.org/Horde_Socket_Client        H
-lib/3rdParty/composer/pear-pear.horde.org/Horde_Stream               H
-lib/3rdParty/composer/pear-pear.horde.org/Horde_Stream_Filter        H
-lib/3rdParty/composer/pear-pear.horde.org/Horde_Stream_Wrapper       G
-lib/3rdParty/composer/pear-pear.horde.org/Horde_Support              G
-lib/3rdParty/composer/pear-pear.horde.org/Horde_Text_Flowed          H
-lib/3rdParty/composer/pear-pear.horde.org/Horde_Translation          H
-lib/3rdParty/composer/pear-pear.horde.org/Horde_Util                 H
-lib/3rdParty/composer/php-http                                       B  2015  PHP HTTP Team
-lib/3rdParty/composer/phpmailer                                      H
-lib/3rdParty/composer/psr                                            B  2018  PHP Framework Interoperability Group
-lib/3rdParty/composer/ramsey                                         B  2018  Ben Ramsey
-lib/3rdParty/composer/spomky-labs                                    B  2018  Spomky-Labs
-lib/3rdParty/composer/symfony                                        B  2019  Fabien Potencier
-lib/3rdParty/composer/web-auth                                       B  2018  Spomky-Labs
-lib/3rdParty/tcpdf                                                   D  2020  Nicola Asuni - Tecnick.com LTD
-lib/3rdParty/tcpdf/fonts/dejavu*.z                                   A        Public Domain, Bitstream, Inc., Tavmjong Bah
-lib/3rdParty/phpseclib                                               B  2019  TerraFrost and other contributors
-lib/3rdParty/Monolog                                                 B  2011  Jordi Boggiano
-lib/3rdParty/Psr                                                     B  2012  PHP Framework Interoperability Group
-lib/3rdParty/yubico/Yubico.php                                       C  2015  Yubico AB
-templates/lib/*jquery*.js                                            B  2018  jQuery Foundation and other contributors
-style/120_jquery-ui*.css                                             B  2016  jQuery Foundation and other contributors
-templates/lib/*jquery-dropmenu-*.js                                  B  2010  Fred Heusschen
-style/150_jquery-dropmenu*.css                                       B  2010  Fred Heusschen
-templates/lib/*jquery-fineuploader-*.js                              B  2010  Andrew Valums
-style/150_jquery-fineuploader*.css                                   B  2010  Andrew Valums
-templates/lib/*jquery-validationEngine-*.js                          B  2010  Cedric Dugas and Olivier Refalo
-style/150_jquery-validationEngine*.css                               B  2010  Cedric Dugas and Olivier Refalo
-templates/lib/extra/cropperjs                                        B  2018  Chen Fengyuan
-style/600_cropper*.css                                               B  2018  Chen Fengyuan
-templates/lib/extra/duo/*.js                                         E  2019  Duo Security
-lib/3rdParty/duo/*.php                                               E  2019  Duo Security
-graphics/webauthn.svg                                                F  2017  Duo Security, Inc.
-templates/lib/600_jquery.magnific-popup.js                           B  2016  Dmitry Semenov
-style/610_magnific-popup.css                                         B  2016  Dmitry Semenov
-style/responsive/105_normalize.css                                   B        Nicolas Gallagher and Jonathan Neal
-style/responsive/110_grid.css                                        B
+lib/fpdf-lam.inc                            A  2008  Olivier Plathey
+lib/font/DejaVu*.ttf                        B        Public Domain, Bitstream, Inc., Tavmjong Bah
+lib/3rdParty/phpseclib                      C        Jim Wigginton
+templates/lib/*jquery*.js                   C  2010  John Resig, Paul Bakaus, Fred Heusschen
+templates/lib/*jquery-dropmenu-*.js         C  2010  Fred Heusschen
+templates/lib/*jquery-validationEngine-*.js C  2010  Cedric Dugas and Olivier Refalo
+templates/lib/*jquery-fineuploader-*.js     C  2010  Andrew Valums
+
 

lam/docs/devel/account_pages.htm

@@ -21,11 +21,11 @@ The main script for the account pages is located in <span
 a very simple content. If the page is loaded for the first time it
 creates a new <span style="font-weight: bold;">accountContainer</span>
 inside the session and tells it to load/create an LDAP account. Then it
-calls the <span style="font-weight: bold;">continue_main()</span>
+calles the <span style="font-weight: bold;">continue_main()</span>
 function of the <span style="font-weight: bold;">accountContainer</span>
 object which prints all HTML output.<br>
 <br>
-Managing of user input etc. is completely made by the <span
+Managing of user input etc. is completly made by the <span
  style="font-weight: bold;">accountContainer</span>.<br>
 <br>
 </body>

lam/docs/devel/config.htm

@@ -54,7 +54,7 @@ to make it easier for the user to modify the values. The dynamic
 options provided by the modules do not include a comment.<br>
 <br>
 <h2>Master configuration file</h2>
-LAM stores the default configuration profile and a master password in <span
+LAM stores the default configuartion profile and a master password in <span
  style="font-style: italic;">config/config.cfg</span>.<br>
 The master password is verified when the user wants to create/delete
 configuration profiles.<br>

lam/docs/devel/mod_accountPages.htm

@@ -39,7 +39,7 @@ attribute. Therefore we will save these two values.<br>
 &nbsp;&nbsp;&nbsp; * This function loads all needed attributes into the
 object.<br>
 &nbsp;&nbsp;&nbsp; *<br>
-&nbsp;&nbsp;&nbsp; * @param array $attr an array as it is returned from
+&nbsp;&nbsp;&nbsp; * @param array $attr an array as it is retured from
 ldap_get_attributes<br>
 &nbsp;&nbsp;&nbsp; */<br>
 &nbsp;&nbsp;&nbsp; <span style="font-weight: bold;">function</span> <span style="color: rgb(255, 0, 0);">load_attributes</span>($attr) {<br>

lam/docs/devel/mod_basics.htm

@@ -58,7 +58,7 @@ class</span> <span style="color: rgb(255, 0, 0);">ieee802Device</span>
 </table>
 <br>
 <h2>4. Meta data</h2>
-The module interface includes a lot of required and optional functions.
+The module interface inludes a lot of required and optional functions.
 Many of these functions do not need to be implemented directly in the
 module, you can define <span style="font-weight: bold;">meta data</span>
 for them and the <span style="font-weight: bold;">baseModule</span>

lam/docs/devel/mod_config.htm

@@ -137,7 +137,7 @@ the <span style="font-style: italic;">baseModule</span> will use the <span style
 check. This function already contains regular expressions for the most
 common cases.<br>
 To check if the minimum GID is smaller than the maximum GID we define a
-check for the nonexistent option "cmpGID" and define it as optional.
+check for the nonexistant option "cmpGID" and define it as optional.
 This will do the comparison check.<br>
 <br>
 <br>

lam/docs/devel/mod_general.htm

@@ -122,7 +122,7 @@ get_metaData() {<br>
 <br>
 <br>
 <h2>4. Dependencies</h2>
-Modules can depend on each other. This is useful if you need to access
+Modules can depend on eachother. This is useful if you need to access
 attributes from other modules or the managed object classes of your
 module are not structural.<br>
 <br>
@@ -198,7 +198,7 @@ is set dynamically<br>
 You can tell LAM what object classes are managed by your module.<br>
 LAM will then check the spelling of the objectClass attributes and
 correct it automatically. This is useful if other applications (e.g.
-smbldap-tools) also create accounts and the spelling is different.<br>
+smbldap-tools) also create accounts and the spelling is differnt.<br>
 <br>
 <span style="font-weight: bold; text-decoration: underline;">Example:</span><br>
 <br>

lam/docs/devel/mod_jobs.htm

@@ -21,7 +21,7 @@ They are configured on tab "Jobs" in LAM server profile.<br>
 <div style="text-align: left;">See ppolicyUser module for an example.<br>
 <br>
 <h2>Adding the job class</h2>
-The module defines the list of supported jobs with function
+The module defines the list of suuported jobs with function
 getSupportedJobs().<br>
 <table style="width: 100%; text-align: left;" class="mod-code" border="0" cellpadding="2" cellspacing="2">
   <tbody>
@@ -77,7 +77,7 @@ If your job requires any configuration options then use get/checkConfigOptions()
 <br>
 <h2>Database</h2>
 Jobs can access a database to read and store data about job runs. Use
-this e.g. if you need to save any status information across job runs.<br>
+this e.g. if you need to save any status information accross job runs.<br>
 Database access is specified with needsDatabaseAccess().<br>
 <br>
 There is a built-in database upgrade mechanism. Your job must return

lam/docs/devel/pdf_libs.htm

@@ -31,10 +31,11 @@ file, saves it to the <span style="font-style: italic;">tmp</span>
 folder and returns the file name.<br>
 <br>
 <br>
-The <span style="font-weight: bold;">LAMTCPDF</span> class extends the <span
- style="font-style: italic;">TCPDF</span> class and adds the LAM
+The <span style="font-weight: bold;">lamPDF</span> class extends the <span
+ style="font-style: italic;">UFPDF</span> class and adds the LAM
 specific header and footer.<br>
-It also defines the used font.<br>
+It also defines the used font. Currently only Bitstream-Vera is
+supported.<br>
 <br>
 </body>
 </html>

lam/docs/devel/profile_files.htm

@@ -18,7 +18,7 @@ designed to be editable by hand. They do not allow to add comments and
 have a simpler format.<br>
 <br>
 <h2>Format</h2>
-There is one option per line which is formatted: &lt;identifier&gt;:
+There is one option per line which is formated: &lt;identifier&gt;:
 &lt;value&gt;<br>
 <br>
 Identifier is the option's name, value is the rest of the line after

lam/docs/devel/tools.htm

@@ -88,10 +88,10 @@ class <span style="font-weight: bold;">toolProfileEditor</span> implements <span
 &nbsp;&nbsp;&nbsp; }<br>
 &nbsp;&nbsp;&nbsp; <br>
 &nbsp;&nbsp;&nbsp; /**<br>
-&nbsp;&nbsp;&nbsp; &nbsp;* Returns the preferred position of this tool on the tools page.<br>
+&nbsp;&nbsp;&nbsp; &nbsp;* Returns the prefered position of this tool on the tools page.<br>
 &nbsp;&nbsp;&nbsp; &nbsp;* The position may be between 0 and 1000. 0 is the top position.<br>
 &nbsp;&nbsp;&nbsp; &nbsp;*<br>
-&nbsp;&nbsp;&nbsp; &nbsp;* @return int preferred position<br>
+&nbsp;&nbsp;&nbsp; &nbsp;* @return int prefered position<br>
 &nbsp;&nbsp;&nbsp; &nbsp;*/<br>
 &nbsp;&nbsp;&nbsp; function <span style="font-weight: bold;">getPosition</span>() {<br>
 &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; return 100;<br>

lam/docs/devel/toolsHowTo.htm

@@ -91,10 +91,10 @@ Example:<br>
 <pre>&nbsp;&nbsp;&nbsp; }</pre>
 <pre>&nbsp;&nbsp;&nbsp; </pre>
 <pre>&nbsp;&nbsp;&nbsp; /**</pre>
-<pre>&nbsp;&nbsp;&nbsp; &nbsp;* Returns the preferred position of this tool on the tools page.</pre>
+<pre>&nbsp;&nbsp;&nbsp; &nbsp;* Returns the prefered position of this tool on the tools page.</pre>
 <pre>&nbsp;&nbsp;&nbsp; &nbsp;* The position may be between 0 and 1000. 0 is the top position.</pre>
 <pre>&nbsp;&nbsp;&nbsp; &nbsp;*</pre>
-<pre>&nbsp;&nbsp;&nbsp; &nbsp;* @return int preferred position</pre>
+<pre>&nbsp;&nbsp;&nbsp; &nbsp;* @return int prefered position</pre>
 <pre>&nbsp;&nbsp;&nbsp; &nbsp;*/</pre>
 <pre>&nbsp;&nbsp;&nbsp; function getPosition() {</pre>
 <pre>&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; return 600;</pre>

lam/docs/devel/type_list.htm

@@ -115,7 +115,7 @@ If you want to change more than just the labels, take a look at <span
  style="font-weight: bold;">lib/types/user.inc</span>. When a list is
 displayed then the <span style="font-weight: bold;">showPage()</span>
 function is called. You can overwrite this function to display a
-completely new list or just one of the other functions.<br>
+completly new list or just one of the other functions.<br>
 <br>
 <table style="width: 100%; text-align: left;" class="mod-code"
  border="0" cellpadding="2" cellspacing="2">

lam/docs/devel/upgrade.htm

@@ -22,7 +22,6 @@
 
 
 
-
 
 
 
@@ -60,45 +59,7 @@ This is a list of API changes for all LAM releases.
 
 <br>
 
-<h2>6.7 -&gt; 6.8</h2>
-<ul>
-  <li>Module API
-    <ul>
-        <li>display_html_attributes(): use responsive HTML elements instead of tables</li>
-    </ul>
-  </li>
-</ul>
-<h2>6.3 -&gt; 6.4</h2>
-<ul>
-  <li>Module API
-    <ul>
-        <li>get_profileOptions(): should no longer return a htmlTable but a htmlResponsiveRow</li>
-    </ul>
-  </li>
-</ul>
-<h2>6.2 -&gt; 6.3</h2>
-<ul>
-  <li>Module API
-    <ul>
-        <li>get_configOptions(): $allScopes contains type ids instead of account types</li>
-        <li>check_configOptions(): first parameter contains type ids instead of account types</li>
-    </ul>
-  </li>
-</ul>
-<h2>6.1 -&gt; 6.2</h2>
-<ul>
-  <li>No major API changes</li>
-</ul>
-<h2>6.0 -&gt; 6.1</h2>
-<ul>
-  <li>module API</li>
-  <ul>
-    <li>doUploadPreActions has new parameter $type</li>
-    <li>doUploadPostActions has new parameter $type</li>
-  </ul>
-</ul>
 <h2>5.7 -&gt; 6.0</h2>
-
 <ul>
   <li>All account types allow multiple configurations by default.</li>
   <li>the following&nbsp; methods in baseModule have a new parameter $typeId:</li>

lam/docs/manual-sources/appendix-email.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+  <appendix id="mailSetup">
+    <title>Setup of email (SMTP) server</title>
+
+    <para>LAM always uses a local SMTP email server on the machine where LAM
+    is installed. Therefore, there is no need to configure any SMTP settings
+    inside LAM itself.</para>
+
+    <para>The local email server should be configured to forward all emails to
+    your company mail server (so-called smarthost). You can use any SMTP
+    software that ships with a Sendmail wrapper (e.g. Exim, Postfix, QMail or
+    Sendmail itself).</para>
+
+    <literallayout>
+
+</literallayout>
+
+    <screenshot>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/lam_mail.png" />
+        </imageobject>
+      </mediaobject>
+    </screenshot>
+  </appendix>
+ 

lam/docs/manual-sources/appendix-schema.xml

@@ -14,7 +14,7 @@
     <tgroup cols="6">
       <thead>
         <row>
-          <entry/>
+          <entry></entry>
 
           <entry>Account type</entry>
 
@@ -32,7 +32,7 @@
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_unix.png"/>
+                <imagedata fileref="images/schema_unix.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -53,7 +53,7 @@
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_inetOrgPerson.png"/>
+                <imagedata fileref="images/schema_inetOrgPerson.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -65,13 +65,13 @@
 
           <entry>Part of OpenLDAP installation</entry>
 
-          <entry/>
+          <entry></entry>
         </row>
 
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_samba.png"/>
+                <imagedata fileref="images/schema_samba.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -83,13 +83,13 @@
 
           <entry>Part of Samba tarball (examples/LDAP/samba.schema)</entry>
 
-          <entry/>
+          <entry></entry>
         </row>
 
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_samba.png"/>
+                <imagedata fileref="images/schema_samba.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -97,35 +97,17 @@
 
           <entry>user, group, computer</entry>
 
-          <entry/>
+          <entry></entry>
 
           <entry>Samba 4 built-in</entry>
 
-          <entry/>
+          <entry></entry>
         </row>
 
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_samba.png"/>
-              </imageobject>
-            </inlinemediaobject></entry>
-
-          <entry>AD LDS</entry>
-
-          <entry>user, group</entry>
-
-          <entry/>
-
-          <entry>AD LDS built-in</entry>
-
-          <entry/>
-        </row>
-
-        <row>
-          <entry><inlinemediaobject>
-              <imageobject>
-                <imagedata fileref="images/schema_kolab.png"/>
+                <imagedata fileref="images/schema_kolab.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -137,13 +119,13 @@
 
           <entry>Part of Kolab 2/3 installation</entry>
 
-          <entry/>
+          <entry></entry>
         </row>
 
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_asterisk.png"/>
+                <imagedata fileref="images/schema_asterisk.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -155,13 +137,13 @@
 
           <entry>Part of Asterisk installation</entry>
 
-          <entry/>
+          <entry></entry>
         </row>
 
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_pykota.png"/>
+                <imagedata fileref="images/schema_pykota.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -174,13 +156,13 @@
 
           <entry>Part of PyKota installation</entry>
 
-          <entry/>
+          <entry></entry>
         </row>
 
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_mailAlias.png"/>
+                <imagedata fileref="images/schema_mailAlias.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -192,13 +174,13 @@
 
           <entry>Part of OpenLDAP installation</entry>
 
-          <entry/>
+          <entry></entry>
         </row>
 
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_hostObject.png"/>
+                <imagedata fileref="images/schema_hostObject.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -216,7 +198,7 @@
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_authorizedServices.png"/>
+                <imagedata fileref="images/schema_authorizedServices.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -228,13 +210,13 @@
 
           <entry>Part of libpam-ldap installation</entry>
 
-          <entry/>
+          <entry></entry>
         </row>
 
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_mailAlias.png"/>
+                <imagedata fileref="images/schema_mailAlias.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -246,13 +228,13 @@
 
           <entry>Part of OpenLDAP installation</entry>
 
-          <entry/>
+          <entry></entry>
         </row>
 
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_mailAlias.png"/>
+                <imagedata fileref="images/schema_mailAlias.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -271,7 +253,7 @@
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_mac.png"/>
+                <imagedata fileref="images/schema_mac.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -283,13 +265,13 @@
 
           <entry>Part of OpenLDAP installation</entry>
 
-          <entry/>
+          <entry></entry>
         </row>
 
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_ipHost.png"/>
+                <imagedata fileref="images/schema_ipHost.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -307,7 +289,7 @@
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_puppet.png"/>
+                <imagedata fileref="images/schema_puppet.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -321,13 +303,13 @@
           url="https://github.com/puppetlabs/puppet/blob/master/ext/ldap/puppet.schema">Puppet
           on GitHub</ulink></entry>
 
-          <entry/>
+          <entry></entry>
         </row>
 
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_eduPerson.png"/>
+                <imagedata fileref="images/schema_eduPerson.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -340,13 +322,13 @@
           <entry><ulink
           url="http://middleware.internet2.edu/eduperson/">http://middleware.internet2.edu</ulink></entry>
 
-          <entry/>
+          <entry></entry>
         </row>
 
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_user.png"/>
+                <imagedata fileref="images/schema_user.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -358,13 +340,13 @@
 
           <entry>Part of OpenLDAP installation</entry>
 
-          <entry/>
+          <entry></entry>
         </row>
 
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_ssh.png"/>
+                <imagedata fileref="images/schema_ssh.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -377,13 +359,13 @@
           <entry>Included in patch from <ulink
           url="http://code.google.com/p/openssh-lpk/">http://code.google.com/p/openssh-lpk/</ulink></entry>
 
-          <entry/>
+          <entry></entry>
         </row>
 
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_quota.png"/>
+                <imagedata fileref="images/schema_quota.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -397,13 +379,13 @@
           url="http://sourceforge.net/projects/linuxquota/">Linux
           DiskQuota</ulink></entry>
 
-          <entry/>
+          <entry></entry>
         </row>
 
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_group.png"/>
+                <imagedata fileref="images/schema_group.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -421,7 +403,7 @@
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_group.png"/>
+                <imagedata fileref="images/schema_group.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -439,7 +421,7 @@
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_dhcp.png"/>
+                <imagedata fileref="images/schema_dhcp.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -458,7 +440,7 @@
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_bind.png"/>
+                <imagedata fileref="images/schema_bind.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -478,7 +460,7 @@
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_alias.png"/>
+                <imagedata fileref="images/schema_alias.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -496,7 +478,7 @@
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_netgroup.png"/>
+                <imagedata fileref="images/schema_netgroup.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -508,13 +490,13 @@
 
           <entry>Part of OpenLDAP installation</entry>
 
-          <entry/>
+          <entry></entry>
         </row>
 
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_nisObject.png"/>
+                <imagedata fileref="images/schema_nisObject.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -532,7 +514,7 @@
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_nisObject.png"/>
+                <imagedata fileref="images/schema_nisObject.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -550,7 +532,7 @@
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_oracle.png"/>
+                <imagedata fileref="images/schema_oracle.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -571,7 +553,7 @@
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_ppolicy.png"/>
+                <imagedata fileref="images/schema_ppolicy.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -589,7 +571,7 @@
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_freeRadius.png"/>
+                <imagedata fileref="images/schema_freeRadius.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -601,13 +583,13 @@
 
           <entry>Part of FreeRadius installation</entry>
 
-          <entry/>
+          <entry></entry>
         </row>
 
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_heimdal.png"/>
+                <imagedata fileref="images/schema_heimdal.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -625,7 +607,7 @@
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_mitKerberos.png"/>
+                <imagedata fileref="images/schema_mitKerberos.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -643,7 +625,7 @@
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_sudo.png"/>
+                <imagedata fileref="images/schema_sudo.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -661,7 +643,7 @@
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_kopano.png"/>
+                <imagedata fileref="images/schema_kopano.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -680,7 +662,7 @@
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_zarafa.png"/>
+                <imagedata fileref="images/schema_zarafa.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -698,7 +680,7 @@
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_mailAlias.png"/>
+                <imagedata fileref="images/schema_mailAlias.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -716,7 +698,7 @@
         <row>
           <entry><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="images/schema_nsview.png"/>
+                <imagedata fileref="images/schema_nsview.png" />
               </imageobject>
             </inlinemediaobject></entry>
 
@@ -730,25 +712,6 @@
 
           <entry>LAM Pro only</entry>
         </row>
-
-        <row>
-          <entry><inlinemediaobject>
-              <imageobject>
-                <imagedata fileref="images/schema_autoDelete.png"/>
-              </imageobject>
-            </inlinemediaobject></entry>
-
-          <entry>All</entry>
-
-          <entry>dynamicObject</entry>
-
-          <entry>built-in with DDS module</entry>
-
-          <entry>Part of LDAP server installation</entry>
-
-          <entry>LAM Pro only, requires DDS extension on LDAP server
-          side</entry>
-        </row>
       </tbody>
     </tgroup>
   </table>

lam/docs/manual-sources/appendix-security.xml

@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<appendix id="a_security">
+  <appendix id="a_security">
     <title>Security</title>
 
     <section id="a_configPasswords">
       <title>LAM configuration passwords</title>
 
-    <para>LAM supports a two level authorization system for its configuration.
-    Therefore, there are two types of configuration passwords:</para>
+      <para>LAM supports a two level authorization system for its
+      configuration. Therefore, there are two types of configuration
+      passwords:</para>
 
       <itemizedlist>
         <listitem>
-        <para><emphasis role="bold">master configuration password:</emphasis>
-        needed to change general settings, create/delete server profiles and
-        self service profiles</para>
+          <para><emphasis role="bold">master configuration
+          password:</emphasis> needed to change general settings,
+          create/delete server profiles and self service profiles</para>
         </listitem>
 
         <listitem>
@@ -25,7 +26,8 @@
       </itemizedlist>
 
       <para>The master configuration password can be used to reset a server
-    profile password. Each server profile has its own profile password.</para>
+      profile password. Each server profile has its own profile
+      password.</para>
 
       <para>Both password types are stored as hash values in the configuration
       files for enhanced security.</para>
@@ -34,28 +36,29 @@
     <section>
       <title>Use of SSL</title>
 
-    <para>The data which is transferred between you and LAM is very sensitive.
-    Please always use SSL encrypted connections between LAM and your browser
-    to protect yourself against network sniffers.</para>
+      <para>The data which is transfered between you and LAM is very
+      sensitive. Please always use SSL encrypted connections between LAM and
+      your browser to protect yourself against network sniffers.</para>
     </section>
 
     <section>
       <title>LDAP with SSL and TLS</title>
 
-    <para>SSL will be used if you use ldaps://servername in your configuration
-    profile. TLS can be activated with the "Activate TLS" option.</para>
+      <para>SSL will be used if you use ldaps://servername in your
+      configuration profile. TLS can be activated with the "Activate TLS"
+      option.</para>
 
       <para>If your LDAP server uses a SSL certificate of a well-know
-    certificate authority (CA) then you probably need no changes. If you use a
-    custom CA in your company then there are two ways to setup the CA
+      certificate authority (CA) then you probably need no changes. If you use
+      a custom CA in your company then there are two ways to setup the CA
       certificates.</para>
 
       <section>
         <title>Setup SSL certificates in LAM general settings</title>
 
         <para>This is much easier than system level setup and will only affect
-      LAM. There might be some cases where other web applications on the same
-      web server are influenced.</para>
+        LAM. There might be some cases where other web applications on the
+        same web server are influenced.</para>
 
         <para>See <link linkend="conf_sslCert">here</link> for details.</para>
       </section>
@@ -66,10 +69,11 @@
         <para>This will make the CA certificates available also to other
         applications on your system (e.g. other web applications).</para>
 
-      <para>You will need to setup ldap.conf to trust your server certificate.
-      Some installations use /etc/ldap.conf and some use /etc/ldap/ldap.conf.
-      It is a good idea to symlink /etc/ldap.conf to /etc/ldap/ldap.conf.
-      Specify the server CA certificate with the following option:</para>
+        <para>You will need to setup ldap.conf to trust your server
+        certificate. Some installations use /etc/ldap.conf and some use
+        /etc/ldap/ldap.conf. It is a good idea to symlink /etc/ldap.conf to
+        /etc/ldap/ldap.conf. Specify the server CA certificate with the
+        following option:</para>
 
         <programlisting>TLS_CACERT /etc/ldap/ca/myCA/cacert.pem</programlisting>
 
@@ -90,8 +94,8 @@
       <title>Selinux</title>
 
       <para>In case your server has selinux installed you might need to extend
-    the selinux ruleset. E.g. your webserver might not be allowed to write in
-    /var/lib.</para>
+      the selinux ruleset. E.g. your webserver might not be allowed to write
+      in /var/lib.</para>
 
       <para><emphasis role="bold">Read selinux status</emphasis></para>
 
@@ -108,8 +112,8 @@
       <para><emphasis role="bold">Set selinux to Permissive
       mode</emphasis></para>
 
-    <para>This will just log any access violations. You will need this to get
-    a list of missing rights.</para>
+      <para>This will just log any access violations. You will need this to
+      get a list of missing rights.</para>
 
       <programlisting>setenforce Permissive</programlisting>
 
@@ -118,8 +122,8 @@
 
       <para><emphasis role="bold">Extend selinux rules</emphasis></para>
 
-    <para>Selinux now has logged any violations to audit.log. You can use this
-    now to extend your ruleset and enable enforcing later.</para>
+      <para>Selinux now has logged any violations to audit.log. You can use
+      this now to extend your ruleset and enable enforcing later.</para>
 
       <para>The following example is for httpd. You can also adapt it to e.g.
       nginx.</para>
@@ -165,12 +169,12 @@ semodule -i httpdlocal.pp</programlisting>
     <section>
       <title>Chrooted servers</title>
 
-    <para>If your server is chrooted and you have no access to /dev/random or
-    /dev/urandom this can be a security risk. LAM stores your LDAP password
-    encrypted in the session. LAM uses rand() to generate the key if
-    /dev/random and /dev/urandom are not accessible. Therefore the key can be
-    easily guessed. An attaker needs read access to the session file (e.g. by
-    another Apache instance) to exploit this.</para>
+      <para>If your server is chrooted and you have no access to /dev/random
+      or /dev/urandom this can be a security risk. LAM stores your LDAP
+      password encrypted in the session. LAM uses rand() to generate the key
+      if /dev/random and /dev/urandom are not accessible. Therefore the key
+      can be easily guessed. An attaker needs read access to the session file
+      (e.g. by another Apache instance) to exploit this.</para>
     </section>
 
     <section>
@@ -179,8 +183,8 @@ semodule -i httpdlocal.pp</programlisting>
       <para>You have to install the OpenSSL extension for PHP to enable
       encryption.</para>
 
-    <para>Your LDAP password is stored encrypted in the session file. The key
-    and IV to decrypt it are stored in two cookies. We use OpenSSL/AES to
+      <para>Your LDAP password is stored encrypted in the session file. The
+      key and IV to decrypt it are stored in two cookies. We use OpenSSL/AES to
       encrypt the password. All data that was read from LDAP and needs to be
       stored in the session file is also encrypted.</para>
     </section>
@@ -191,21 +195,21 @@ semodule -i httpdlocal.pp</programlisting>
       <section>
         <title>Sensitive directories</title>
 
-      <para>LAM includes several .htaccess files to protect your configuration
-      files and temporary data. Apache is often configured to not use
-      .htaccess files by default. Therefore, please check your Apache
-      configuration and change the override setting to:</para>
+        <para>LAM includes several .htaccess files to protect your
+        configuration files and temporary data. Apache is often configured to
+        not use .htaccess files by default. Therefore, please check your
+        Apache configuration and change the override setting to:</para>
 
         <para>AllowOverride All</para>
 
         <para>If you are experienced in configuring Apache then you can also
-      copy the security settings from the .htaccess files to your main Apache
-      configuration.</para>
+        copy the security settings from the .htaccess files to your main
+        Apache configuration.</para>
 
-      <para>If possible, you should not rely on .htaccess files but also move
-      the config and sess directory to a place outside of your WWW root. You
-      can put a symbolic link in the LAM directory so that LAM finds the
-      configuration/session files.</para>
+        <para>If possible, you should not rely on .htaccess files but also
+        move the config and sess directory to a place outside of your WWW
+        root. You can put a symbolic link in the LAM directory so that LAM
+        finds the configuration/session files.</para>
 
         <para>Security sensitive directories:</para>
 
@@ -256,8 +260,8 @@ semodule -i httpdlocal.pp</programlisting>
           </listitem>
 
           <listitem>
-          <para>directory contents must be accessible by browser but directory
-          itself needs not to be browsable</para>
+            <para>directory contents must be accessible by browser but
+            directory itself needs not to be browseable</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -265,14 +269,14 @@ semodule -i httpdlocal.pp</programlisting>
       <section id="apache_http_auth">
         <title>Use LDAP HTTP authentication for LAM</title>
 
-      <para>With HTTP authentication Apache will be responsible to ask for the
-      user name and password. Both will then be forwarded to LAM which will
-      use it to access LDAP. This approach gives you more flexibility to
-      restrict the number of users that may access LAM (e.g. by requiring
+        <para>With HTTP authentication Apache will be responsible to ask for
+        the user name and password. Both will then be forwarded to LAM which
+        will use it to access LDAP. This approach gives you more flexibility
+        to restrict the number of users that may access LAM (e.g. by requiring
         group memberships).</para>
 
-      <para>First of all you need to load additional Apache modules. These are
-      "<ulink
+        <para>First of all you need to load additional Apache modules. These
+        are "<ulink
         url="http://httpd.apache.org/docs/2.2/mod/mod_ldap.html">mod_ldap</ulink>"
         and "<ulink type=""
         url="http://httpd.apache.org/docs/2.2/mod/mod_authnz_ldap.html">mod_authnz_ldap</ulink>".</para>
@@ -313,13 +317,13 @@ semodule -i httpdlocal.pp</programlisting>
         <title>Self Service behind proxy in DMZ (LAM Pro)</title>
 
         <para>In some cases you might want to make the self service accessible
-      via the internet. Here is an Apache config to forward only the required
-      URLs via a proxy server (lamproxy.company.com) in your DMZ to the
-      internal LAM server (lam.company.com).</para>
+        via the internet. Here is an Apache config to forward only the
+        required URLs via a proxy server (lamproxy.company.com) in your DMZ to
+        the internal LAM server (lam.company.com).</para>
 
         <para><inlinemediaobject>
             <imageobject>
-            <imagedata fileref="images/selfServiceProxy.png"/>
+              <imagedata fileref="images/selfServiceProxy.png" />
             </imageobject>
           </inlinemediaobject></para>
 
@@ -333,7 +337,8 @@ semodule -i httpdlocal.pp</programlisting>
         CustomLog /var/log/apache2/lam-proxy-access.log combined
         DocumentRoot /var/www/lam-proxy
         &lt;Proxy *&gt;
-            Require all granted
+            Order deny,allow
+            Allow from all
         &lt;/Proxy&gt;
         SSLProxyEngine on
         SSLEngine on
@@ -374,8 +379,8 @@ semodule -i httpdlocal.pp</programlisting>
         <title>RPM based installations</title>
 
         <para>The RPM package has dependencies on Apache. Therefore, Nginx is
-      not officially supported with this installation mode. Use tar.bz2 if you
-      are unsure.</para>
+        not officially supported with this installation mode. Use tar.bz2 if
+        you are unsure.</para>
 
         <para>However, the package also includes an Nginx configuration file.
         Please include it in your server directive like this:</para>
@@ -387,10 +392,6 @@ semodule -i httpdlocal.pp</programlisting>
 
         ...
 }</programlisting>
-
-      <para>The included config file uses PHP 5. In case you run with PHP 7
-      please update the parameter "fastcgi_pass" to
-      "/var/run/php7-fpm.sock".</para>
       </section>
 
       <section>
@@ -402,14 +403,10 @@ semodule -i httpdlocal.pp</programlisting>
         <programlisting>server {
         ...
 
-        include /etc/ldap-account-manager/nginx.conf;
+        include /etc/ldap-account-manager/lam.nginx.conf;
 
         ...
 }</programlisting>
-
-      <para>The included config file uses PHP 7.0. In case you run with PHP
-      7.1 or PHP 5 please update the parameter "fastcgi_pass" to
-      "/var/run/php/php7.1-fpm.sock".</para>
       </section>
 
       <section>
@@ -419,9 +416,8 @@ semodule -i httpdlocal.pp</programlisting>
         directive.</para>
 
         <para>You will need to change the alias location
-      ("/usr/share/ldap-account-manager") and fastcgi_pass (e.g.
-      "/var/run/php5-fpm.sock" or "/var/run/php7-fpm.sock") to match your
-      installation.</para>
+        ("/usr/share/ldap-account-manager") and fastcgi_pass
+        ("/var/run/php5-fpm.sock") to match your installation.</para>
 
         <programlisting>location /lam {
   index index.html;
@@ -432,7 +428,6 @@ semodule -i httpdlocal.pp</programlisting>
     fastcgi_split_path_info ^(.+\.php)(/.+)$;
     fastcgi_pass unix:/var/run/php5-fpm.sock;
     fastcgi_index index.php;
-    fastcgi_param SCRIPT_FILENAME $request_filename;
     include fastcgi_params;
   }
 
@@ -445,51 +440,4 @@ semodule -i httpdlocal.pp</programlisting>
 </programlisting>
       </section>
     </section>
-
-  <section id="a_webauthn">
-    <title>Webauthn/FIDO2</title>
-
-    <para>LAM allows to secure logins via <ulink
-    url="https://en.wikipedia.org/wiki/WebAuthn">Webauthn/FIDO2</ulink>. This
-    means your users login with their LDAP password and an additional hardware
-    token (e.g. Yubico Security Key, Windows Hello and many more).</para>
-
-    <para>Webauthn/FIDO2 is a very strong 2-factor-authentication method as it
-    also checks the website domain. This prevents attacks via web
-    proxies.</para>
-
-    <para>To use this feature you need to activate the 2-factor authentication
-    in LAM.</para>
-
-    <para><emphasis role="bold">LAM admin interface</emphasis></para>
-
-    <para>Please activate Webauthn/FIDO2 in your <link
-    linkend="conf_serverprofile_2fa">LAM server profile</link>. Then users
-    will be asked to authenticate via Webauthn/FIDO2 on each login.</para>
-
-    <para>If no device is registered for a user then LAM will ask for this
-    during login. Afterwards, users can manage their devices with the <link
-    linkend="tool_webauthn">Webauthn tool</link>.</para>
-
-    <para><emphasis role="bold">LAM Self Service</emphasis></para>
-
-    <para>Please activate Webauthn/FIDO2 in your <link
-    linkend="selfservice_2fa">LAM self service profile</link>. Then users will
-    be asked to authenticate via Webauthn/FIDO2 on each login.</para>
-
-    <para>If no device is registered for a user then LAM will ask for this
-    during login. Afterwards, users can manage their devices with the <link
-    linkend="selfservice_fields">Webauthn field</link>.</para>
-
-    <para><emphasis role="bold">Global device management</emphasis></para>
-
-    <para>This is for cases where one of your users has no more access to his
-    device and cannot login anymore. In this case you can delete his device(s)
-    in the <link linkend="confmain_webauthn">LAM main
-    configuration</link>.</para>
-
-    <para>Note that devices can only be deleted. Registration of devices can
-    only be done by the user during login or on the management pages listed
-    above.</para>
-  </section>
-</appendix>
+  </appendix>

lam/docs/manual-sources/appendix-selfResetSchema.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<appendix id="a_passwordSelfResetSchema">
+  <appendix id="a_passwordSelfResetSchema">
     <title>Setup password self reset schema (LAM Pro)</title>
 
     <section id="passwordSelfResetSchema_new">
@@ -13,8 +13,8 @@
 
       <para><emphasis role="bold">Schema installation</emphasis></para>
 
-    <para>Please install the schema that comes with LAM Pro. The schema files
-    are located in:</para>
+      <para>Please install the schema that comes with LAM Pro. The schema
+      files are located in:</para>
 
       <itemizedlist>
         <listitem>
@@ -26,7 +26,8 @@
         </listitem>
 
         <listitem>
-        <para>RPM: /usr/share/doc/ldap-account-manager-{VERSION}/schema</para>
+          <para>RPM:
+          /usr/share/doc/ldap-account-manager-{VERSION}/schema</para>
         </listitem>
       </itemizedlist>
 
@@ -50,13 +51,12 @@
       <para>For slapd.d configurations you need to upload the schema file
       passwordSelfReset.ldif via ldapadd command:</para>
 
-    <para>ldapadd -x -W -H ldap://<emphasis>localhost</emphasis> -D
-    "<emphasis>cn=admin,o=test,c=de</emphasis>" -f
+      <para>ldapadd -x -W -H ldap://localhost -D "cn=admin,o=test,c=de" -f
       passwordSelfReset.ldif</para>
 
-    <para>Please replace "<emphasis>localhost</emphasis>" with your LDAP
-    server and "<emphasis>cn=admin,o=test,c=de</emphasis>" with your LDAP
-    admin user (usually starts with cn=admin or cn=manager).</para>
+      <para>Please replace "localhost" with your LDAP server and
+      "cn=admin,o=test,c=de" with your LDAP admin user (usually starts with
+      cn=admin or cn=manager).</para>
 
       <literallayout>
 </literallayout>
@@ -191,9 +191,10 @@
 
       <para><emphasis role="bold">Samba 4</emphasis></para>
 
-    <para>Install the these update files by following the install instructions
-    in the file. In case you you upgrade with a version difference of 2 or
-    more you will need to apply all intermediate update scripts.</para>
+      <para>Install the these update files by following the install
+      instructions in the file. In case you you upgrade with a version
+      difference of 2 or more you will need to apply all intermediate update
+      scripts.</para>
 
       <itemizedlist>
         <listitem>
@@ -217,7 +218,8 @@
         </listitem>
       </itemizedlist>
 
-    <para>Please note that attributes file needs to be installed first.</para>
+      <para>Please note that attributes file needs to be installed
+      first.</para>
 
       <literallayout>
 </literallayout>
@@ -230,7 +232,8 @@
 
       <itemizedlist>
         <listitem>
-        <para>windows_version_1_to_2.ldif (upgrade from version 1 only)</para>
+          <para>windows_version_1_to_2.ldif (upgrade from version 1
+          only)</para>
         </listitem>
 
         <listitem>
@@ -238,4 +241,5 @@
         </listitem>
       </itemizedlist>
     </section>
-</appendix>
+  </appendix>
+ 

lam/docs/manual-sources/appendix-troubleshooting.xml

@@ -85,7 +85,7 @@
 
       <para>If there are any object classes or attributes missing you will get
       a notice. See <link linkend="a_schema">LDAP schema files</link> for a
-      list of used schemas. You may also want to deactivate unused modules in
+      list of used schemas. You may also want to deactive unused modules in
       your LAM server profile (tab "Modules").</para>
 
       <screenshot>

lam/docs/manual-sources/chapter-accessLevel.xml

@@ -93,7 +93,9 @@
           <para>If the user account has set the mail attribute then LAM can
           send your user a mail with the new password. You can change the mail
           template to fit your needs. Please configure your LAM server profile
-          to setup the sender address, subject and mail body. See <link linkend="mailSetup">here</link> for setting up your
+          to setup the sender address, subject and mail body. Please see <link
+          linkend="mailEOL">email format option</link> in case of broken
+          mails. See <link linkend="mailSetup">here</link> for setting up your
           SMTP server.</para>
 
           <para>Using this method will prevent that your support staff knows

lam/docs/manual-sources/chapter-bigPicture.xml

@@ -292,7 +292,7 @@
 
       <para><emphasis role="bold">LAM runtime environment:</emphasis></para>
 
-      <para>LAM runs on PHP. Therefore, it is independent of CPU architecture
+      <para>LAM runs on PHP. Therefore, it is independant of CPU architecture
       and operating system (OS). You can run LAM on any OS which supports
       Apache, Nginx or other PHP compatible web servers.</para>
 

lam/docs/manual-sources/chapter-installation.xml

@@ -15,7 +15,7 @@
       <itemizedlist>
         <listitem>
           <para>Apache/Nginx webserver (SSL recommended) with PHP module (PHP
-          (&gt;= 7.0.0) with ldap, gettext, xml, openssl and optional
+          (&gt;= 5.4.0) with ldap, gettext, xml, openssl and optional
           OpenSSL)</para>
         </listitem>
 
@@ -44,8 +44,8 @@
               </listitem>
 
               <listitem>
-                <para>Internet Explorer 11 <emphasis
-                role="bold">(compatibility mode turned off)</emphasis></para>
+                <para>Internet Explorer 9 <emphasis role="bold">(compatibility
+                mode turned off)</emphasis></para>
               </listitem>
 
               <listitem>
@@ -85,7 +85,7 @@
               <row>
                 <entry><inlinemediaobject>
                     <imageobject>
-                      <imagedata fileref="images/debian.png"/>
+                      <imagedata fileref="images/debian.png" />
                     </imageobject>
                   </inlinemediaobject></entry>
 
@@ -133,11 +133,11 @@
               <row>
                 <entry><inlinemediaobject>
                     <imageobject>
-                      <imagedata fileref="images/suse.png"/>
+                      <imagedata fileref="images/suse.png" />
                     </imageobject>
-                  </inlinemediaobject><para/><inlinemediaobject>
+                  </inlinemediaobject><para></para><inlinemediaobject>
                     <imageobject>
-                      <imagedata fileref="images/fedora.png"/>
+                      <imagedata fileref="images/fedora.png" />
                     </imageobject>
                   </inlinemediaobject></entry>
 
@@ -150,9 +150,9 @@
                 role="bold">rpm -i &lt;path to LAM
                 package&gt;</emphasis></para><literallayout>
 </literallayout><para><emphasis role="bold">Note:</emphasis> The RPM packages
-                do not contain a dependency to PHP due to the various package
-                names for it. Please make sure that you install Apache/Nginx
-                with PHP.</para></entry>
+                for Fedora/CentOS do not contain a dependency to PHP due to
+                the various package names for it. Please make sure that you
+                install Apache/Nginx with PHP.</para></entry>
               </row>
             </tbody>
           </tgroup>
@@ -177,7 +177,7 @@
               <row>
                 <entry><inlinemediaobject>
                     <imageobject>
-                      <imagedata fileref="images/freebsd.png"/>
+                      <imagedata fileref="images/freebsd.png" />
                     </imageobject>
                   </inlinemediaobject></entry>
 
@@ -313,45 +313,6 @@
       </section>
     </section>
 
-    <section>
-      <title>Docker</title>
-
-      <para>You can run LAM inside Docker.</para>
-
-      <para>Possible environment variables are documented in the <ulink
-      url="https://github.com/LDAPAccountManager/lam/blob/develop/lam-packaging/docker/.env">sample
-      .env</ulink> file.</para>
-
-      <para>See here:</para>
-
-      <para><ulink
-      url="https://hub.docker.com/r/ldapaccountmanager/lam">https://hub.docker.com/r/ldapaccountmanager/lam</ulink></para>
-
-      <para/>
-
-      <para>LAM Pro:</para>
-
-      <para>Please request access at support providing your Docker Hub user
-      ID.</para>
-
-      <para><ulink
-      url="https://hub.docker.com/r/ldapaccountmanager/lampro">https://hub.docker.com/r/ldapaccountmanager/lampro</ulink></para>
-
-      <para><emphasis role="bold">Configuration files</emphasis></para>
-
-      <para>All configuration files are stored in:</para>
-
-      <itemizedlist>
-        <listitem>
-          <para>/etc/ldap-account-manager</para>
-        </listitem>
-
-        <listitem>
-          <para>/var/lib/ldap-account-manager</para>
-        </listitem>
-      </itemizedlist>
-    </section>
-
     <section>
       <title>System configuration</title>
 
@@ -613,79 +574,6 @@
       version. Unless explicitly noticed there is no need to install an
       intermediate release.</para>
 
-      <section>
-        <title>7.2 -&gt; 7.3</title>
-
-        <para>No actions required.</para>
-      </section>
-
-      <section>
-        <title>7.1 -&gt; 7.2</title>
-
-        <para>LAM Pro: All emails need a specified FROM address. This affects
-        password email, self registration, password self reset and cron
-        emails.</para>
-      </section>
-
-      <section>
-        <title>6.7 -&gt; 7.1</title>
-
-        <para>No actions required.</para>
-      </section>
-
-      <section>
-        <title>6.6 -&gt; 6.7</title>
-
-        <para>Self service: please verify the self service base URL in your
-        self service profiles in case you have password self reset / user self
-        registration enabled.</para>
-      </section>
-
-      <section>
-        <title>6.5 -&gt; 6.6</title>
-
-        <para>No actions required.</para>
-      </section>
-
-      <section>
-        <title>6.4 -&gt; 6.5</title>
-
-        <para>No actions required.</para>
-      </section>
-
-      <section>
-        <title>6.3 -&gt; 6.4</title>
-
-        <para>No actions needed.</para>
-      </section>
-
-      <section>
-        <title>6.2 -&gt; 6.3</title>
-
-        <para>Unix: Options in server profile for Unix users and groups need
-        to be reconfigured. Several settings (e.g. id generation) are now
-        specific to subaccount type.</para>
-
-        <para>Self Service: If you use a captcha for user self registration
-        this needs to be reconfigured. On tab General settings please activate
-        Google reCAPTCHA (the checkbox to secure login is optional). On tab
-        Module settings please tick the captcha checkbox at self registration
-        settings.</para>
-      </section>
-
-      <section>
-        <title>6.1 -&gt; 6.2</title>
-
-        <para>No actions required.</para>
-      </section>
-
-      <section>
-        <title>6.0 -&gt; 6.1</title>
-
-        <para>DEB+RPM configuration for nginx uses PHP 7 by default. Please
-        see /etc/ldap-account-manager/nginx.conf if you use PHP 5.</para>
-      </section>
-
       <section>
         <title>5.7 -&gt; 6.0</title>
 

lam/docs/manual-sources/chapter-tools.xml

@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> 
-<chapter>
+  <chapter>
     <title>Tools</title>
 
-  <para/>
+    <para></para>
 
     <section id="a_accountProfile">
       <title>Profile editor</title>
 
       <para>The account profiles are templates for your accounts. Here you can
-    specify default values which can then be loaded when you create accounts.
-    You may also load a template for an existing account to reset it to
-    default values. When you create a new account then LAM will always load
-    the profile named <emphasis role="bold">"default"</emphasis>. This account
-    profile can include default values for all your accounts.</para>
+      specify default values which can then be loaded when you create
+      accounts. You may also load a template for an existing account to reset
+      it to default values. When you create a new account then LAM will always
+      load the profile named <emphasis role="bold">"default"</emphasis>. This
+      account profile can include default values for all your accounts.</para>
 
       <screenshot>
         <mediaobject>
           <imageobject>
-          <imagedata fileref="images/profileEditor2.png"/>
+            <imagedata fileref="images/profileEditor2.png" />
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -30,7 +30,7 @@
       <screenshot>
         <mediaobject>
           <imageobject>
-          <imagedata fileref="images/profileEditor.png"/>
+            <imagedata fileref="images/profileEditor.png" />
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -43,7 +43,7 @@
       <screenshot>
         <mediaobject>
           <imageobject>
-          <imagedata fileref="images/profileEditor3.png"/>
+            <imagedata fileref="images/profileEditor3.png" />
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -51,47 +51,45 @@
       <screenshot>
         <mediaobject>
           <imageobject>
-          <imagedata fileref="images/profileEditor4.png"/>
+            <imagedata fileref="images/profileEditor4.png" />
           </imageobject>
         </mediaobject>
       </screenshot>
 
       <para>There is a special export target called "*Global templates". All
-    profiles exported here will be copied to all other server profiles (incl.
-    new ones). But existing profiles with the same name are not overwritten.
-    So a profile in global templates is treated as default profile for all
-    server profiles.</para>
+      profiles exported here will be copied to all other server profiles
+      (incl. new ones). But existing profiles with the same name are not
+      overwritten. So a profile in global templates is treated as default
+      profile for all server profiles.</para>
 
-    <para>Use this if you would like to setup default profiles that are valid
-    for all server profiles.</para>
+      <para>Use this if you would like to setup default profiles that are
+      valid for all server profiles.</para>
 
       <screenshot>
         <mediaobject>
           <imageobject>
-          <imagedata fileref="images/profileEditor5.png"/>
+            <imagedata fileref="images/profileEditor5.png" />
           </imageobject>
         </mediaobject>
       </screenshot>
     </section>
 
-  <section id="tool_upload">
+    <section>
       <title>File upload</title>
 
-    <para>When you need to create lots of accounts then you can use LAM's file
-    upload to create them. In contrast to <link linkend="tool_upload">LDAP
-    import/export</link> this operates on account type level.</para>
+      <para>When you need to create lots of accounts then you can use LAM's
+      file upload to create them. LAM will read a CSV formatted file and
+      create the related LDAP entries. Please check the data in you CSV file
+      carefully. LAM will do less checks for the file upload than for single
+      account creation.</para>
 
-    <para>LAM will read a CSV formatted file and create the related LDAP
-    entries. Please check the data in you CSV file carefully. LAM will do less
-    checks for the file upload than for single account creation.</para>
-
-    <para>At the first page please select the account type and what extensions
-    should be activated.</para>
+      <para>At the first page please select the account type and what
+      extensions should be activated.</para>
 
       <screenshot>
         <mediaobject>
           <imageobject>
-          <imagedata fileref="images/fileUpload1.png"/>
+            <imagedata fileref="images/fileUpload1.png" />
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -101,18 +99,18 @@
       CSV file. All red options are required columns in the file. You need to
       specify a value for each account.</para>
 
-    <para>When you upload the CSV file then LAM first does some checks on this
-    file. This includes syntax checks and if all required data was entered. No
-    changes in the LDAP directory are done at this time.</para>
+      <para>When you upload the CSV file then LAM first does some checks on
+      this file. This includes syntax checks and if all required data was
+      entered. No changes in the LDAP directory are done at this time.</para>
 
-    <para>If the checks were successful then LAM will ask again if you want to
-    create the accounts. You will also have the chance to check the upload by
-    viewing the changes in LDIF format.</para>
+      <para>If the checks were successful then LAM will ask again if you want
+      to create the accounts. You will also have the chance to check the
+      upload by viewing the changes in LDIF format.</para>
 
       <screenshot>
         <mediaobject>
           <imageobject>
-          <imagedata fileref="images/fileUpload2.png"/>
+            <imagedata fileref="images/fileUpload2.png" />
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -121,19 +119,20 @@
     <section>
       <title id="toolMultiEdit">Multi edit</title>
 
-    <para>This tool allows you to modify a large list of LDAP entries in batch
-    mode. You can add new attributes/object classes, remove attributes and set
-    attributes to a specific value.</para>
+      <para>This tool allows you to modify a large list of LDAP entries in
+      batch mode. You can add new attributes/object classes, remove attributes
+      and set attributes to a specific value.</para>
 
       <para>At the beginning, you need to specify where the entries are stored
-    that should be changed. You can select an account suffix, the tree suffix
-    or enter your own DN by selecting "Other".</para>
+      that should be changed. You can select an account suffix, the tree
+      suffix or enter your own DN by selecting "Other".</para>
 
       <para>Next, enter an additional LDAP filter to limit the entries that
       should be changed. E.g. use "(objectclass=inetOrgPerson)" to filter for
       users. You may also enter e.g. "(!(objectClass=passwordSelfReset))" to
       match all accounts that do not yet have the <link
-    linkend="passwordSelfResetUser">password self reset</link> feature.</para>
+      linkend="passwordSelfResetUser">password self reset</link>
+      feature.</para>
 
       <literallayout>
 </literallayout>
@@ -143,8 +142,9 @@
 
       <itemizedlist>
         <listitem>
-        <para>Add: Adds an attribute value if not yet existing. Please do not
-        use for single-value attributes that already have a value.</para>
+          <para>Add: Adds an attribute value if not yet existing. Please do
+          not use for single-value attributes that already have a
+          value.</para>
         </listitem>
 
         <listitem>
@@ -154,20 +154,20 @@
         </listitem>
 
         <listitem>
-        <para>Delete: Deletes the specified value from this attribute. If you
-        leave the value field blank then all attribute values are
+          <para>Delete: Deletes the specified value from this attribute. If
+          you leave the value field blank then all attribute values are
           removed.</para>
         </listitem>
       </itemizedlist>
 
-    <para>Please note that all actions are run as separate LDAP commands. You
-    cannot add an object class and a required attribute at the same
+      <para>Please note that all actions are run as separate LDAP commands.
+      You cannot add an object class and a required attribute at the same
       time.</para>
 
       <screenshot>
         <mediaobject>
           <imageobject>
-          <imagedata fileref="images/multiEdit1.png"/>
+            <imagedata fileref="images/multiEdit1.png" />
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -175,94 +175,34 @@
       <para><emphasis role="bold">Dry run</emphasis></para>
 
       <para>You should always start with a dry run. It will not do any changes
-    to your LDAP directory but print out all modifications that will be done.
-    You will also be able to download the changes in LDIF format to use with
-    ldapmodify. This is useful if you want to adjust some actions
+      to your LDAP directory but print out all modifications that will be
+      done. You will also be able to download the changes in LDIF format to
+      use with ldapmodify. This is useful if you want to adjust some actions
       manually.</para>
 
       <screenshot>
         <mediaobject>
           <imageobject>
-          <imagedata fileref="images/multiEdit2.png"/>
+            <imagedata fileref="images/multiEdit2.png" />
           </imageobject>
         </mediaobject>
       </screenshot>
 
       <para><emphasis role="bold">Apply changes</emphasis></para>
 
-    <para>This will run the actions against your LDAP directory. You will see
-    which accounts are edited in the progress area and also if any errors
-    occurred.</para>
+      <para>This will run the actions against your LDAP directory. You will
+      see which accounts are edited in the progress area and also if any
+      errors occured.</para>
 
       <screenshot>
         <mediaobject>
           <imageobject>
-          <imagedata fileref="images/multiEdit3.png"/>
+            <imagedata fileref="images/multiEdit3.png" />
           </imageobject>
         </mediaobject>
       </screenshot>
     </section>
 
-  <section id="tool_importexport">
-    <title>LDAP import/export</title>
-
-    <para>Here you can import and export plain LDAP data. In contrast to <link
-    linkend="tool_upload">file upload</link> this operates on plain LDAP
-    attribute level.</para>
-
-    <section>
-      <title>Import</title>
-
-      <para>The LDAP import supports input data in <ulink
-      url="https://en.wikipedia.org/wiki/LDAP_Data_Interchange_Format">LDIF</ulink>
-      format. You can provide plain text or upload an LDIF file.</para>
-
-      <para>The "Don't stop on errors" option will cause the import to
-      continue even if entries could not be created.</para>
-
-      <screenshot>
-        <graphic fileref="images/tool_import.png"/>
-      </screenshot>
-    </section>
-
-    <section>
-      <title>Export</title>
-
-      <para>Here you can export your plain LDAP data as LDIF or CSV
-      file.</para>
-
-      <screenshot>
-        <graphic fileref="images/tool_export.png"/>
-      </screenshot>
-
-      <para>Base DN: this is the starting point of the export. Enter a DN or
-      press the magnifying glass icon to open the DN selection dialog.</para>
-
-      <para>Search scope: You can export just the base DN, base DN + its
-      direct children or the whole subtree.</para>
-
-      <para>Search filter: this can be used to filter the entries by
-      specifying a standard LDAP filter. The preselected filter
-      "(objectclass=*)" matches all entries.</para>
-
-      <para>Attributes: the list of attributes that should be part of export.
-      "*" matches all standard attributes (excluding system
-      attributes).</para>
-
-      <para>Include system attributes: this will also include system
-      attributes like the entry creation time and creator's DN.</para>
-
-      <para>Save as file: will save to file instead of printing the data on
-      the web page.</para>
-
-      <para>Export format: you can select LDIF or CSV (e.g. for usage in
-      spreadsheet applications).</para>
-
-      <para>End of line: use the one appropriate for your operating
-      system.</para>
-    </section>
-  </section>
-
     <section>
       <title>OU editor</title>
 
@@ -272,7 +212,7 @@
       <screenshot>
         <mediaobject>
           <imageobject>
-          <imagedata fileref="images/ouEditor.png"/>
+            <imagedata fileref="images/ouEditor.png" />
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -288,20 +228,20 @@
       <screenshot>
         <mediaobject>
           <imageobject>
-          <imagedata fileref="images/pdfEditor2.png"/>
+            <imagedata fileref="images/pdfEditor2.png" />
           </imageobject>
         </mediaobject>
       </screenshot>
 
       <para>When you export accounts to PDF then each account will get its own
-    page inside the PDF. There is a headline on each page where you can show a
-    page title. You may also add a logo to each page. To add more logos please
-    use the logo management on the PDF editor main page.</para>
+      page inside the PDF. There is a headline on each page where you can show
+      a page title. You may also add a logo to each page. To add more logos
+      please use the logo management on the PDF editor main page.</para>
 
       <screenshot>
         <mediaobject>
           <imageobject>
-          <imagedata fileref="images/pdfEditor.png"/>
+            <imagedata fileref="images/pdfEditor.png" />
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -312,8 +252,8 @@
       can be moved by using the arrows next to the section title.</para>
 
       <para>Each section can contain multiple fields which usually represent
-    LDAP attributes. You can simply add new fields by selecting the field name
-    and its position. Then use the arrows to move the field inside the
+      LDAP attributes. You can simply add new fields by selecting the field
+      name and its position. Then use the arrows to move the field inside the
       section.</para>
 
       <literallayout>
@@ -327,7 +267,7 @@
       <screenshot>
         <mediaobject>
           <imageobject>
-          <imagedata fileref="images/pdfEditor3.png"/>
+            <imagedata fileref="images/pdfEditor3.png" />
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -335,24 +275,24 @@
       <screenshot>
         <mediaobject>
           <imageobject>
-          <imagedata fileref="images/pdfEditor4.png"/>
+            <imagedata fileref="images/pdfEditor4.png" />
           </imageobject>
         </mediaobject>
       </screenshot>
 
-    <para>There is a special export target called "*Global templates". All PDF
-    structures exported here will be copied to all other server profiles
+      <para>There is a special export target called "*Global templates". All
+      PDF structures exported here will be copied to all other server profiles
       (incl. new ones). But existing PDF structures with the same name are not
-    overwritten. So a PDF structure in global templates is treated as default
-    structure for all server profiles.</para>
+      overwritten. So a PDF structure in global templates is treated as
+      default structure for all server profiles.</para>
 
-    <para>Use this if you would like to setup default PDF structures that are
-    valid for all server profiles.</para>
+      <para>Use this if you would like to setup default PDF structures that
+      are valid for all server profiles.</para>
 
       <screenshot>
         <mediaobject>
           <imageobject>
-          <imagedata fileref="images/pdfEditor5.png"/>
+            <imagedata fileref="images/pdfEditor5.png" />
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -360,12 +300,13 @@
       <para><emphasis role="bold">Logo management:</emphasis></para>
 
       <para>You can upload image files to put a custom logo on the PDF files.
-    The image file name must end with .png or .jpg.</para>
+      The image file name must end with .png or .jpg and the size must not
+      exceed 2000x300px.</para>
 
       <screenshot>
         <mediaobject>
           <imageobject>
-          <imagedata fileref="images/pdfEditor6.png"/>
+            <imagedata fileref="images/pdfEditor6.png" />
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -382,7 +323,7 @@
       <screenshot>
         <mediaobject>
           <imageobject>
-          <imagedata fileref="images/schemaBrowser.png"/>
+            <imagedata fileref="images/schemaBrowser.png" />
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -393,8 +334,8 @@
 
       <para>This shows information and statistics about your LDAP server. This
       includes the suffixes, used overlays, connection data and operation
-    statistics. You will need "cn=monitor" setup to see all details. Some data
-    may not be available depending on your LDAP server software.</para>
+      statistics. You will need "cn=monitor" setup to see all details. Some
+      data may not be available depending on your LDAP server software.</para>
 
       <para>Please see the following links how to setup "cn=monitor":</para>
 
@@ -414,34 +355,17 @@
       <screenshot>
         <mediaobject>
           <imageobject>
-          <imagedata fileref="images/serverInfo.png"/>
+            <imagedata fileref="images/serverInfo.png" />
           </imageobject>
         </mediaobject>
       </screenshot>
     </section>
 
-  <section>
-    <title id="tool_webauthn">Webauthn devices</title>
-
-    <para>See the <link linkend="a_webauthn">Webauthn/FIDO2 appendix</link>
-    for an overview about Webauthn/FIDO2 in LAM.</para>
-
-    <para>Here you can manage your webauthn/FIDO2 devices.</para>
-
-    <para>You can register additional security devices and remove old ones. If
-    no more device is registered then LAM will ask you for registration on
-    next login.</para>
-
-    <screenshot>
-      <graphic fileref="images/tool_webauthn1.png"/>
-    </screenshot>
-  </section>
-
     <section>
       <title>Tests</title>
 
-    <para>This allows you to check if your LDAP schema is compatible with LAM
-    and to find possible problems.</para>
+      <para>This allows you to check if your LDAP schema is compatible with
+      LAM and to find possible problems.</para>
 
       <section>
         <title>Lamdaemon test</title>
@@ -457,7 +381,7 @@
         <screenshot>
           <mediaobject>
             <imageobject>
-            <imagedata fileref="images/lamdaemonTest.png"/>
+              <imagedata fileref="images/lamdaemonTest.png" />
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -466,21 +390,21 @@
       <section>
         <title>Schema test</title>
 
-      <para>This will test if your LDAP schema supports all object classes and
-      attributes of the active LAM modules. If you get a message that
+        <para>This will test if your LDAP schema supports all object classes
+        and attributes of the active LAM modules. If you get a message that
         something is missing please check that you installed all <link
         linkend="a_schema">required schemas</link>.</para>
 
-      <para>If you get error messages about object class violations then this
-      test can tell you what is missing.</para>
+        <para>If you get error messages about object class violations then
+        this test can tell you what is missing.</para>
 
         <screenshot>
           <mediaobject>
             <imageobject>
-            <imagedata fileref="images/schemaTest.png"/>
+              <imagedata fileref="images/schemaTest.png" />
             </imageobject>
           </mediaobject>
         </screenshot>
       </section>
     </section>
-</chapter>
+  </chapter>

lam/docs/manual-sources/howto.xml

@@ -15,6 +15,7 @@
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendix-schema.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendix-security.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendix-ldapConfig.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendix-email.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendix-lamdaemon.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendix-selfResetSchema.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendix-design.xml"/>