diff options
| author | des <des@FreeBSD.org> | 2016-01-19 18:28:23 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2016-01-19 18:28:23 +0000 |
| commit | 7a7bc643b5dd94f6333f2a1d91923165ad77176f (patch) | |
| tree | 9d2b367395b2d3c9a63b4aecd1eb28b17b838703 /crypto/openssh/sshpty.c | |
| parent | 834fb5aff44e0a606772591d869016a1d8d9aa95 (diff) | |
| parent | 928d872bfcc9d49be194dc51d80555f1bbdbff6b (diff) | |
| download | FreeBSD-src-7a7bc643b5dd94f6333f2a1d91923165ad77176f.zip FreeBSD-src-7a7bc643b5dd94f6333f2a1d91923165ad77176f.tar.gz | |
Upgrade to OpenSSH 6.8p1.
Diffstat (limited to 'crypto/openssh/sshpty.c')
| -rw-r--r-- | crypto/openssh/sshpty.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/crypto/openssh/sshpty.c b/crypto/openssh/sshpty.c index a2059b7..d2ff8c1 100644 --- a/crypto/openssh/sshpty.c +++ b/crypto/openssh/sshpty.c @@ -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. |
