added basic ssl support to ircu

[ircu2.10.12-pk.git] / ircd / ircd_log.c

diff --git a/ircd/ircd_log.c b/ircd/ircd_log.c
index aa819b880048ec179187a205fa136d6ace74a285..dda7141d00de3a88c4ad2de955a2389b81f03edf 100644 (file)
--- a/ircd/ircd_log.c
+++ b/ircd/ircd_log.c
@@ -38,7 +38,7 @@
 #include "send.h"
 #include "struct.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
@@ -52,6 +52,8 @@
 #include <time.h>
 #include <unistd.h>
 
+int log_inassert = 0;
+
 #define LOG_BUFSIZE 2048 /**< Maximum length for a log message. */
 
 /** Select default log level cutoff. */
@@ -124,7 +126,7 @@ static struct {
   M(NONE),       M(OLDSNO),     M(SERVKILL),   M(OPERKILL),   M(HACK2),
   M(HACK3),      M(UNAUTH),     M(TCPCOMMON),  M(TOOMANY),    M(HACK4),
   M(GLINE),      M(NETWORK),    M(IPMISMATCH), M(THROTTLE),   M(OLDREALOP),
-  M(CONNEXIT),   M(DEBUG),
+  M(CONNEXIT),   M(DEBUG),      M(AUTH),
 #undef M
   { 0, 0 }
 };
@@ -160,8 +162,8 @@ static struct LogDesc {
   S(OPER, -1, SNO_OLDREALOP),
   S(RESOLVER, -1, 0),
   S(SOCKET, -1, 0),
+  S(IAUTH, -1, SNO_NETWORK),
   S(DEBUG, -1, SNO_DEBUG),
-  S(OLDLOG, -1, 0),
 #undef S
   { LS_LAST_SYSTEM, 0, 0, -1, 0, -1, 0 }
 };
@@ -193,10 +195,8 @@ log_open(struct LogFile *lf)
 {
   /* only open the file if we haven't already */
   if (lf && lf->fd < 0) {
-    alarm(3); /* if NFS hangs, we hang only for 3 seconds */
     lf->fd = open(lf->file, O_WRONLY | O_CREAT | O_APPEND,
-                 S_IREAD | S_IWRITE);
-    alarm(0);
+                 S_IRUSR | S_IWUSR);
   }
 }
 
@@ -827,7 +827,7 @@ log_get_snomask(const char *subsys)
   return log_sno_name(desc->snomask);
 }
 
-/** Set the verbosity level for a subystem.
+/** Set the verbosity level for a subsystem.
  * @param[in] subsys Subsystem name.
  * @param[in] level Minimum log level.
  * @return Zero on success; non-zero on error.