2004-12-03 Andrew J. Schorr <ajschorr@alumni.princeton.edu>

	* bgp_main.c: (sigint) Use zlog_notice for termination message.
	  (main) Use zlog_notice for startup announcement.
	* isis_main.c: (sigint,sigterm) Use zlog_notice for termination message.
	  (terminate) This function should be static, not global.
	  (main) Use zlog_notice for startup announcement, and remove
	  ifdef ZEBRA_VERSION.
	* version.h.in: Remove declaration for pid_output_lock, this function
	  is now static, not global.
	* pid_output.c: (pid_output_lock) This function should be static, not
	  global.  And remove "old umask" error message, since it was really
	  an unimportant debug message, not an error.
	  (pid_output) Need to declare static function pid_output_lock.
	* ospf6_main.c: (sigint,sigterm) Use zlog_notice for termination
	  message.
	  (main) Remove commented-out call to pid_output_lock (which should
	  never be called other than from inside pid_output).  And use
	  zlog_notice to print the startup message, which now includes
	  the vty port.
	* ospf_main.c: (sigint) Use zlog_notice for termination message.
	  (main) Issue a startup announcement using zlog_notice.
	* rip_main.c: (sigint) Use zlog_notice for termination message.
	  (main) Add a startup announcement using zlog_notice.
	* ripng_main.c: (sighup) Remove spurious terminating message.
	  (sigint) Use zlog_notice for termination message.
	  (main) Issue a startup announcement using zlog_notice.
	* main.c: (sigint) Use zlog_notice for termination message.
	  (main) Add a startup announcement using zlog_notice.

1 files changed, 3 insertions, 2 deletions

diff --git a/lib/pid_output.c b/lib/pid_output.c
index ae3393c1..11e1243d 100644
--- a/lib/pid_output.c
+++ b/lib/pid_output.c
@@ -47,12 +47,14 @@ pid_output (const char *path)
   umask(oldumask);
   return pid;
 #else
+  static pid_t pid_output_lock (const char *);
+
   return pid_output_lock(path);
 #endif /* HAVE_FCNTL */
 }
 
 #ifdef HAVE_FCNTL
-pid_t
+static pid_t
 pid_output_lock (const char *path)
 {
   int tmp;
@@ -65,7 +67,6 @@ pid_output_lock (const char *path)
   pid = getpid ();
 
   oldumask = umask(0777 & ~LOGFILE_MASK);
-  zlog_err( "old umask %d %d", oldumask, 0777 & ~LOGFILE_MASK);
   fd = open (path, O_RDWR | O_CREAT, LOGFILE_MASK);
       if (fd < 0)
         {