- djm@cvs.openbsd.org 2014/04/28 03:09:18
[authfile.c bufaux.c buffer.h channels.c krl.c mux.c packet.c packet.h]
[ssh-keygen.c]
buffer_get_string_ptr's return should be const to remind
callers that futzing with it will futz with the actual buffer
contents
diff --git a/ssh-keygen.c b/ssh-keygen.c
index d37b7f7..85eaf2e 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.244 2014/04/20 09:24:26 logan Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.245 2014/04/28 03:09:18 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1820,8 +1820,8 @@
static void
show_options(const Buffer *optbuf, int v00, int in_critical)
{
- char *name;
- u_char *data;
+ char *name, *arg;
+ const u_char *data;
u_int dlen;
Buffer options, option;
@@ -1844,9 +1844,9 @@
else if ((v00 || in_critical) &&
(strcmp(name, "force-command") == 0 ||
strcmp(name, "source-address") == 0)) {
- data = buffer_get_string(&option, NULL);
- printf(" %s\n", data);
- free(data);
+ arg = buffer_get_cstring(&option, NULL);
+ printf(" %s\n", arg);
+ free(arg);
} else {
printf(" UNKNOWN OPTION (len %u)\n",
buffer_len(&option));