diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2014-09-03 20:55:07 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2014-10-13 02:38:36 +0200 |
| commit | a5883d4eccb94b16c355987f58f86a7dee17a0c2 (patch) | |
| tree | 44bdf3e928c611f9202d79a8eac3df01a567e98c /sshpty.c | |
| parent | upstream commit (diff) | |
| download | openssh-a5883d4eccb94b16c355987f58f86a7dee17a0c2.tar.xz openssh-a5883d4eccb94b16c355987f58f86a7dee17a0c2.zip | |
upstream commit
tighten permissions on pty when the "tty" group does
not exist; pointed out by Corinna Vinschen; ok markus
Diffstat (limited to 'sshpty.c')
| -rw-r--r-- | sshpty.c | 11 |
1 files changed, 3 insertions, 8 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: sshpty.c,v 1.28 2007/09/11 23:49:09 stevesk Exp $ */ +/* $OpenBSD: sshpty.c,v 1.29 2014/09/03 18:55:07 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -196,13 +196,8 @@ pty_setowner(struct passwd *pw, const char *tty) /* Determine the group to make the owner of the tty. */ grp = getgrnam("tty"); - if (grp) { - gid = grp->gr_gid; - mode = S_IRUSR | S_IWUSR | S_IWGRP; - } else { - gid = pw->pw_gid; - mode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH; - } + gid = (grp != NULL) ? grp->gr_gid : pw->pw_gid; + mode = (grp != NULL) ? 0622 : 0600; /* * Change owner and mode of the tty as required. |