diff options
| author | Karel Zak | 2011-10-05 13:56:09 +0200 |
|---|---|---|
| committer | Karel Zak | 2011-10-26 23:17:17 +0200 |
| commit | 738246edbaa0c8f763acf0d6bca9f354a9d59647 (patch) | |
| tree | b2accabcc0d97fc3d87eb2116224a21ace79304a /login-utils/login.c | |
| parent | login: use FAIL_DELAY from login.defs (diff) | |
| download | kernel-qcow2-util-linux-738246edbaa0c8f763acf0d6bca9f354a9d59647.tar.gz kernel-qcow2-util-linux-738246edbaa0c8f763acf0d6bca9f354a9d59647.tar.xz kernel-qcow2-util-linux-738246edbaa0c8f763acf0d6bca9f354a9d59647.zip | |
login: use TTYPERM from login.defs
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'login-utils/login.c')
| -rw-r--r-- | login-utils/login.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/login-utils/login.c b/login-utils/login.c index e95c5d6d4..4ad962ae8 100644 --- a/login-utils/login.c +++ b/login-utils/login.c @@ -92,6 +92,7 @@ struct login_context { const char *tty_path; /* ttyname() return value */ const char *tty_name; /* tty_path without /dev prefix */ const char *tty_number; /* end of the tty_path */ + mode_t tty_mode; /* chmod() mode */ char *username; /* from command line or PAM */ @@ -273,20 +274,20 @@ static void chown_tty(struct login_context *cxt) if (fchown(0, uid, gid)) /* tty */ chown_err(cxt->tty_name, uid, gid); - if (fchmod(0, TTY_MODE)) - chmod_err(cxt->tty_name, TTY_MODE); + if (fchmod(0, cxt->tty_mode)) + chmod_err(cxt->tty_name, cxt->tty_mode); #ifdef LOGIN_CHOWN_VCS if (is_consoletty(0)) { if (chown(cxt->vcs, uid, gid)) /* vcs */ chown_err(cxt->vcs, uid, gid); - if (chmod(cxt->vcs, TTY_MODE)) - chmod_err(cxt->vcs, TTY_MODE); + if (chmod(cxt->vcs, cxt->tty_mode)) + chmod_err(cxt->vcs, cxt->tty_mode); if (chown(cxt->vcsa, uid, gid)) /* vcsa */ chown_err(cxt->vcsa, uid, gid); - if (chmod(cxt->vcsa, TTY_MODE)) - chmod_err(cxt->vcsa, TTY_MODE); + if (chmod(cxt->vcsa, cxt->tty_mode)) + chmod_err(cxt->vcsa, cxt->tty_mode); } #endif } @@ -300,6 +301,8 @@ static void init_tty(struct login_context *cxt) struct stat st; struct termios tt, ttt; + cxt->tty_mode = (mode_t) getlogindefs_num("TTYPERM", TTY_MODE); + cxt->tty_path = ttyname(0); /* libc calls istty() here */ /* @@ -341,7 +344,7 @@ static void init_tty(struct login_context *cxt) ttt = tt; ttt.c_cflag &= ~HUPCL; - if ((fchown(0, 0, 0) || fchmod(0, TTY_MODE)) && errno != EROFS) { + if ((fchown(0, 0, 0) || fchmod(0, cxt->tty_mode)) && errno != EROFS) { syslog(LOG_ERR, _("FATAL: %s: change permissions failed: %m"), cxt->tty_path); @@ -1101,6 +1104,7 @@ int main(int argc, char **argv) struct passwd *pwd = NULL, _pwd; struct login_context cxt = { + .tty_mode = TTY_MODE, /* tty chmod() */ .pid = getpid(), /* PID */ .conv = { misc_conv, NULL } /* PAM conversation function */ }; |