diff options
author | deraadt@openbsd.org <deraadt@openbsd.org> | 2015-04-24 01:36:00 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-04-29 18:15:23 +1000 |
commit | 657a5fbc0d0aff309079ff8fb386f17e964963c2 (patch) | |
tree | 942146a8381a12903fdfaec579b9ff2b2bf41406 /ssh-keygen.c | |
parent | 1108ae242fdd2c304307b68ddf46aebe43ebffaa (diff) |
upstream commit
rename xrealloc() to xreallocarray() since it follows
that form. ok djm
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r-- | ssh-keygen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index d3c412283..ad9f3026b 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.269 2015/04/17 13:19:22 djm Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.270 2015/04/24 01:36:01 deraadt Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1592,7 +1592,7 @@ do_ca_sign(struct passwd *pw, int argc, char **argv) | |||
1592 | otmp = tmp = xstrdup(cert_principals); | 1592 | otmp = tmp = xstrdup(cert_principals); |
1593 | plist = NULL; | 1593 | plist = NULL; |
1594 | for (; (cp = strsep(&tmp, ",")) != NULL; n++) { | 1594 | for (; (cp = strsep(&tmp, ",")) != NULL; n++) { |
1595 | plist = xrealloc(plist, n + 1, sizeof(*plist)); | 1595 | plist = xreallocarray(plist, n + 1, sizeof(*plist)); |
1596 | if (*(plist[n] = xstrdup(cp)) == '\0') | 1596 | if (*(plist[n] = xstrdup(cp)) == '\0') |
1597 | fatal("Empty principal name"); | 1597 | fatal("Empty principal name"); |
1598 | } | 1598 | } |