author | Jon Tibble <meths@btinternet.com> |
Sat, 06 Oct 2012 16:11:50 +0100 | |
branch | s11express-2010-11 |
changeset 22109 | db10202d5f6d |
parent 21473 | 8a5e3434934f |
permissions | -rw-r--r-- |
21473
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
1 |
Bug 16559 - xscreensaver shows extra messages |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
2 |
https://defect.opensolaris.org/bz/show_bug.cgi?id=16559 |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
3 |
CR 7017539 P3 gnome/screensaver Xscreensaver shows a "Authentication via PAM timed out" message |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
4 |
|
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
5 |
Make messages that annoy users only appear when verbose is set. |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
6 |
(Upstream wasn't showing these until we started capturing stderr.) |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
7 |
|
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
8 |
--- |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
9 |
driver/passwd.c | 12 +++++++++--- |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
10 |
1 files changed, 9 insertions(+), 3 deletions(-) |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
11 |
|
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
12 |
diff --git xscreensaver-5.11/driver/passwd.c xscreensaver-5.11/driver/passwd.c |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
13 |
--- xscreensaver-5.11/driver/passwd.c |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
14 |
+++ xscreensaver-5.11/driver/passwd.c |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
15 |
@@ -283,8 +283,11 @@ xss_authenticate(saver_info *si, Bool verbose_p) |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
16 |
si->cached_passwd && |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
17 |
!*si->cached_passwd) |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
18 |
{ |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
19 |
- fprintf (stderr, "%s: assuming null password means cancel.\n", |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
20 |
- blurb()); |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
21 |
+ if (verbose_p) |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
22 |
+ { |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
23 |
+ fprintf (stderr, "%s: assuming null password means cancel.\n", |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
24 |
+ blurb()); |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
25 |
+ } |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
26 |
si->unlock_state = ul_cancel; |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
27 |
} |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
28 |
|
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
29 |
@@ -313,11 +316,14 @@ xss_authenticate(saver_info *si, Bool verbose_p) |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
30 |
{ |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
31 |
/* If any auth method gets a cancel or timeout, don't try the |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
32 |
next auth method! We're done! */ |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
33 |
- fprintf (stderr, |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
34 |
+ if (verbose_p) |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
35 |
+ { |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
36 |
+ fprintf (stderr, |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
37 |
"%s: authentication via %s %s.\n", |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
38 |
blurb(), methods[i].name, |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
39 |
(si->unlock_state == ul_cancel |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
40 |
? "cancelled" : "timed out")); |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
41 |
+ } |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
42 |
goto DONE; |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
43 |
} |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
44 |
} |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
45 |
1.7.3.2 |
8a5e3434934f
Updated xscreensaver-14-pam_audit.diff to fix bug screensaver continues to accept old password. Bug 7008058
akumrao
parents:
diff
changeset
|
46 |