← Back to branch summary

~ubuntu-branches/ubuntu/raring/shadow/raring-proposed

« back to all changes in this revision

Viewing changes to src/pwconv.c

  • Committer: Bazaar Package Importer
  • Author(s): Oliver Grawert
  • Date: 2010-11-24 13:42:42 UTC
  • mfrom: (1.1.9 upstream) (18.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20101124134242-832f4tew5s81ntj7
Tags: 1:4.1.4.2+svn3283-2ubuntu1
* Merge from debian unstable.  Remaining changes:
  - Ubuntu specific:
    + debian/login.defs: use SHA512 by default for password crypt routine.
  - debian/{source_shadow.py,rules}: Add apport hook
  - debian/rules: fix FTBFS from newer libtools
  - debian/patches/495_stdout-encrypted-password: chpasswd can report
    password hashes on stdout (Debian bug 505640).
  - Rework 495_stdout-encrypted-password to cope with chpasswd using PAM.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/pwconv.c
55
55
 
56
56
#include <config.h>
57
57
 
58
 
#ident "$Id: pwconv.c 2851 2009-04-30 21:39:38Z nekral-guest $"
 
58
#ident "$Id: pwconv.c 3233 2010-08-22 19:36:09Z nekral-guest $"
59
59
 
60
60
#include <errno.h>
61
61
#include <fcntl.h>
86
86
/*
87
87
 * Global variables
88
88
 */
89
 
char *Prog;
 
89
const char *Prog;
90
90
 
91
91
static bool spw_locked = false;
92
92
static bool pw_locked = false;
133
133
 
134
134
        OPENLOG ("pwconv");
135
135
 
 
136
#ifdef WITH_TCB
 
137
        if (getdef_bool("USE_TCB")) {
 
138
                fprintf(stderr, _("%s: can't work with tcb enabled\n"), Prog);
 
139
                fail_exit(E_FAILURE);
 
140
        }
 
141
#endif                          /* WITH_TCB */
 
142
 
136
143
        if (pw_lock () == 0) {
137
144
                fprintf (stderr,
138
145
                         _("%s: cannot lock %s; try again later.\n"),