Changeset 717

Timestamp:

12/29/06 00:02:06 (2 years ago)

Author:

common

Message:

nepenthes

• Nepenthes fix shellcodecheck
  

Files:

• nepenthes/trunk/nepenthes-core/src/Nepenthes.cpp (modified) (5 diffs)

nepenthes/trunk/nepenthes-core/src/Nepenthes.cpp

@@ -371 +371 @@
-
-
+        m_LogManager->registerTag(l_crit,   "crit");
+        m_LogManager->registerTag(l_warn,   "warn");
+        m_LogManager->registerTag(l_debug,  "debug");
+        m_LogManager->registerTag(l_info,   "info");
+        m_LogManager->registerTag(l_spam,   "spam");
+        m_LogManager->registerTag(l_net,    "net");
+        m_LogManager->registerTag(l_script, "script");
+        m_LogManager->registerTag(l_shell,  "shell");
+        m_LogManager->registerTag(l_mem,    "mem");
+        m_LogManager->registerTag(l_sc,     "sc");
+        m_LogManager->registerTag(l_dl,     "down");
+        m_LogManager->registerTag(l_mgr,    "mgr");
+        m_LogManager->registerTag(l_hlr,    "handler");
+        m_LogManager->registerTag(l_dia,    "dia");
+        m_LogManager->registerTag(l_sub,    "submit");
+        m_LogManager->registerTag(l_ev,     "event");
+        m_LogManager->registerTag(l_mod,    "module");
+        m_LogManager->registerTag(l_stdtag, "fixme");
+
-        if ( opt.m_runMode != runFileCheck || opt.m_verbose )
-        {
-                m_LogManager->registerTag(l_crit,   "crit");
-                m_LogManager->registerTag(l_warn,   "warn");
-                m_LogManager->registerTag(l_debug,  "debug");
-                m_LogManager->registerTag(l_info,   "info");
-                m_LogManager->registerTag(l_spam,   "spam");
-                m_LogManager->registerTag(l_net,    "net");
-                m_LogManager->registerTag(l_script, "script");
-                m_LogManager->registerTag(l_shell,  "shell");
-                m_LogManager->registerTag(l_mem,    "mem");
-                m_LogManager->registerTag(l_sc,     "sc");
-                m_LogManager->registerTag(l_dl,     "down");
-                m_LogManager->registerTag(l_mgr,    "mgr");
-                m_LogManager->registerTag(l_hlr,    "handler");
-                m_LogManager->registerTag(l_dia,    "dia");
-                m_LogManager->registerTag(l_sub,    "submit");
-                m_LogManager->registerTag(l_ev,     "event");
-                m_LogManager->registerTag(l_mod,    "module");
-                m_LogManager->registerTag(l_stdtag, "fixme");
-
-                if ( opt.m_consoleTags )
@@ -461 +462 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-                catch ( ... )
-                {
-                        logCrit("Could not find nepenthes.logmanager.ring_logging_file in Config\n");
-                        return false;
-                }
-
-
-                RingFileLogger *fl = new RingFileLogger(m_LogManager);
-
-                fl->setLogFileFormat((char *)rlpath.c_str());
-                fl->setMaxFiles(5);
-                fl->setMaxSize(1024 * 1024);
-
-                if ( opt.m_diskTags )
-                        m_LogManager->addLogger(fl, m_LogManager->parseTagString(opt.m_diskTags));
-                else
-                        m_LogManager->addLogger(fl, l_all);
-
-        }
-        else
-        {
-                string flpath;
-                try
-                {
-                        flpath = m_Config->getValString("nepenthes.logmanager.file_logging_file");
-                }
-                catch ( ... )
-                {
-                        logCrit("Could not find nepenthes.logmanager.file_logging_file in Config\n");
-                        return false;
-                }
-
-                FileLogger *fl = new FileLogger(m_LogManager);
-                fl->setLogFile(flpath.c_str());
-                if ( opt.m_diskTags )
-                        m_LogManager->addLogger(fl, m_LogManager->parseTagString(opt.m_diskTags));
-                else
-                        m_LogManager->addLogger(fl, l_all);
-
-        }
-
@@ -681 +683 @@
-                                
-                        {
-
+
+
+
+
-                        }
-
@@ -694 +699 @@
-                        {
-
-!defined(CYGWIN)  && !defined(CYGWIN32) &&!defined(__CYGWIN__) || !defined(__CYGWIN32__
+defined(d_type_IS_NOT_A_POSIX_SPEC
-                                if ( dirnode->d_type == 8 )
-#else
@@ -709 +714 @@
-                                                
-                                        {
-
+
+
+
+
-                                        }
-                                }