19098N/ABug 16559 - xscreensaver shows extra messages

19098N/A

19098N/AMake messages that annoy users only appear when verbose is set.

19098N/A(Upstream wasn't showing these until we started capturing stderr.)

19098N/A---

19098N/A driver/passwd.c | 12 +++++++++---

19098N/A 1 files changed, 9 insertions(+), 3 deletions(-)

19098N/A

19098N/Adiff --git xscreensaver-5.12/driver/passwd.c xscreensaver-5.12/driver/passwd.c

19098N/A--- xscreensaver-5.12/driver/passwd.c

19098N/A+++ xscreensaver-5.12/driver/passwd.c

19098N/A@@ -279,8 +279,11 @@ xss_authenticate(saver_info *si, Bool verbose_p)

19098N/A si->cached_passwd &&

19098N/A !*si->cached_passwd)

19098N/A {

19098N/A- fprintf (stderr, "%s: assuming null password means cancel.\n",

19098N/A- blurb());

19098N/A+ if (verbose_p)

19098N/A+ {

19098N/A+ fprintf (stderr, "%s: assuming null password means cancel.\n",

19098N/A+ blurb());

19098N/A+ }

19098N/A si->unlock_state = ul_cancel;

19098N/A }

19098N/A

19098N/A@@ -309,11 +312,14 @@ xss_authenticate(saver_info *si, Bool verbose_p)

19098N/A {

19098N/A /* If any auth method gets a cancel or timeout, don't try the

19098N/A next auth method! We're done! */

19098N/A- fprintf (stderr,

19098N/A+ if (verbose_p)

19098N/A+ {

19098N/A+ fprintf (stderr,

19098N/A "%s: authentication via %s %s.\n",

19098N/A blurb(), methods[i].name,

19098N/A (si->unlock_state == ul_cancel

19098N/A ? "cancelled" : "timed out"));

19098N/A+ }

19098N/A goto DONE;

19098N/A }

19098N/A }

19098N/A