From b3516a791d7d44469b9a2a51557347958fe506d1 Mon Sep 17 00:00:00 2001
From: hasso <hasso>
Date: Sun, 25 May 2003 22:11:22 +0000
Subject: Tiny fixes from 6Wind patch.

---
 ospfd/Makefile.am | 2 +-
 ospfd/ospf_main.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'ospfd')

diff --git a/ospfd/Makefile.am b/ospfd/Makefile.am
index 16845e76..81315dae 100644
--- a/ospfd/Makefile.am
+++ b/ospfd/Makefile.am
@@ -28,7 +28,7 @@ noinst_HEADERS = \
 ospfd_SOURCES = \
 	ospf_main.c $(libospf_a_SOURCES)
 
-ospfd_LDADD = ../lib/libzebra.a
+ospfd_LDADD = -L../lib -lzebra
 
 sysconf_DATA = ospfd.conf.sample
 
diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c
index dfbf3f6b..0ac82a68 100644
--- a/ospfd/ospf_main.c
+++ b/ospfd/ospf_main.c
@@ -183,7 +183,7 @@ main (int argc, char **argv)
   progname = ((p = strrchr (argv[0], '/')) ? ++p : argv[0]);
 
   /* Invoked by a priviledged user? -- endo. */
-  if (getuid () != 0)
+  if (geteuid () != 0)
     {
       errno = EPERM;
       perror (progname);
@@ -290,8 +290,10 @@ main (int argc, char **argv)
   /* Create VTY socket */
   vty_serv_sock (vty_addr, vty_port, OSPF_VTYSH_PATH);
 
+#ifdef DEBUG
   /* Print banner. */
   zlog (NULL, LOG_INFO, "OSPFd (%s) starts", ZEBRA_VERSION);
+#endif
 
   /* Fetch next active thread. */
   while (thread_fetch (master, &thread))
-- 
cgit v1.2.1