Tiny fixes from 6Wind patch.

diff --git a/ospfd/Makefile.am b/ospfd/Makefile.am
index 16845e76c183308974ba545c6c86c77bd441c9ba..81315daed675446e54b28c9a720c93f52e9ae181 100644 (file)
--- 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 dfbf3f6bc6c668e7d7d01a74ad52aff8efdb219c..0ac82a68463c9fd53bd25b3f7400516b90e0afa7 100644 (file)
--- 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))