[Os-sim-commits] os-sim/contrib/patches 06_plugin_microsoft-exchange.patch,1.1,1.2

[David G. <dv...@us...>]

Update of /cvsroot/os-sim/os-sim/contrib/patches
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23642

Modified Files:
	06_plugin_microsoft-exchange.patch 
Log Message:
resolver ip origen


Index: 06_plugin_microsoft-exchange.patch
===================================================================
RCS file: /cvsroot/os-sim/os-sim/contrib/patches/06_plugin_microsoft-exchange.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** 06_plugin_microsoft-exchange.patch	6 Jul 2005 12:19:28 -0000	1.1
--- 06_plugin_microsoft-exchange.patch	7 Jul 2005 10:52:54 -0000	1.2
***************
*** 1,5 ****
! diff -auNr ossim-old/agent/pyossim/Agent.py ossim-cvs/agent/pyossim/Agent.py
! --- ossim-old/agent/pyossim/Agent.py	2005-07-06 14:14:45.243970144 +0200
! +++ ossim-cvs/agent/pyossim/Agent.py	2005-07-06 13:33:44.778017824 +0200
  @@ -156,7 +156,8 @@
               ParserNTsyslog, \
--- 1,5 ----
! diff -a -u -r1.6 Agent.py
! --- agent/pyossim/Agent.py	22 Jun 2005 13:19:50 -0000	1.6
! +++ agent/pyossim/Agent.py	7 Jul 2005 10:47:15 -0000
  @@ -156,7 +156,8 @@
               ParserNTsyslog, \
***************
*** 20,26 ****
               "4002":     ParserSyslog.ParserSyslog,
           }
! diff -auNr ossim-old/agent/pyossim/Makefile.am ossim-cvs/agent/pyossim/Makefile.am
! --- ossim-old/agent/pyossim/Makefile.am	2005-07-06 14:12:50.545406976 +0200
! +++ ossim-cvs/agent/pyossim/Makefile.am	2005-07-06 14:16:27.787381176 +0200
  @@ -10,6 +10,7 @@
   	ParserCisco.py \
--- 20,26 ----
               "4002":     ParserSyslog.ParserSyslog,
           }
! diff -a -u -r1.7 Makefile.am
! --- agent/pyossim/Makefile.am	9 Jun 2005 10:09:42 -0000	1.7
! +++ agent/pyossim/Makefile.am	7 Jul 2005 10:47:15 -0000
  @@ -10,6 +10,7 @@
   	ParserCisco.py \
***************
*** 32,37 ****
   	ParserFW1.py \
  diff -auNr ossim-old/agent/pyossim/ParserExchange.py ossim-cvs/agent/pyossim/ParserExchange.py
! --- ossim-old/agent/pyossim/ParserExchange.py	1970-01-01 01:00:00.000000000 +0100
! +++ ossim-cvs/agent/pyossim/ParserExchange.py	2005-07-06 13:31:58.218217376 +0200
  @@ -0,0 +1,89 @@
  +import re, sys, time
--- 32,37 ----
   	ParserFW1.py \
  diff -auNr ossim-old/agent/pyossim/ParserExchange.py ossim-cvs/agent/pyossim/ParserExchange.py
! --- ossim-old/agent/pyossim/ParserExchange.py   1970-01-01 01:00:00.000000000 +0100
! +++ ossim-cvs/agent/pyossim/ParserExchange.py   2005-07-06 13:31:58.218217376 +0200
  @@ -0,0 +1,89 @@
  +import re, sys, time
***************
*** 93,97 ****
  +                    if start_time + \
  +                       self.agent.plugin_restart_interval < current_time:
! +                        util.debug(__name__, 
  +                                   "Restarting plugin..", '->', 'YELLOW')
  +                        fd.close()
--- 93,97 ----
  +                    if start_time + \
  +                       self.agent.plugin_restart_interval < current_time:
! +                        util.debug(__name__,
  +                                   "Restarting plugin..", '->', 'YELLOW')
  +                        fd.close()
***************
*** 124,130 ****
  +        fd.close()
  +
! diff -auNr ossim-old/db/ossim_data.sql ossim-cvs/db/ossim_data.sql
! --- ossim-old/db/ossim_data.sql	2005-07-06 14:21:03.697436472 +0200
! +++ ossim-cvs/db/ossim_data.sql	2005-07-06 14:02:36.225797752 +0200
  @@ -7782,6 +7782,47 @@
   
--- 124,130 ----
  +        fd.close()
  +
! diff -a -u -r1.94 ossim_data.sql
! --- db/ossim_data.sql	7 Apr 2005 10:51:31 -0000	1.94
! +++ db/ossim_data.sql	7 Jul 2005 10:47:30 -0000
  @@ -7782,6 +7782,47 @@
   
***************
*** 175,181 ****
   --
   
! diff -auNr ossim-old/etc/agent/config.xml ossim-cvs/etc/agent/config.xml
! --- ossim-old/etc/agent/config.xml	2005-07-06 14:13:48.333621832 +0200
! +++ ossim-cvs/etc/agent/config.xml	2005-07-06 14:11:51.820334544 +0200
  @@ -25,6 +25,7 @@
       <!ENTITY    ciscoids    SYSTEM '/etc/ossim/agent/plugins/ciscoids.xml'>
--- 175,181 ----
   --
   
! diff -a -u -r1.71 config.xml
! --- etc/agent/config.xml	5 May 2005 13:18:22 -0000	1.71
! +++ etc/agent/config.xml	7 Jul 2005 10:47:30 -0000
  @@ -25,6 +25,7 @@
       <!ENTITY    ciscoids    SYSTEM '/etc/ossim/agent/plugins/ciscoids.xml'>
***************
*** 196,218 ****
   <!-- &iis; -->
   <!-- &iptables; -->
! diff -auNr ossim-old/etc/agent/plugins/exchange.xml ossim-cvs/etc/agent/plugins/exchange.xml
! --- ossim-old/etc/agent/plugins/exchange.xml	1970-01-01 01:00:00.000000000 +0100
! +++ ossim-cvs/etc/agent/plugins/exchange.xml	2005-07-06 13:34:48.789286632 +0200
! @@ -0,0 +1,12 @@
! +<?xml version="1.0" encoding='UTF-8' ?>
! +
! +<!-- Microsoft Exchange -->
! +<plugin id="1521" process="" type="detector" start="no" enable="no">
! +    <startup></startup>
! +    <shutdown></shutdown>
! +    <source>common</source>
! +    <interface>&interface;</interface>
! +    <sensor>&sensor;</sensor>
! +    <location>/tmp/exchange.log</location>
! +</plugin>
! +
! diff -auNr ossim-old/etc/agent/plugins/Makefile.am ossim-cvs/etc/agent/plugins/Makefile.am
! --- ossim-old/etc/agent/plugins/Makefile.am	2005-07-06 14:12:51.596247224 +0200
! +++ ossim-cvs/etc/agent/plugins/Makefile.am	2005-07-06 14:17:07.956274576 +0200
  @@ -6,6 +6,7 @@
   	ciscoids.xml \
--- 196,202 ----
   <!-- &iis; -->
   <!-- &iptables; -->
! diff -a -u -r1.1 Makefile.am
! --- etc/agent/plugins/Makefile.am	2 Mar 2005 14:55:09 -0000	1.1
! +++ etc/agent/plugins/Makefile.am	7 Jul 2005 10:47:30 -0000
  @@ -6,6 +6,7 @@
   	ciscoids.xml \