diff options
| author | Damien Miller <djm@mindrot.org> | 1999-11-25 11:54:57 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 1999-11-25 11:54:57 +1100 |
| commit | 5428f646ad32da88ddd04a8c287d595524674fbf (patch) | |
| tree | cc1f1e5d7852e1f44d41077f776abf7dab7ac06d /servconf.c | |
| parent | 9072e1889648988da38b7b81bce95291c1dc3a23 (diff) | |
- More reformatting merged from OpenBSD CVS
- Merged OpenBSD CVS changes:
- [channels.c]
report from mrwizard@psu.edu via djm@ibs.com.au
- [channels.c]
set SO_REUSEADDR and SO_LINGER for forwarded ports.
chip@valinux.com via damien@ibs.com.au
- [nchan.c]
it's not an error() if shutdown_write failes in nchan.
- [readconf.c]
remove dead #ifdef-0-code
- [readconf.c servconf.c]
strcasecmp instead of tolower
- [scp.c]
progress meter overflow fix from damien@ibs.com.au
- [ssh-add.1 ssh-add.c]
SSH_ASKPASS support
- [ssh.1 ssh.c]
postpone fork_after_authentication until command execution,
request/patch from jahakala@cc.jyu.fi via damien@ibs.com.au
plus: use daemon() for backgrounding
Diffstat (limited to 'servconf.c')
| -rw-r--r-- | servconf.c | 17 |
1 files changed, 6 insertions, 11 deletions
@@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$Id: servconf.c,v 1.6 1999/11/24 13:26:22 damien Exp $"); +RCSID("$Id: servconf.c,v 1.7 1999/11/25 00:54:59 damien Exp $"); #include "ssh.h" #include "servconf.h" @@ -212,8 +212,10 @@ static struct { { NULL, 0 } }; -/* Returns the number of the token pointed to by cp of length len. - Never returns if the token is not known. */ +/* + * Returns the number of the token pointed to by cp of length len. Never + * returns if the token is not known. + */ static ServerOpCodes parse_token(const char *cp, const char *filename, @@ -222,7 +224,7 @@ parse_token(const char *cp, const char *filename, unsigned int i; for (i = 0; keywords[i].name; i++) - if (strcmp(cp, keywords[i].name) == 0) + if (strcasecmp(cp, keywords[i].name) == 0) return keywords[i].opcode; fprintf(stderr, "%s: line %d: Bad configuration option: %s\n", @@ -254,13 +256,6 @@ read_server_config(ServerOptions *options, const char *filename) if (!*cp || *cp == '#') continue; cp = strtok(cp, WHITESPACE); - { - char *t = cp; - for (; *t != 0; t++) - if ('A' <= *t && *t <= 'Z') - *t = *t - 'A' + 'a'; /* tolower */ - - } opcode = parse_token(cp, filename, linenum); switch (opcode) { case sBadOption: |