1 Bug 16559 - xscreensaver shows extra messages

     2 https://defect.opensolaris.org/bz/show_bug.cgi?id=16559

     3 

     4 Make messages that annoy users only appear when verbose is set.

     5 (Upstream wasn't showing these until we started capturing stderr.)

     6 ---

     7  driver/passwd.c |   12 +++++++++---

     8  1 files changed, 9 insertions(+), 3 deletions(-)

     9 

    10 diff --git a/driver/passwd.c b/driver/passwd.c

    11 --- a/driver/passwd.c

    12 +++ b/driver/passwd.c

    13 @@ -283,8 +283,11 @@ xss_authenticate(saver_info *si, Bool verbose_p)

    14            si->cached_passwd &&

    15            !*si->cached_passwd)

    16          {

    17 -          fprintf (stderr, "%s: assuming null password means cancel.\n",

    18 -                   blurb());

    19 +          if (verbose_p)

    20 +            {

    21 +              fprintf (stderr, "%s: assuming null password means cancel.\n",

    22 +                       blurb());

    23 +            }

    24            si->unlock_state = ul_cancel;

    25          }

    26  

    27 @@ -313,11 +316,14 @@ xss_authenticate(saver_info *si, Bool verbose_p)

    28          {

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

    30               next auth method!  We're done! */

    31 -          fprintf (stderr,

    32 +          if (verbose_p)

    33 +            {

    34 +              fprintf (stderr,

    35                     "%s: authentication via %s %s.\n",

    36                         blurb(), methods[i].name,

    37                     (si->unlock_state == ul_cancel

    38                      ? "cancelled" : "timed out"));

    39 +            }

    40            goto DONE;

    41          }

    42      }

    43