[svn-upgrade] Integrating new upstream version, shadow (4.0.12)
This commit is contained in:
@@ -30,7 +30,7 @@
|
||||
#include <config.h>
|
||||
|
||||
#include "rcsid.h"
|
||||
RCSID ("$Id: chowntty.c,v 1.11 2005/03/31 05:14:50 kloczek Exp $")
|
||||
RCSID ("$Id: chowntty.c,v 1.12 2005/08/09 18:03:15 kloczek Exp $")
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <stdio.h>
|
||||
@@ -110,7 +110,7 @@ void chown_tty (const char *tty, const struct passwd *info)
|
||||
info->pw_name));
|
||||
closelog ();
|
||||
|
||||
if (!(err == EROFS && info->pw_uid == 0))
|
||||
if (err != EROFS)
|
||||
exit (1);
|
||||
}
|
||||
#ifdef __linux__
|
||||
|
@@ -34,7 +34,7 @@
|
||||
#include <config.h>
|
||||
|
||||
#include "rcsid.h"
|
||||
RCSID ("$Id: setupenv.c,v 1.17 2005/07/06 11:49:21 kloczek Exp $")
|
||||
RCSID ("$Id: setupenv.c,v 1.18 2005/08/09 18:09:42 kloczek Exp $")
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <stdio.h>
|
||||
@@ -260,12 +260,6 @@ void setup_env (struct passwd *info)
|
||||
addenv ("PATH", cp);
|
||||
}
|
||||
|
||||
/*
|
||||
* MAILDIR environment variable for Qmail
|
||||
*/
|
||||
if ((cp = getdef_str ("QMAIL_DIR")))
|
||||
addenv_path ("MAILDIR", info->pw_dir, cp);
|
||||
|
||||
/*
|
||||
* Create the MAIL environmental variable and export it. login.defs
|
||||
* knows the prefix.
|
||||
|
Reference in New Issue
Block a user