summaryrefslogtreecommitdiff
path: root/auth-options.c
diff options
context:
space:
mode:
Diffstat (limited to 'auth-options.c')
-rw-r--r--auth-options.c10
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 @@
1/* $OpenBSD: auth-options.c,v 1.52 2010/05/20 23:46:02 djm Exp $ */ 1/* $OpenBSD: auth-options.c,v 1.54 2010/12/24 21:41:48 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * 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)
172 goto bad_option; 172 goto bad_option;
173 } 173 }
174 forced_command[i] = '\0'; 174 forced_command[i] = '\0';
175 auth_debug_add("Forced command: %.900s", forced_command); 175 auth_debug_add("Forced command.");
176 opts++; 176 opts++;
177 goto next_option; 177 goto next_option;
178 } 178 }
@@ -444,7 +444,7 @@ parse_option_list(u_char *optblob, size_t optblob_len, struct passwd *pw,
444 buffer_append(&c, optblob, optblob_len); 444 buffer_append(&c, optblob, optblob_len);
445 445
446 while (buffer_len(&c) > 0) { 446 while (buffer_len(&c) > 0) {
447 if ((name = buffer_get_string_ret(&c, &nlen)) == NULL || 447 if ((name = buffer_get_cstring_ret(&c, &nlen)) == NULL ||
448 (data_blob = buffer_get_string_ret(&c, &dlen)) == NULL) { 448 (data_blob = buffer_get_string_ret(&c, &dlen)) == NULL) {
449 error("Certificate options corrupt"); 449 error("Certificate options corrupt");
450 goto out; 450 goto out;
@@ -479,7 +479,7 @@ parse_option_list(u_char *optblob, size_t optblob_len, struct passwd *pw,
479 } 479 }
480 if (!found && (which & OPTIONS_CRITICAL) != 0) { 480 if (!found && (which & OPTIONS_CRITICAL) != 0) {
481 if (strcmp(name, "force-command") == 0) { 481 if (strcmp(name, "force-command") == 0) {
482 if ((command = buffer_get_string_ret(&data, 482 if ((command = buffer_get_cstring_ret(&data,
483 &clen)) == NULL) { 483 &clen)) == NULL) {
484 error("Certificate constraint \"%s\" " 484 error("Certificate constraint \"%s\" "
485 "corrupt", name); 485 "corrupt", name);
@@ -500,7 +500,7 @@ parse_option_list(u_char *optblob, size_t optblob_len, struct passwd *pw,
500 found = 1; 500 found = 1;
501 } 501 }
502 if (strcmp(name, "source-address") == 0) { 502 if (strcmp(name, "source-address") == 0) {
503 if ((allowed = buffer_get_string_ret(&data, 503 if ((allowed = buffer_get_cstring_ret(&data,
504 &clen)) == NULL) { 504 &clen)) == NULL) {
505 error("Certificate constraint " 505 error("Certificate constraint "
506 "\"%s\" corrupt", name); 506 "\"%s\" corrupt", name);