diff options
| author | deraadt@openbsd.org <deraadt@openbsd.org> | 2016-09-12 01:22:38 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2016-09-12 13:46:29 +1000 |
| commit | 9136ec134c97a8aff2917760c03134f52945ff3c (patch) | |
| tree | bfcab357e6e0f510d9b63bac43b18097e89fa58a /sshconnect.c | |
| parent | f219fc8f03caca7ac82a38ed74bbd6432a1195e7 (diff) | |
upstream commit
Add MAXIMUM(), MINIMUM(), and ROUNDUP() to misc.h, then
use those definitions rather than pulling <sys/param.h> and unknown namespace
pollution. ok djm markus dtucker
Upstream-ID: 712cafa816c9f012a61628b66b9fbd5687223fb8
Diffstat (limited to 'sshconnect.c')
| -rw-r--r-- | sshconnect.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sshconnect.c b/sshconnect.c index 356ec79f..96b91ce1 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.c,v 1.271 2016/01/14 22:56:56 markus Exp $ */ +/* $OpenBSD: sshconnect.c,v 1.272 2016/09/12 01:22:38 deraadt Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -15,7 +15,6 @@ #include "includes.h" -#include <sys/param.h> /* roundup */ #include <sys/types.h> #include <sys/wait.h> #include <sys/stat.h> @@ -1403,7 +1402,7 @@ ssh_put_password(char *password) packet_put_cstring(password); return; } - size = roundup(strlen(password) + 1, 32); + size = ROUNDUP(strlen(password) + 1, 32); padded = xcalloc(1, size); strlcpy(padded, password, size); packet_put_string(padded, size); |