diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-06-04 11:32:42 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-06-04 11:32:42 +0000 |
| commit | 18f565e2902ad18cc1d8b64cdb3fcd963f830fc8 (patch) | |
| tree | 7a346fa6ae15a2c472c01b5a227af48dad4053fb /pkgs/os-specific/linux/shadow/keep-path.patch | |
| parent | 3c3d5d5184c9860ba9cdf571306078b209b5ee52 (diff) | |
| download | nixpkgs-18f565e2902ad18cc1d8b64cdb3fcd963f830fc8.tar nixpkgs-18f565e2902ad18cc1d8b64cdb3fcd963f830fc8.tar.gz nixpkgs-18f565e2902ad18cc1d8b64cdb3fcd963f830fc8.tar.bz2 nixpkgs-18f565e2902ad18cc1d8b64cdb3fcd963f830fc8.tar.lz nixpkgs-18f565e2902ad18cc1d8b64cdb3fcd963f830fc8.tar.xz nixpkgs-18f565e2902ad18cc1d8b64cdb3fcd963f830fc8.tar.zst nixpkgs-18f565e2902ad18cc1d8b64cdb3fcd963f830fc8.zip | |
* Apply a few patches to make `su' behave more like the old `su' from
coreutils:
- Don't remove variables such as $PATH and $SHELL from the calling
environment (from upstream).
- When su is invoked with command line arguments for the shell
(e.g. "su - -c 'cmd'"), set argv[0] in the shell to "-su" or
"-<basename>" (as determined by the SU_NAME option in
/etc/login.defs). This is necessary to make Bash compiled with
the NON_INTERACTIVE_LOGIN_SHELLS option to read startup files.
- Don't set $PATH to /bin:/usr/bin but inherit the $PATH of the
caller.
svn path=/nixpkgs/trunk/; revision=22140
Diffstat (limited to 'pkgs/os-specific/linux/shadow/keep-path.patch')
| -rw-r--r-- | pkgs/os-specific/linux/shadow/keep-path.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/shadow/keep-path.patch b/pkgs/os-specific/linux/shadow/keep-path.patch new file mode 100644 index 00000000000..4b8406b53b0 --- /dev/null +++ b/pkgs/os-specific/linux/shadow/keep-path.patch @@ -0,0 +1,22 @@ +Don't reset $PATH to /bin:/usr/bin. This is consistent with `su' in +coreutils and important on NixOS. + +diff -ru -x '*~' shadow-4.1.4.2-orig/src/su.c shadow-4.1.4.2/src/su.c +--- shadow-4.1.4.2-orig/src/su.c 2009-07-23 22:38:56.000000000 +0200 ++++ shadow-4.1.4.2/src/su.c 2010-06-04 13:23:11.000000000 +0200 +@@ -827,6 +827,7 @@ + (void) signal (SIGINT, SIG_DFL); + (void) signal (SIGQUIT, SIG_DFL); + ++#if 0 + cp = getdef_str ((pwent.pw_uid == 0) ? "ENV_SUPATH" : "ENV_PATH"); + if (NULL == cp) { + addenv ("PATH=/bin:/usr/bin", NULL); +@@ -835,6 +836,7 @@ + } else { + addenv ("PATH", cp); + } ++#endif + + if (getenv ("IFS") != NULL) { /* don't export user IFS ... */ + addenv ("IFS= \t\n", NULL); /* ... instead, set a safe IFS */ |