summaryrefslogtreecommitdiffstats
path: root/crypto/openssh/auth-options.c
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2013-11-11 09:19:58 +0000
committerdelphij <delphij@FreeBSD.org>2013-11-11 09:19:58 +0000
commit454aa852775e6b588c94920bed615117c03b68e3 (patch)
treec4bbdc1d8ff81449a2f752ae23209759c2e18ab5 /crypto/openssh/auth-options.c
parent5c6a9c13c5db23bbfd599dcc3dfd4da68e2a9266 (diff)
downloadFreeBSD-src-454aa852775e6b588c94920bed615117c03b68e3.zip
FreeBSD-src-454aa852775e6b588c94920bed615117c03b68e3.tar.gz
MFV r257952:
Upgrade to OpenSSH 6.4p1. Bump VersionAddendum. Approved by: des
Diffstat (limited to 'crypto/openssh/auth-options.c')
-rw-r--r--crypto/openssh/auth-options.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssh/auth-options.c b/crypto/openssh/auth-options.c
index 80d59ee..12e2e1d 100644
--- a/crypto/openssh/auth-options.c
+++ b/crypto/openssh/auth-options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-options.c,v 1.59 2013/07/12 00:19:58 djm Exp $ */
+/* $OpenBSD: auth-options.c,v 1.61 2013/11/08 00:39:14 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -239,7 +239,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
auth_debug_add("Adding to environment: %.900s", s);
debug("Adding to environment: %.900s", s);
opts++;
- new_envstring = xmalloc(sizeof(struct envstring));
+ new_envstring = xcalloc(1, sizeof(struct envstring));
new_envstring->s = s;
new_envstring->next = custom_environment;
custom_environment = new_envstring;
OpenPOWER on IntegriCloud