diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2012-08-29 15:46:01 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2012-08-29 15:46:01 +0000 |
| commit | 2e97a36905ba9936cb9972e37c5e56deb288e442 (patch) | |
| tree | 63724b2d8e911727737ec31273789b3f46ffa6ff /auth-options.c | |
| parent | 4bc11fc94e472842a59429d633d4b97124da2a2e (diff) | |
| download | src-2e97a36905ba9936cb9972e37c5e56deb288e442.tar.gz src-2e97a36905ba9936cb9972e37c5e56deb288e442.zip | |
Vendor import of OpenSSH 6.0p1.vendor/openssh/6.0p1
Notes
Notes:
svn path=/vendor-crypto/openssh/dist/; revision=239844
svn path=/vendor-crypto/openssh/6.0p1/; revision=239847; tag=vendor/openssh/6.0p1
Diffstat (limited to 'auth-options.c')
| -rw-r--r-- | auth-options.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/auth-options.c b/auth-options.c index eae45cf2b4fc..0e67bd8c0969 100644 --- a/auth-options.c +++ b/auth-options.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth-options.c,v 1.54 2010/12/24 21:41:48 djm Exp $ */ +/* $OpenBSD: auth-options.c,v 1.56 2011/10/18 04:58:26 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -341,7 +341,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum) goto bad_option; } host = cleanhostname(host); - if (p == NULL || (port = a2port(p)) <= 0) { + if (p == NULL || (port = permitopen_port(p)) < 0) { debug("%.100s, line %lu: Bad permitopen port " "<%.100s>", file, linenum, p ? p : ""); auth_debug_add("%.100s, line %lu: " @@ -452,10 +452,6 @@ parse_option_list(u_char *optblob, size_t optblob_len, struct passwd *pw, buffer_append(&data, data_blob, dlen); debug3("found certificate option \"%.100s\" len %u", name, dlen); - if (strlen(name) != nlen) { - error("Certificate constraint name contains \\0"); - goto out; - } found = 0; if ((which & OPTIONS_EXTENSIONS) != 0) { if (strcmp(name, "permit-X11-forwarding") == 0) { @@ -485,11 +481,6 @@ parse_option_list(u_char *optblob, size_t optblob_len, struct passwd *pw, "corrupt", name); goto out; } - if (strlen(command) != clen) { - error("force-command constraint " - "contains \\0"); - goto out; - } if (*cert_forced_command != NULL) { error("Certificate has multiple " "force-command options"); @@ -506,11 +497,6 @@ parse_option_list(u_char *optblob, size_t optblob_len, struct passwd *pw, "\"%s\" corrupt", name); goto out; } - if (strlen(allowed) != clen) { - error("source-address constraint " - "contains \\0"); - goto out; - } if ((*cert_source_address_done)++) { error("Certificate has multiple " "source-address options"); |