summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2015-09-30 10:49:48 +1300
committerRobert Ancell <robert.ancell@canonical.com>2015-09-30 10:49:48 +1300
commitf22f28ac8cc2f2367333d8e4aba2ff0fe0a20e2c (patch)
tree4a817b93b1f0dcf0731757e28533d68e3cc38075
parent22c215f0f660b141c8e68abbfb1061cc6524edae (diff)
downloadlightdm-git-f22f28ac8cc2f2367333d8e4aba2ff0fe0a20e2c.tar.gz
Disable libaudit support for now - Unity is not unlocking with these changes
-rw-r--r--debian/lightdm.lightdm-autologin.pam2
-rw-r--r--debian/lightdm.pam2
-rwxr-xr-xdebian/rules2
3 files changed, 3 insertions, 3 deletions
diff --git a/debian/lightdm.lightdm-autologin.pam b/debian/lightdm.lightdm-autologin.pam
index f42a4f47..5053ebde 100644
--- a/debian/lightdm.lightdm-autologin.pam
+++ b/debian/lightdm.lightdm-autologin.pam
@@ -3,7 +3,7 @@ auth requisite pam_nologin.so
auth required pam_permit.so
@include common-account
session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
-session required pam_loginuid.so
+#session required pam_loginuid.so
session required pam_limits.so
@include common-session
session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
diff --git a/debian/lightdm.pam b/debian/lightdm.pam
index c97f2ad6..5b8d477e 100644
--- a/debian/lightdm.pam
+++ b/debian/lightdm.pam
@@ -6,7 +6,7 @@ auth optional pam_gnome_keyring.so
auth optional pam_kwallet.so
@include common-account
session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
-session required pam_loginuid.so
+#session required pam_loginuid.so
session required pam_limits.so
@include common-session
session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
diff --git a/debian/rules b/debian/rules
index b83cccfe..41abea09 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ override_dh_autoreconf:
# NOTE: Using GNOME for now, but we still need a proper configuration system
# See https://launchpad.net/bugs/799754
override_dh_auto_configure:
- dh_auto_configure -- --with-greeter-user=lightdm --with-user-session=ubuntu --enable-gtk-doc
+ dh_auto_configure -- --with-greeter-user=lightdm --with-user-session=ubuntu --enable-gtk-doc --disable-audit
override_dh_auto_test:
#Disabled for now, are failing for some reason