diff options
author | djm@openbsd.org <djm@openbsd.org> | 2018-01-23 05:01:15 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-01-23 16:40:28 +1100 |
commit | d6364f6fb1a3d753d7ca9bf15b2adce961324513 (patch) | |
tree | 6c2f1fa71e8dd508509885c21e92b5b4329cef38 /sshd.c | |
parent | a69bbb07cd6fb4dfb9bdcacd370ab26d0a2b4215 (diff) |
upstream commit
avoid modifying pw->pw_passwd; let endpwent() clean up
for us, but keep a scrubbed copy; bz2777, ok dtucker@
OpenBSD-Commit-ID: 715afc0f59c6b82c4929a73279199ed241ce0752
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.499 2017/11/14 00:45:29 djm Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.500 2018/01/23 05:01:15 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1695,10 +1695,8 @@ main(int ac, char **av) | |||
1695 | fatal("Privilege separation user %s does not exist", | 1695 | fatal("Privilege separation user %s does not exist", |
1696 | SSH_PRIVSEP_USER); | 1696 | SSH_PRIVSEP_USER); |
1697 | } else { | 1697 | } else { |
1698 | explicit_bzero(privsep_pw->pw_passwd, | ||
1699 | strlen(privsep_pw->pw_passwd)); | ||
1700 | privsep_pw = pwcopy(privsep_pw); | 1698 | privsep_pw = pwcopy(privsep_pw); |
1701 | free(privsep_pw->pw_passwd); | 1699 | freezero(privsep_pw->pw_passwd, strlen(privsep_pw->pw_passwd)); |
1702 | privsep_pw->pw_passwd = xstrdup("*"); | 1700 | privsep_pw->pw_passwd = xstrdup("*"); |
1703 | } | 1701 | } |
1704 | endpwent(); | 1702 | endpwent(); |