Index: debian/univention-lightdm.univention-config-registry
===================================================================
--- debian/univention-lightdm.univention-config-registry	(Revision 40655)
+++ debian/univention-lightdm.univention-config-registry	(Revision 40690)
@@ -9,8 +9,44 @@
 File: etc/lightdm/lightdm-gtk-greeter.conf
 Variables: lightdm/wallpaper
 
-Type: file
-File: etc/pam.d/lightdm
+Type: multifile
+Multifile: etc/pam.d/lightdm
 
+Type: subfile
+Multifile: etc/pam.d/lightdm
+Subfile: etc/pam.d/lightdm.d/01univention-lightdm-head
+
+Type: subfile
+Multifile: etc/pam.d/lightdm
+Subfile: etc/pam.d/lightdm.d/10univention-lightdm-auth
+
+Type: subfile
+Multifile: etc/pam.d/lightdm
+Subfile: etc/pam.d/lightdm.d/15univention-lightdm-common-auth
+
+Type: subfile
+Multifile: etc/pam.d/lightdm
+Subfile: etc/pam.d/lightdm.d/20univention-lightdm-auth
+
+Type: subfile
+Multifile: etc/pam.d/lightdm
+Subfile: etc/pam.d/lightdm.d/25univention-lightdm-common-account
+
+Type: subfile
+Multifile: etc/pam.d/lightdm
+Subfile: etc/pam.d/lightdm.d/30univention-lightdm-session
+
+Type: subfile
+Multifile: etc/pam.d/lightdm
+Subfile: etc/pam.d/lightdm.d/35univention-lightdm-common-session
+
+Type: subfile
+Multifile: etc/pam.d/lightdm
+Subfile: etc/pam.d/lightdm.d/45univention-lightdm-common-password
+
+Type: subfile
+Multifile: etc/pam.d/lightdm
+Subfile: etc/pam.d/lightdm.d/40univention-lightdm-session
+
 Type: file
 File: etc/X11/default-display-manager
Index: conffiles/etc/pam.d/lightdm
===================================================================
--- conffiles/etc/pam.d/lightdm	(Revision 40655)
+++ conffiles/etc/pam.d/lightdm	(Revision 40690)
@@ -1,19 +0,0 @@
-@%@UCRWARNING=# @%@
-
-#%PAM-1.0
-auth    requisite       pam_nologin.so
-auth    required        pam_env.so readenv=1
-auth    required        pam_env.so readenv=1 envfile=/etc/default/locale
-auth    sufficient      pam_succeed_if.so user ingroup nopasswdlogin
-@include common-auth
-auth	required	pam_runasroot.so save_pass
-auth    optional        pam_gnome_keyring.so
-@include common-account
-session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
-session         required        pam_runasroot.so export_pass program=/usr/bin/univention-lightdm-save-pass
-session required        pam_limits.so
-session optional                        pam_runasroot.so program=/usr/sbin/univention-ucc-fetch-user-policies
-@include common-session
-session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
-session optional        pam_gnome_keyring.so auto_start
-@include common-password
Index: conffiles/etc/pam.d/lightdm.d/15univention-lightdm-common-auth
===================================================================
--- conffiles/etc/pam.d/lightdm.d/15univention-lightdm-common-auth	(Revision 0)
+++ conffiles/etc/pam.d/lightdm.d/15univention-lightdm-common-auth	(Revision 40690)
@@ -0,0 +1 @@
+@include common-auth
Index: conffiles/etc/pam.d/lightdm.d/35univention-lightdm-common-session
===================================================================
--- conffiles/etc/pam.d/lightdm.d/35univention-lightdm-common-session	(Revision 0)
+++ conffiles/etc/pam.d/lightdm.d/35univention-lightdm-common-session	(Revision 40690)
@@ -0,0 +1 @@
+@include common-session
Index: conffiles/etc/pam.d/lightdm.d/45univention-lightdm-common-password
===================================================================
--- conffiles/etc/pam.d/lightdm.d/45univention-lightdm-common-password	(Revision 0)
+++ conffiles/etc/pam.d/lightdm.d/45univention-lightdm-common-password	(Revision 40690)
@@ -0,0 +1 @@
+@include common-password
Index: conffiles/etc/pam.d/lightdm.d/01univention-lightdm-head
===================================================================
--- conffiles/etc/pam.d/lightdm.d/01univention-lightdm-head	(Revision 0)
+++ conffiles/etc/pam.d/lightdm.d/01univention-lightdm-head	(Revision 40690)
@@ -0,0 +1 @@
+@%@UCRWARNING=# @%@
Index: conffiles/etc/pam.d/lightdm.d/10univention-lightdm-auth
===================================================================
--- conffiles/etc/pam.d/lightdm.d/10univention-lightdm-auth	(Revision 0)
+++ conffiles/etc/pam.d/lightdm.d/10univention-lightdm-auth	(Revision 40690)
@@ -0,0 +1,4 @@
+auth requisite  pam_nologin.so
+auth required   pam_env.so readenv=1
+auth required   pam_env.so readenv=1 envfile=/etc/default/locale
+auth sufficient pam_succeed_if.so user ingroup nopasswdlogin
Index: conffiles/etc/pam.d/lightdm.d/20univention-lightdm-auth
===================================================================
--- conffiles/etc/pam.d/lightdm.d/20univention-lightdm-auth	(Revision 0)
+++ conffiles/etc/pam.d/lightdm.d/20univention-lightdm-auth	(Revision 40690)
@@ -0,0 +1,2 @@
+auth required pam_runasroot.so save_pass
+auth optional pam_gnome_keyring.so
Index: conffiles/etc/pam.d/lightdm.d/30univention-lightdm-session
===================================================================
--- conffiles/etc/pam.d/lightdm.d/30univention-lightdm-session	(Revision 0)
+++ conffiles/etc/pam.d/lightdm.d/30univention-lightdm-session	(Revision 40690)
@@ -0,0 +1,4 @@
+session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
+session required pam_runasroot.so export_pass program=/usr/bin/univention-lightdm-save-pass
+session required pam_limits.so
+session optional pam_runasroot.so program=/usr/sbin/univention-ucc-fetch-user-policies
Index: conffiles/etc/pam.d/lightdm.d/40univention-lightdm-session
===================================================================
--- conffiles/etc/pam.d/lightdm.d/40univention-lightdm-session	(Revision 0)
+++ conffiles/etc/pam.d/lightdm.d/40univention-lightdm-session	(Revision 40690)
@@ -0,0 +1,2 @@
+session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
+session optional pam_gnome_keyring.so auto_start
Index: conffiles/etc/pam.d/lightdm.d/25univention-lightdm-common-account
===================================================================
--- conffiles/etc/pam.d/lightdm.d/25univention-lightdm-common-account	(Revision 0)
+++ conffiles/etc/pam.d/lightdm.d/25univention-lightdm-common-account	(Revision 40690)
@@ -0,0 +1 @@
+@include common-account