summaryrefslogtreecommitdiff
path: root/ospfd
diff options
context:
space:
mode:
authorhasso <hasso>2003-05-25 22:11:22 +0000
committerhasso <hasso>2003-05-25 22:11:22 +0000
commitb3516a791d7d44469b9a2a51557347958fe506d1 (patch)
tree8e26d9c9b6c189b7f8fcbab0869c06221828eb2e /ospfd
parente26bbebaddd76e2002df675d76531c5ce851a4b0 (diff)
Tiny fixes from 6Wind patch.
Diffstat (limited to 'ospfd')
-rw-r--r--ospfd/Makefile.am2
-rw-r--r--ospfd/ospf_main.c4
2 files changed, 4 insertions, 2 deletions
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))