[src/trunk]: src/usr.sbin/ldpd * don't request explicitly for uid 0 as variou...

[kefren <kefren%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a7378eb73a65
branches:  trunk
changeset: 788862:a7378eb73a65
user:      kefren <kefren%NetBSD.org@localhost>
date:      Thu Jul 25 08:40:30 2013 +0000

description:
* 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

diffstat:

 usr.sbin/ldpd/main.c |  10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diffs (31 lines):

diff -r 709de84dc0e6 -r a7378eb73a65 usr.sbin/ldpd/main.c
--- a/usr.sbin/ldpd/main.c      Thu Jul 25 04:32:37 2013 +0000
+++ b/usr.sbin/ldpd/main.c      Thu Jul 25 08:40:30 2013 +0000
@@ -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 @@
                        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 @@
                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)