Changeset 27 for trunk/src/sh_error.c

Timestamp:

Apr 6, 2006, 8:55:51 PM (19 years ago)

Author:

rainer

Message:

Support for server-to-server relay and more user policies

File:

• trunk/src/sh_error.c (modified) (8 diffs)

trunk/src/sh_error.c

@@ -639 +639 @@
 }
 
-#ifdef SH_WITH_CLIENT
+#if defined(SH_WITH_CLIENT) || defined(SH_WITH_SERVER)
 /* set severity for TCP export
  */
@@ -843 +843 @@
 #endif
 
-#ifdef SH_WITH_CLIENT
+#if defined(SH_WITH_CLIENT) || defined(SH_WITH_SERVER)
   char   * ex_msg;
 #endif
@@ -862 +862 @@
   static int syslog_block = 0;
   static int log_block    = 0;
-#if defined(SH_WITH_CLIENT)
+#if defined(SH_WITH_CLIENT) || defined(SH_WITH_SERVER)
   static int export_block = 0;
 #endif
@@ -926 +926 @@
     severity = sev;
 
+  /* these are messages from remote sources
+   */
   if ((severity  & SH_ERR_INET) != 0)
     {
@@ -939 +941 @@
        ( (errFlags.sysloglevel  & severity    ) == 0 || 
          (errFlags.syslog_class & (1 << class)) == 0 )     &&
-#ifdef SH_WITH_CLIENT
+#if defined(SH_WITH_CLIENT) || defined(SH_WITH_CLIENT)
        ( (errFlags.exportlevel  & severity    ) == 0 ||
          (errFlags.export_class & (1 << class)) == 0 )     &&
@@ -958 +960 @@
          (errFlags.mail_class    & (1 << class)) == 0 )
 #ifdef SH_WITH_SERVER
-      && (flag_inet == S_FALSE)
+       && (flag_inet == S_FALSE) /* still log messages from remote sources */
 #endif
        )
@@ -1119 +1121 @@
        * to log server
        ****************************************************/
-#ifdef SH_WITH_CLIENT
+#if defined(SH_WITH_CLIENT) || defined(SH_WITH_SERVER)
       /* Export by TCP.
        */
-      if ((errFlags.exportlevel  & severity  )   != 0 &&
-          (errFlags.export_class & (1 << class)) != 0 &&
-          (errFlags.exportlevel  & SH_ERR_NOT)   == 0 &&
-          class != AUD                                &&
-          sh.flag.isserver != GOOD                    &&
-          (flag_inet == S_FALSE) ) /* don't log inet to export */
+
+      if ( ((errFlags.exportlevel  & severity  )   != 0 &&
+            (errFlags.export_class & (1 << class)) != 0 &&
+            (errFlags.exportlevel  & SH_ERR_NOT)   == 0 &&
+            class != AUD                               )
+#ifdef SH_WITH_SERVER
+           || (flag_inet == S_TRUE) /* always log inet to export */
+#endif
+          /* sh.flag.isserver != GOOD                    && */
+          /* (flag_inet == S_FALSE) */ /* don't log inet to export */
+           )
         {
           if (export_block == 0)
@@ -1142 +1149 @@
               sl_snprintf(ex_msg, ex_len, _("%d?%u?%s"),
                       severity, class, lmsg->msg);
-
               retval = sh_forward (ex_msg);
               SH_FREE(ex_msg);