merge 5.7p1

1 files changed, 5 insertions, 5 deletions

diff --git a/auth-options.c b/auth-options.c
index a7040247f..eae45cf2b 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-options.c,v 1.52 2010/05/20 23:46:02 djm Exp $ */
+/* $OpenBSD: auth-options.c,v 1.54 2010/12/24 21:41:48 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -172,7 +172,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
                                 goto bad_option;
                         }
                         forced_command[i] = '\0';
-                        auth_debug_add("Forced command: %.900s", forced_command);
+                        auth_debug_add("Forced command.");
                         opts++;
                         goto next_option;
                 }
@@ -444,7 +444,7 @@ parse_option_list(u_char *optblob, size_t optblob_len, struct passwd *pw,
         buffer_append(&c, optblob, optblob_len);
 
         while (buffer_len(&c) > 0) {
-                if ((name = buffer_get_string_ret(&c, &nlen)) == NULL ||
+                if ((name = buffer_get_cstring_ret(&c, &nlen)) == NULL ||
                     (data_blob = buffer_get_string_ret(&c, &dlen)) == NULL) {
                         error("Certificate options corrupt");
                         goto out;
@@ -479,7 +479,7 @@ parse_option_list(u_char *optblob, size_t optblob_len, struct passwd *pw,
                 }
                 if (!found && (which & OPTIONS_CRITICAL) != 0) {
                         if (strcmp(name, "force-command") == 0) {
-                                if ((command = buffer_get_string_ret(&data,
+                                if ((command = buffer_get_cstring_ret(&data,
                                     &clen)) == NULL) {
                                         error("Certificate constraint \"%s\" "
                                             "corrupt", name);
@@ -500,7 +500,7 @@ parse_option_list(u_char *optblob, size_t optblob_len, struct passwd *pw,
                                 found = 1;
                         }
                         if (strcmp(name, "source-address") == 0) {
-                                if ((allowed = buffer_get_string_ret(&data,
+                                if ((allowed = buffer_get_cstring_ret(&data,
                                     &clen)) == NULL) {
                                         error("Certificate constraint "
                                             "\"%s\" corrupt", name);