diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2022-02-25 03:09:27 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2022-03-01 03:00:26 +0100 |
| commit | 4a66dac052c5ff5047161853f36904607649e4f9 (patch) | |
| tree | 291eed2ba949d074f19499a93348fc6ff9890fd9 /monitor.c | |
| parent | Remove unused ivbits argument from chacha_keysetup (diff) | |
| download | openssh-4a66dac052c5ff5047161853f36904607649e4f9.tar.xz openssh-4a66dac052c5ff5047161853f36904607649e4f9.zip | |
upstream: save an unneccessary alloc/free, based on patch from
Martin Vahlensieck; ok dtucker@
OpenBSD-Commit-ID: 90ffbf1f837e509742f2c31a1fbf2c0fd376fd5f
Diffstat (limited to '')
| -rw-r--r-- | monitor.c | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: monitor.c,v 1.231 2022/01/28 06:18:42 guenther Exp $ */ +/* $OpenBSD: monitor.c,v 1.232 2022/02/25 02:09:27 djm Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * Copyright 2002 Markus Friedl <markus@openbsd.org> @@ -709,7 +709,6 @@ mm_answer_sign(struct ssh *ssh, int sock, struct sshbuf *m) int mm_answer_pwnamallow(struct ssh *ssh, int sock, struct sshbuf *m) { - char *username; struct passwd *pwent; int r, allowed = 0; u_int i; @@ -719,14 +718,12 @@ mm_answer_pwnamallow(struct ssh *ssh, int sock, struct sshbuf *m) if (authctxt->attempt++ != 0) fatal_f("multiple attempts for getpwnam"); - if ((r = sshbuf_get_cstring(m, &username, NULL)) != 0) + if ((r = sshbuf_get_cstring(m, &authctxt->user, NULL)) != 0) fatal_fr(r, "parse"); - pwent = getpwnamallow(ssh, username); + pwent = getpwnamallow(ssh, authctxt->user); - authctxt->user = xstrdup(username); - setproctitle("%s [priv]", pwent ? username : "unknown"); - free(username); + setproctitle("%s [priv]", pwent ? authctxt->user : "unknown"); sshbuf_reset(m); |