summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2004-01-05 19:06:43 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2004-01-05 19:06:43 +0000
commit8633e7a422fd44a7026d84004d5478bd31c55c39 (patch)
treeb5706f8dfd2700329c57d41029d522ca72f3a40c /usr.sbin
parent9601128d9220e98146840d49f20d893e1082ff20 (diff)
remove support for reading configuration from stdin.
that really does not make sense with a daemon and probably breaks horribly on config reload
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/bgpd/parse.y19
1 files changed, 7 insertions, 12 deletions
diff --git a/usr.sbin/bgpd/parse.y b/usr.sbin/bgpd/parse.y
index 6debcc38b8d..d0e5c6d4557 100644
--- a/usr.sbin/bgpd/parse.y
+++ b/usr.sbin/bgpd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.27 2004/01/05 19:04:11 henning Exp $ */
+/* $OpenBSD: parse.y,v 1.28 2004/01/05 19:06:42 henning Exp $ */
/*
* Copyright (c) 2002, 2003 Henning Brauer <henning@openbsd.org>
@@ -570,18 +570,13 @@ parse_config(char *filename, struct bgpd_config *xconf,
conf->listen_addr.sin_addr.s_addr = INADDR_ANY;
conf->listen_addr.sin_port = htons(BGP_PORT);
- if (strcmp(filename, "-") == 0) {
- fin = stdin;
- infile = "stdin";
- } else {
- if ((fin = fopen(filename, "r")) == NULL) {
- warn("%s", filename);
- free(conf);
- free(mrtconf);
- return (-1);
- }
- infile = filename;
+ if ((fin = fopen(filename, "r")) == NULL) {
+ warn("%s", filename);
+ free(conf);
+ free(mrtconf);
+ return (-1);
}
+ infile = filename;
yyparse();