diff options
author | djm@openbsd.org <djm@openbsd.org> | 2018-03-03 03:15:51 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-03-03 14:37:16 +1100 |
commit | 7c856857607112a3dfe6414696bf4c7ab7fb0cb3 (patch) | |
tree | 48c837fc9c9e11d64862d4f54c1a886b54d8721c /misc.c | |
parent | 90c4bec8b5f9ec4c003ae4abdf13fc7766f00c8b (diff) |
upstream: switch over to the new authorized_keys options API and
remove the legacy one.
Includes a fairly big refactor of auth2-pubkey.c to retain less state
between key file lines.
feedback and ok markus@
OpenBSD-Commit-ID: dece6cae0f47751b9892080eb13d6625599573df
Diffstat (limited to 'misc.c')
-rw-r--r-- | misc.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: misc.c,v 1.124 2018/03/02 03:02:11 djm Exp $ */ | 1 | /* $OpenBSD: misc.c,v 1.125 2018/03/03 03:15:51 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2005,2006 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2005,2006 Damien Miller. All rights reserved. |
@@ -1921,6 +1921,7 @@ child_set_env(char ***envp, u_int *envsizep, const char *name, | |||
1921 | } | 1921 | } |
1922 | 1922 | ||
1923 | /* Allocate space and format the variable in the appropriate slot. */ | 1923 | /* Allocate space and format the variable in the appropriate slot. */ |
1924 | /* XXX xasprintf */ | ||
1924 | env[i] = xmalloc(strlen(name) + 1 + strlen(value) + 1); | 1925 | env[i] = xmalloc(strlen(name) + 1 + strlen(value) + 1); |
1925 | snprintf(env[i], strlen(name) + 1 + strlen(value) + 1, "%s=%s", name, value); | 1926 | snprintf(env[i], strlen(name) + 1 + strlen(value) + 1, "%s=%s", name, value); |
1926 | } | 1927 | } |