Module Name: src
Committed By: kefren
Date: Thu Jul 25 08:40:30 UTC 2013
Modified Files:
src/usr.sbin/ldpd: main.c
Log Message:
* don't request explicitly for uid 0 as various system policies may make that
unnecessary
* correct the mplsif message. We don't need an IP address assigned on it
anymore
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/ldpd/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/ldpd/main.c
diff -u src/usr.sbin/ldpd/main.c:1.7 src/usr.sbin/ldpd/main.c:1.8
--- src/usr.sbin/ldpd/main.c:1.7 Mon Nov 12 18:39:00 2012
+++ src/usr.sbin/ldpd/main.c Thu Jul 25 08:40:30 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.7 2012/11/12 18:39:00 kefren Exp $ */
+/* $NetBSD: main.c,v 1.8 2013/07/25 08:40:30 kefren Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -101,10 +101,6 @@ main(int argc, char *argv[])
return EXIT_FAILURE;
break;
}
- if (geteuid()) {
- fatalp("You have to run this as ROOT\n");
- return EXIT_FAILURE;
- }
cpf = conf_parsefile(conffile);
if (cpf < 0 && strcmp(conffile, CONFFILE)) {
@@ -123,8 +119,8 @@ main(int argc, char *argv[])
strlcpy(my_ldp_id, inet_ntoa(conf_ldp_id), INET_ADDRSTRLEN);
if (mplssockaddr.sa_len == 0) {
- fatalp("You need one mpls interface up and an IP "
- "address set for it\n");
+ fatalp("FATAL: Create an mpls interface using ifconfig\n"
+ "e.g. ifconfig mpls0 create up\n");
return EXIT_FAILURE;
}
if (mpls_start_ldp() == -1)
