← Back to branch summary

~ubuntu-branches/ubuntu/quantal/xscreensaver/quantal

« back to all changes in this revision

Viewing changes to driver/passwd-pam.c

  • Committer: Bazaar Package Importer
  • Author(s): Ted Gould
  • Date: 2008-08-28 16:15:25 UTC
  • mfrom: (1.1.6 upstream) (2.1.3 lenny)
  • Revision ID: james.westby@ubuntu.com-20080828161525-mxga521aoezxjq8h
Tags: 5.07-0ubuntu1
* Upgrade upstream version
* debian/control: Remove suggest xdaliclock as it is no longer
  included
* Remove 10_jwz-screensaver-randr-patch-3.patch as it has been merged
  upstream.
* Add 24_hacks_xsublim_enable.patch as it seems that xsublim was dropped
  from the build files.  There is nothing in the Changelog about it
  so I believe it was accidental.
* Updating the .desktop files from the XML files using gnome-screensaver's
  utility to do so.  Lots of text updates.  Also:
    * Added: abstractile.desktop
    * Added: cwaves.desktop
    * Added: m6502.desktop
    * Added: skytentacles.desktop
    * Removed: xteevee.desktop
* xscreensaver-gl-extra.files: Added skytentacles
* xscreensaver-data-extra.files: Added abstractile, cwaves and m6502
* xscreensaver-data.files: Remove partial abstractile, m6502 and cwaves

Show diffs side-by-side

added added

removed removed

Lines of Context:
driver/passwd-pam.c
452
452
 
453
453
  ret = si->unlock_cb(nmsgs, messages, &authresp, si);
454
454
 
 
455
  /* #### If the user times out, or hits ESC or Cancel, we return PAM_CONV_ERR,
 
456
          and PAM logs this as an authentication failure.  It would be nice if
 
457
          there was some way to indicate that this was a "cancel" rather than
 
458
          a "fail", so that it wouldn't show up in syslog, but I think the
 
459
          only options are PAM_SUCCESS and PAM_CONV_ERR.  (I think that
 
460
          PAM_ABORT means "internal error", not "cancel".)  Bleh.
 
461
   */
 
462
 
455
463
  if (ret == 0)
456
464
    {
457
465
      for (i = 0; i < nmsgs; ++i)