← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/pwunconv.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/pwunconv.c
32
32
 
33
33
#include <config.h>
34
34
 
35
 
#ident "$Id: pwunconv.c 2852 2009-04-30 21:44:35Z nekral-guest $"
 
35
#ident "$Id: pwunconv.c 3233 2010-08-22 19:36:09Z nekral-guest $"
36
36
 
37
37
#include <fcntl.h>
38
38
#include <pwd.h>
48
48
/*
49
49
 * Global variables
50
50
 */
51
 
char *Prog;
 
51
const char *Prog;
52
52
 
53
53
static bool spw_locked = false;
54
54
static bool pw_locked = false;
93
93
 
94
94
        OPENLOG ("pwunconv");
95
95
 
 
96
#ifdef WITH_TCB
 
97
        if (getdef_bool("USE_TCB")) {
 
98
                fprintf(stderr, _("%s: can't work with tcb enabled\n"), Prog);
 
99
                exit(1);
 
100
        }
 
101
#endif                          /* WITH_TCB */
 
102
 
96
103
        if (!spw_file_present ()) {
97
104
                /* shadow not installed, do nothing */
98
105
                exit (0);