diff options
| author | Darren Tucker <dtucker@dtucker.net> | 2019-06-07 16:47:07 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2019-06-07 16:47:07 +0200 |
| commit | 130ef0695e1731392ca33831939fe89e8b70cc17 (patch) | |
| tree | 7258880f044236f88cf9d896c66adcf0ccc66cd7 | |
| parent | upstream: Check for user@host when parsing sftp target. This (diff) | |
| download | openssh-130ef0695e1731392ca33831939fe89e8b70cc17.tar.xz openssh-130ef0695e1731392ca33831939fe89e8b70cc17.zip | |
Include missed bits from previous sync.
| -rw-r--r-- | xmalloc.c | 2 | ||||
| -rw-r--r-- | xmalloc.h | 3 |
2 files changed, 2 insertions, 3 deletions
@@ -27,7 +27,7 @@ #include "log.h" #if defined(__OpenBSD__) -+char *malloc_options = "S"; +char *malloc_options = "S"; #endif /* __OpenBSD__ */ void * @@ -1,4 +1,4 @@ -/* $OpenBSD: xmalloc.h,v 1.17 2017/05/31 09:15:42 deraadt Exp $ */ +/* $OpenBSD: xmalloc.h,v 1.18 2019/06/06 05:13:13 otto Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -16,7 +16,6 @@ * called by a name other than "ssh" or "Secure Shell". */ -void ssh_malloc_init(void); void *xmalloc(size_t); void *xcalloc(size_t, size_t); void *xreallocarray(void *, size_t, size_t); |