Author: rfm
Date: Wed Mar 19 09:18:09 2014
New Revision: 37756
URL: http://svn.gna.org/viewcvs/gnustep?rev=37756&view=rev
Log:
fix for bug #41751
Modified:
libs/base/trunk/ChangeLog
libs/base/trunk/Tools/gdomap.c
Modified: libs/base/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/ChangeLog?rev=37756&r1=37755&r2=37756&view=diff
==============================================================================
--- libs/base/trunk/ChangeLog (original)
+++ libs/base/trunk/ChangeLog Wed Mar 19 09:18:09 2014
@@ -1,3 +1,8 @@
+2014-03-19 Richard Frith-Macdonald <[email protected]>
+
+ * Tools/gdomap.c: Don't open syslog connection until after we have
+ forked and closed old descriptors .. fix for bug #41751
+
2014-03-11 Richard Frith-Macdonald <[email protected]>
* Source/Additions/GSMime.m:
Modified: libs/base/trunk/Tools/gdomap.c
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Tools/gdomap.c?rev=37756&r1=37755&r2=37756&view=diff
==============================================================================
--- libs/base/trunk/Tools/gdomap.c (original)
+++ libs/base/trunk/Tools/gdomap.c Wed Mar 19 09:18:09 2014
@@ -296,7 +296,7 @@
# define syslog(prio, msg,...) slogf(_SLOG_SETCODE(_SLOG_SYSLOG, 0), prio,
msg, __VA_ARGS__)
# endif
-static int log_priority;
+static int log_priority = 0;
static void
gdomap_log (int prio)
@@ -4481,16 +4481,7 @@
const char *machine = 0;
const char *lookupf = 0;
int donamesf = 0;
-
-#if defined(HAVE_SYSLOG)
- /* Initially, gdomap_log errors to stderr as well as to syslogd. */
-#if defined(SYSLOG_4_2)
- openlog ("gdomap", LOG_NDELAY);
- log_priority = LOG_DAEMON;
-#elif !defined(HAVE_SLOGF)
- openlog ("gdomap", LOG_NDELAY, LOG_DAEMON);
-#endif
-#endif
+ int forked = 0;
#if defined(__MINGW__)
WORD wVersionRequested;
@@ -4851,7 +4842,6 @@
#else
if (nofork == 0)
{
- is_daemon = 1;
/*
* Now fork off child process to run in background.
*/
@@ -4865,6 +4855,7 @@
/*
* Try to run in background.
*/
+ forked = 1;
#if defined(NeXT)
setpgrp(0, getpid());
#else
@@ -4923,6 +4914,19 @@
}
#endif /* !__MINGW__ */
+
+ if (forked)
+ {
+ is_daemon = 1;
+#if defined(HAVE_SYSLOG)
+#if defined(SYSLOG_4_2)
+ openlog ("gdomap", LOG_NDELAY);
+ log_priority = LOG_DAEMON;
+#elif !defined(HAVE_SLOGF)
+ openlog ("gdomap", LOG_NDELAY, LOG_DAEMON);
+#endif
+#endif
+ }
init_my_port(); /* Determine port to listen on. */
init_ports(); /* Create ports to handle requests. */
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
