← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libmisc/valid.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:
libmisc/valid.c
32
32
 
33
33
#include <config.h>
34
34
 
35
 
#ident "$Id: valid.c 2116 2008-06-10 21:52:34Z nekral-guest $"
 
35
#ident "$Id: valid.c 3232 2010-08-22 19:13:53Z nekral-guest $"
36
36
 
37
37
#include <sys/types.h>
38
38
#include <stdio.h>
52
52
bool valid (const char *password, const struct passwd *ent)
53
53
{
54
54
        const char *encrypted;
55
 
        const char *salt;
 
55
        /*@observer@*/const char *salt;
56
56
 
57
57
        /*
58
58
         * Start with blank or empty password entries.  Always encrypt