summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-05-05 14:14:08 +1000
committerDamien Miller <djm@mindrot.org>2011-05-05 14:14:08 +1000
commit044f4a6cc39d1c3d109c143c162c4c00fc4df0aa (patch)
tree3401f2df8c59b315a5509a27981e70c14ba49293
parent3ca1eb373f84a6d64eb17abf40beeffafa7b034c (diff)
- stevesk@cvs.openbsd.org 2011/03/24 22:14:54
[ssh-keygen.c] use strcasecmp() for "clear" cert permission option also; ok djm
-rw-r--r--ChangeLog3
-rw-r--r--ssh-keygen.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f3c804ee3..7b12fa966 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,9 @@
35 - jmc@cvs.openbsd.org 2011/03/24 15:29:30 35 - jmc@cvs.openbsd.org 2011/03/24 15:29:30
36 [ssh-keygen.1] 36 [ssh-keygen.1]
37 zap trailing whitespace; 37 zap trailing whitespace;
38 - stevesk@cvs.openbsd.org 2011/03/24 22:14:54
39 [ssh-keygen.c]
40 use strcasecmp() for "clear" cert permission option also; ok djm
38 41
3920110221 4220110221
40 - (dtucker) [contrib/cygwin/ssh-host-config] From Corinna: revamp of the 43 - (dtucker) [contrib/cygwin/ssh-host-config] From Corinna: revamp of the
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 14aefbb98..90cffa055 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.207 2011/03/23 16:50:04 stevesk Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.208 2011/03/24 22:14:54 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1717,7 +1717,7 @@ add_cert_option(char *opt)
1717{ 1717{
1718 char *val; 1718 char *val;
1719 1719
1720 if (strcmp(opt, "clear") == 0) 1720 if (strcasecmp(opt, "clear") == 0)
1721 certflags_flags = 0; 1721 certflags_flags = 0;
1722 else if (strcasecmp(opt, "no-x11-forwarding") == 0) 1722 else if (strcasecmp(opt, "no-x11-forwarding") == 0)
1723 certflags_flags &= ~CERTOPT_X_FWD; 1723 certflags_flags &= ~CERTOPT_X_FWD;