summaryrefslogtreecommitdiffstats
path: root/crypto/openssh/session.c
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2017-09-02 23:39:51 +0000
committerdes <des@FreeBSD.org>2017-09-02 23:39:51 +0000
commit7e3dcea1a1c17915cbd33fd8fcec2b5530f8d3d1 (patch)
tree0ad6b552b5cee69d3a46a71e4f906a8b18024b1d /crypto/openssh/session.c
parentca26403304720e30901aa6f7bde4883af9662d2d (diff)
downloadFreeBSD-src-7e3dcea1a1c17915cbd33fd8fcec2b5530f8d3d1.zip
FreeBSD-src-7e3dcea1a1c17915cbd33fd8fcec2b5530f8d3d1.tar.gz
MFH (r322052): Upgrade OpenSSH to 7.5p1.
Diffstat (limited to 'crypto/openssh/session.c')
-rw-r--r--crypto/openssh/session.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/crypto/openssh/session.c b/crypto/openssh/session.c
index 3a5fc44..1217ad4 100644
--- a/crypto/openssh/session.c
+++ b/crypto/openssh/session.c
@@ -1261,7 +1261,8 @@ static void
do_nologin(struct passwd *pw)
{
FILE *f = NULL;
- char buf[1024], *nl, *def_nl = _PATH_NOLOGIN;
+ const char *nl;
+ char buf[1024], *def_nl = _PATH_NOLOGIN;
struct stat sb;
#ifdef HAVE_LOGIN_CAP
@@ -1273,11 +1274,8 @@ do_nologin(struct passwd *pw)
return;
nl = def_nl;
#endif
- if (stat(nl, &sb) == -1) {
- if (nl != def_nl)
- free(nl);
+ if (stat(nl, &sb) == -1)
return;
- }
/* /etc/nologin exists. Print its contents if we can and exit. */
logit("User %.100s not allowed because %s exists", pw->pw_name, nl);
OpenPOWER on IntegriCloud