summaryrefslogtreecommitdiff
path: root/servconf.c
diff options
context:
space:
mode:
Diffstat (limited to 'servconf.c')
-rw-r--r--servconf.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/servconf.c b/servconf.c
index 1e77d32f7..1e38f3b60 100644
--- a/servconf.c
+++ b/servconf.c
@@ -10,7 +10,7 @@
10 */ 10 */
11 11
12#include "includes.h" 12#include "includes.h"
13RCSID("$OpenBSD: servconf.c,v 1.69 2001/03/04 11:16:06 stevesk Exp $"); 13RCSID("$OpenBSD: servconf.c,v 1.70 2001/03/04 17:42:28 millert Exp $");
14 14
15#ifdef KRB4 15#ifdef KRB4
16#include <krb.h> 16#include <krb.h>
@@ -318,7 +318,7 @@ add_listen_addr(ServerOptions *options, char *addr)
318 hints.ai_flags = (addr == NULL) ? AI_PASSIVE : 0; 318 hints.ai_flags = (addr == NULL) ? AI_PASSIVE : 0;
319 snprintf(strport, sizeof strport, "%d", options->ports[i]); 319 snprintf(strport, sizeof strport, "%d", options->ports[i]);
320 if ((gaierr = getaddrinfo(addr, strport, &hints, &aitop)) != 0) 320 if ((gaierr = getaddrinfo(addr, strport, &hints, &aitop)) != 0)
321 fatal("bad addr or host: %s (%s)\n", 321 fatal("bad addr or host: %s (%s)",
322 addr ? addr : "<NULL>", 322 addr ? addr : "<NULL>",
323 gai_strerror(gaierr)); 323 gai_strerror(gaierr));
324 for (ai = aitop; ai->ai_next; ai = ai->ai_next) 324 for (ai = aitop; ai->ai_next; ai = ai->ai_next)
@@ -371,11 +371,11 @@ read_server_config(ServerOptions *options, const char *filename)
371 fatal("%s line %d: ports must be specified before " 371 fatal("%s line %d: ports must be specified before "
372 "ListenAdress.\n", filename, linenum); 372 "ListenAdress.\n", filename, linenum);
373 if (options->num_ports >= MAX_PORTS) 373 if (options->num_ports >= MAX_PORTS)
374 fatal("%s line %d: too many ports.\n", 374 fatal("%s line %d: too many ports.",
375 filename, linenum); 375 filename, linenum);
376 arg = strdelim(&cp); 376 arg = strdelim(&cp);
377 if (!arg || *arg == '\0') 377 if (!arg || *arg == '\0')
378 fatal("%s line %d: missing port number.\n", 378 fatal("%s line %d: missing port number.",
379 filename, linenum); 379 filename, linenum);
380 options->ports[options->num_ports++] = atoi(arg); 380 options->ports[options->num_ports++] = atoi(arg);
381 break; 381 break;
@@ -405,7 +405,7 @@ parse_int:
405 case sListenAddress: 405 case sListenAddress:
406 arg = strdelim(&cp); 406 arg = strdelim(&cp);
407 if (!arg || *arg == '\0') 407 if (!arg || *arg == '\0')
408 fatal("%s line %d: missing inet addr.\n", 408 fatal("%s line %d: missing inet addr.",
409 filename, linenum); 409 filename, linenum);
410 add_listen_addr(options, arg); 410 add_listen_addr(options, arg);
411 break; 411 break;
@@ -591,7 +591,7 @@ parse_flag:
591 arg = strdelim(&cp); 591 arg = strdelim(&cp);
592 value = log_facility_number(arg); 592 value = log_facility_number(arg);
593 if (value == (SyslogFacility) - 1) 593 if (value == (SyslogFacility) - 1)
594 fatal("%.200s line %d: unsupported log facility '%s'\n", 594 fatal("%.200s line %d: unsupported log facility '%s'",
595 filename, linenum, arg ? arg : "<NONE>"); 595 filename, linenum, arg ? arg : "<NONE>");
596 if (*intptr == -1) 596 if (*intptr == -1)
597 *intptr = (SyslogFacility) value; 597 *intptr = (SyslogFacility) value;
@@ -602,7 +602,7 @@ parse_flag:
602 arg = strdelim(&cp); 602 arg = strdelim(&cp);
603 value = log_level_number(arg); 603 value = log_level_number(arg);
604 if (value == (LogLevel) - 1) 604 if (value == (LogLevel) - 1)
605 fatal("%.200s line %d: unsupported log level '%s'\n", 605 fatal("%.200s line %d: unsupported log level '%s'",
606 filename, linenum, arg ? arg : "<NONE>"); 606 filename, linenum, arg ? arg : "<NONE>");
607 if (*intptr == -1) 607 if (*intptr == -1)
608 *intptr = (LogLevel) value; 608 *intptr = (LogLevel) value;
@@ -615,7 +615,7 @@ parse_flag:
615 case sAllowUsers: 615 case sAllowUsers:
616 while ((arg = strdelim(&cp)) && *arg != '\0') { 616 while ((arg = strdelim(&cp)) && *arg != '\0') {
617 if (options->num_allow_users >= MAX_ALLOW_USERS) 617 if (options->num_allow_users >= MAX_ALLOW_USERS)
618 fatal("%s line %d: too many allow users.\n", 618 fatal("%s line %d: too many allow users.",
619 filename, linenum); 619 filename, linenum);
620 options->allow_users[options->num_allow_users++] = xstrdup(arg); 620 options->allow_users[options->num_allow_users++] = xstrdup(arg);
621 } 621 }
@@ -624,7 +624,7 @@ parse_flag:
624 case sDenyUsers: 624 case sDenyUsers:
625 while ((arg = strdelim(&cp)) && *arg != '\0') { 625 while ((arg = strdelim(&cp)) && *arg != '\0') {
626 if (options->num_deny_users >= MAX_DENY_USERS) 626 if (options->num_deny_users >= MAX_DENY_USERS)
627 fatal( "%s line %d: too many deny users.\n", 627 fatal( "%s line %d: too many deny users.",
628 filename, linenum); 628 filename, linenum);
629 options->deny_users[options->num_deny_users++] = xstrdup(arg); 629 options->deny_users[options->num_deny_users++] = xstrdup(arg);
630 } 630 }
@@ -633,7 +633,7 @@ parse_flag:
633 case sAllowGroups: 633 case sAllowGroups:
634 while ((arg = strdelim(&cp)) && *arg != '\0') { 634 while ((arg = strdelim(&cp)) && *arg != '\0') {
635 if (options->num_allow_groups >= MAX_ALLOW_GROUPS) 635 if (options->num_allow_groups >= MAX_ALLOW_GROUPS)
636 fatal("%s line %d: too many allow groups.\n", 636 fatal("%s line %d: too many allow groups.",
637 filename, linenum); 637 filename, linenum);
638 options->allow_groups[options->num_allow_groups++] = xstrdup(arg); 638 options->allow_groups[options->num_allow_groups++] = xstrdup(arg);
639 } 639 }
@@ -642,7 +642,7 @@ parse_flag:
642 case sDenyGroups: 642 case sDenyGroups:
643 while ((arg = strdelim(&cp)) && *arg != '\0') { 643 while ((arg = strdelim(&cp)) && *arg != '\0') {
644 if (options->num_deny_groups >= MAX_DENY_GROUPS) 644 if (options->num_deny_groups >= MAX_DENY_GROUPS)
645 fatal("%s line %d: too many deny groups.\n", 645 fatal("%s line %d: too many deny groups.",
646 filename, linenum); 646 filename, linenum);
647 options->deny_groups[options->num_deny_groups++] = xstrdup(arg); 647 options->deny_groups[options->num_deny_groups++] = xstrdup(arg);
648 } 648 }