20001123

 - (bal) Merge OpenBSD changes:
   - markus@cvs.openbsd.org  2000/11/15 22:31:36
     [auth-options.c]
     case insensitive key options; from stevesk@sweeden.hp.com
   - markus@cvs.openbsd.org  2000/11/16 17:55:43
     [dh.c]
     do not use perror() in sshd, after child is forked()
   - markus@cvs.openbsd.org  2000/11/14 23:42:40
     [auth-rsa.c]
     parse option only if key matches; fix some confusing seen by the client
   - markus@cvs.openbsd.org  2000/11/14 23:44:19
     [session.c]
     check no_agent_forward_flag for ssh-2, too
   - markus@cvs.openbsd.org  2000/11/15
     [ssh-agent.1]
     reorder SYNOPSIS; typo, use .It
   - markus@cvs.openbsd.org  2000/11/14 23:48:55
     [ssh-agent.c]
     do not reorder keys if a key is removed
   - markus@cvs.openbsd.org  2000/11/15 19:58:08
     [ssh.c]
     just ignore non existing user keys
   - millert@cvs.openbsd.org  200/11/15 20:24:43
     [ssh-keygen.c]
     Add missing \n at end of error message.

1 files changed, 8 insertions, 8 deletions

diff --git a/auth-options.c b/auth-options.c
index c9c149d69..181bf7321 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -14,7 +14,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth-options.c,v 1.5 2000/10/09 21:32:34 markus Exp $");
+RCSID("$OpenBSD: auth-options.c,v 1.6 2000/11/15 22:31:36 markus Exp $");
 
 #include "ssh.h"
 #include "packet.h"
@@ -65,35 +65,35 @@ auth_parse_options(struct passwd *pw, char *options, unsigned long linenum)
 
         while (*options && *options != ' ' && *options != '\t') {
                 cp = "no-port-forwarding";
-                if (strncmp(options, cp, strlen(cp)) == 0) {
+                if (strncasecmp(options, cp, strlen(cp)) == 0) {
                         packet_send_debug("Port forwarding disabled.");
                         no_port_forwarding_flag = 1;
                         options += strlen(cp);
                         goto next_option;
                 }
                 cp = "no-agent-forwarding";
-                if (strncmp(options, cp, strlen(cp)) == 0) {
+                if (strncasecmp(options, cp, strlen(cp)) == 0) {
                         packet_send_debug("Agent forwarding disabled.");
                         no_agent_forwarding_flag = 1;
                         options += strlen(cp);
                         goto next_option;
                 }
                 cp = "no-X11-forwarding";
-                if (strncmp(options, cp, strlen(cp)) == 0) {
+                if (strncasecmp(options, cp, strlen(cp)) == 0) {
                         packet_send_debug("X11 forwarding disabled.");
                         no_x11_forwarding_flag = 1;
                         options += strlen(cp);
                         goto next_option;
                 }
                 cp = "no-pty";
-                if (strncmp(options, cp, strlen(cp)) == 0) {
+                if (strncasecmp(options, cp, strlen(cp)) == 0) {
                         packet_send_debug("Pty allocation disabled.");
                         no_pty_flag = 1;
                         options += strlen(cp);
                         goto next_option;
                 }
                 cp = "command=\"";
-                if (strncmp(options, cp, strlen(cp)) == 0) {
+                if (strncasecmp(options, cp, strlen(cp)) == 0) {
                         int i;
                         options += strlen(cp);
                         forced_command = xmalloc(strlen(options) + 1);
@@ -121,7 +121,7 @@ auth_parse_options(struct passwd *pw, char *options, unsigned long linenum)
                         goto next_option;
                 }
                 cp = "environment=\"";
-                if (strncmp(options, cp, strlen(cp)) == 0) {
+                if (strncasecmp(options, cp, strlen(cp)) == 0) {
                         int i;
                         char *s;
                         struct envstring *new_envstring;
@@ -156,7 +156,7 @@ auth_parse_options(struct passwd *pw, char *options, unsigned long linenum)
                         goto next_option;
                 }
                 cp = "from=\"";
-                if (strncmp(options, cp, strlen(cp)) == 0) {
+                if (strncasecmp(options, cp, strlen(cp)) == 0) {
                         int mname, mip;
                         char *patterns = xmalloc(strlen(options) + 1);
                         int i;