summaryrefslogtreecommitdiff
path: root/debian/patches/backport-do-not-resend-username-to-pam.patch
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2015-11-24 20:45:21 +0000
committerColin Watson <cjwatson@debian.org>2015-11-24 20:49:53 +0000
commit1d6c1c2b9f5e85070c9c12442a140f592ebc0064 (patch)
tree298b8a4b9b7bd25c92dd9dcd9c6df65791a6a3da /debian/patches/backport-do-not-resend-username-to-pam.patch
parentc1f965684b54bed51e8cb1e7a2f3d2003d64d341 (diff)
parent11ff24a98751edfc86ef0eed102f840eaa50d4e1 (diff)
Drop ConsoleKit session registration patch; it was only ever enabled for Ubuntu, which no longer needs it (LP: #1334916, #1502045).
Diffstat (limited to 'debian/patches/backport-do-not-resend-username-to-pam.patch')
-rw-r--r--debian/patches/backport-do-not-resend-username-to-pam.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches/backport-do-not-resend-username-to-pam.patch b/debian/patches/backport-do-not-resend-username-to-pam.patch
index 694b4481c..865221b4f 100644
--- a/debian/patches/backport-do-not-resend-username-to-pam.patch
+++ b/debian/patches/backport-do-not-resend-username-to-pam.patch
@@ -1,4 +1,4 @@
1From 8d73726cdce65479aaad386c290c71176dc83e31 Mon Sep 17 00:00:00 2001 1From 4e1468d9745c5e32d99cd85386dfc74e90a5cf14 Mon Sep 17 00:00:00 2001
2From: Damien Miller <djm@mindrot.org> 2From: Damien Miller <djm@mindrot.org>
3Date: Tue, 11 Aug 2015 13:33:24 +1000 3Date: Tue, 11 Aug 2015 13:33:24 +1000
4Subject: Don't resend username to PAM; it already has it. 4Subject: Don't resend username to PAM; it already has it.
@@ -16,10 +16,10 @@ Patch-Name: backport-do-not-resend-username-to-pam.patch
16 2 files changed, 3 deletions(-) 16 2 files changed, 3 deletions(-)
17 17
18diff --git a/monitor.c b/monitor.c 18diff --git a/monitor.c b/monitor.c
19index 12ed6fd..870a6b9 100644 19index 3a3d2f0..3fc9253 100644
20--- a/monitor.c 20--- a/monitor.c
21+++ b/monitor.c 21+++ b/monitor.c
22@@ -1143,9 +1143,7 @@ extern KbdintDevice sshpam_device; 22@@ -1127,9 +1127,7 @@ extern KbdintDevice sshpam_device;
23 int 23 int
24 mm_answer_pam_init_ctx(int sock, Buffer *m) 24 mm_answer_pam_init_ctx(int sock, Buffer *m)
25 { 25 {
@@ -30,7 +30,7 @@ index 12ed6fd..870a6b9 100644
30 sshpam_authok = NULL; 30 sshpam_authok = NULL;
31 buffer_clear(m); 31 buffer_clear(m);
32diff --git a/monitor_wrap.c b/monitor_wrap.c 32diff --git a/monitor_wrap.c b/monitor_wrap.c
33index 2a0fe9b..e2fcf75 100644 33index 6ae72a0..6799911 100644
34--- a/monitor_wrap.c 34--- a/monitor_wrap.c
35+++ b/monitor_wrap.c 35+++ b/monitor_wrap.c
36@@ -632,7 +632,6 @@ mm_sshpam_init_ctx(Authctxt *authctxt) 36@@ -632,7 +632,6 @@ mm_sshpam_init_ctx(Authctxt *authctxt)