← Back to branch summary

~ubuntu-branches/ubuntu/quantal/shadow/quantal

« back to all changes in this revision

Viewing changes to libmisc/setupenv.c

  • Committer: Bazaar Package Importer
  • Author(s): Nicolas Valcárcel Scerpella (Canonical)
  • Date: 2009-11-07 04:55:18 UTC
  • mfrom: (1.1.8 upstream) (18.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20091107045518-qqclg1lhinz6zv1i
Tags: 1:4.1.4.2-1ubuntu1
https://launchpad.net/bugs/477299
* Merged with debian unstable. Remaning changes (LP: #477299):
  - Ubuntu specific:
    + debian/login.defs: use SHA512 by default for password crypt routine.
  - 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/setupenv.c
36
36
 
37
37
#include <config.h>
38
38
 
39
 
#ident "$Id: setupenv.c 2787 2009-04-24 22:46:06Z nekral-guest $"
 
39
#ident "$Id: setupenv.c 3034 2009-07-22 13:30:06Z nekral-guest $"
40
40
 
41
41
#include <assert.h>
42
42
#include <sys/types.h>
242
242
         */
243
243
 
244
244
        if ((NULL == info->pw_shell) || ('\0' == *info->pw_shell)) {
245
 
                static char temp_pw_shell[] = "/bin/sh";
 
245
                static char temp_pw_shell[] = SHELL;
246
246
 
247
247
                info->pw_shell = temp_pw_shell;
248
248
        }