summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2020-04-25 06:59:36 +0000
committerDamien Miller <djm@mindrot.org>2020-05-01 13:13:28 +1000
commit4d2c87b4d1bde019cdd0f00552fcf97dd8b39940 (patch)
treece25a1bc0c9a5e389c0dd5dc460290010ed0e700
parent7f23f42123d64272a7b00754afa6b0841d676691 (diff)
upstream: We've standardized on memset over bzero, replace a couple
that had slipped in. ok deraadt markus djm. OpenBSD-Commit-ID: f5be055554ee93e6cc66b0053b590bef3728dbd6
-rw-r--r--channels.c4
-rw-r--r--misc.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/channels.c b/channels.c
index 9683b336..95a51e21 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.397 2020/03/06 18:19:21 markus Exp $ */
+/* $OpenBSD: channels.c,v 1.398 2020/04/25 06:59:36 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -454,7 +454,7 @@ fwd_perm_clear(struct permission *perm)
free(perm->host_to_connect);
free(perm->listen_host);
free(perm->listen_path);
- bzero(perm, sizeof(*perm));
+ memset(perm, 0, sizeof(*perm));
}
/* Returns an printable name for the specified forwarding permission list */
diff --git a/misc.c b/misc.c
index 3a31d5c1..50650722 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.146 2020/01/28 01:49:36 djm Exp $ */
+/* $OpenBSD: misc.c,v 1.147 2020/04/25 06:59:36 dtucker Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2005,2006 Damien Miller. All rights reserved.
@@ -2255,7 +2255,7 @@ ssh_signal(int signum, sshsig_t handler)
struct sigaction sa, osa;
/* mask all other signals while in handler */
- bzero(&sa, sizeof(sa));
+ memset(&sa, 0, sizeof(sa));
sa.sa_handler = handler;
sigfillset(&sa.sa_mask);
if (signum != SIGALRM)