4119 Commits

Author SHA1 Message Date
slerena
7d189d4849 2010-11-14 Sancho Lerena <slerena@artica.es>
* bin/util/pandora_update.exe: This small binary (see the Unix
        perl version to see the sources), allow to replace the running
        windows binary, by stopping the service and restarting it. Will
        allow automatic upgrades of the agent using the fille collection
        mechanism.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3582 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-15 01:37:56 +00:00
Ramon Novoa
cafe7ef8e5 2010-11-12 Ramon Novoa <rnovoa@artica.es>
* windows/pandora_wmi.cc: isServiceRunning returns -1 for module
	  states other than "Running" and "Stopped".

	* modules/pandora_module_logevent.cc,
	  modules/pandora_module_logevent.h: Return a non empty string if
	  the event description can not be read. Save the event id as an
	  unsigned long int to avoid overflows.

	* modules/pandora_module_service.cc,
	  modules/pandora_module_service.h: Aesthetic fix. Removed carriage
	  returns.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3580 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-12 13:41:24 +00:00
Ramon Novoa
fdf6e21673 2010-11-08 Ramon Novoa <rnovoa@artica.es>
* modules/pandora_module_logevent.cc,
	  modules/pandora_module_logevent.h: Re-wrote the module to avoid
	  using EVENTLOG_SEEK_READ, which seems to cause a lot of trouble.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3561 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-08 19:26:17 +00:00
Ramon Novoa
486749d686 2010-11-05 Ramon Novoa <rnovoa@artica.es>
* installer/pandora.mpi: Updated installation messages.

	* pandora_windows_service.cc: startup_delay after the service is
	  started, not before. Read all secondary server parameters.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3543 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-05 14:07:42 +00:00
Ramon Novoa
d88ececb74 2010-11-03 Ramon Novoa <rnovoa@artica.es>
* bin/util/tentacle_client.exe: Updated the tentacle client.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3507 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-03 17:27:04 +00:00
slerena
1153cfdff5 2010-10-29 Sancho Lerena <slerena@artica.es>
* win32/bin/util/mibs: Added default mibs for the small snmpagent
    * tool.

    * win32/bin/util/getsnmp.bat,
    win32/bin/util/snmpget.exe: Added tool to get snmp info from the
    agent using tool from a module_exec.

    * win32/installer/pandora.mpi: Updated installer to have snmpget and
    mibs in the install process.

    * win32/pandora_windows_service.cc: Fixed bug 3098165.

    * win32/pandora.cc: Updated version


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3482 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-29 15:50:43 +00:00
Ramon Novoa
76d230a1e6 2010-10-27 Ramon Novoa <rnovoa@artica.es>
* modules/pandora_module_logevent.cc: We need more information on error
	  997, ignore it for now.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3469 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-27 11:52:07 +00:00
Ramon Novoa
e1685c7b77 2010-10-04 Ramon Novoa <rnovoa@artica.es>
* windows/pandora_wmi.cc: Fixed inventory NIC information.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3339 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-04 17:24:10 +00:00
Ramon Novoa
d8640d3b50 2010-10-04 Ramon Novoa <rnovoa@artica.es>
* modules/pandora_module_inventory.cc: Fixed XML generation for
	  inventory modules.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3335 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-04 14:02:27 +00:00
Ramon Novoa
49f8c027de 2010-09-20 Ramon Novoa <rnovoa@artica.es>
* unix/pandora_agent, win32/modules/pandora_module.cc: Added
	  module_interval information to the data XML.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3260 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-20 15:03:06 +00:00
Ramon Novoa
53c2257fca 2010-08-04 Ramon Novoa <rnovoa@artica.es>
* Makefile.am: Use -static-libstdc++ to remove the dependency on
          libstdc++-6.dll.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3103 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-08-04 18:26:43 +00:00
Ramon Novoa
8855493ec9 2010-08-04 Ramon Novoa <rnovoa@artica.es>
* modules/pandora_module.cc: Free the collection if it can not
          be added to the list.

        * Makefile.am: Use -static-libgcc to remove the dependency on
          libgcc_s_sjlj-1.dll.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3101 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-08-04 17:47:44 +00:00
Ramon Novoa
6edb348195 2010-08-04 Ramon Novoa <rnovoa@artica.es>
* modules/pandora_module.cc: Run action commands through cmd.exe.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3096 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-08-04 16:28:25 +00:00
darode
1cd9608ae3 2010-07-30 Dario Rodriguez <dario.rodriguez@artica.es>
* win32/installer/pandora.mpi: Added collections directory in the windows 
	installer.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3095 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-08-04 16:17:31 +00:00
slerena
48d137cd7f 2010-08-04 Sancho Lerena <slerena@artica.es>
* win32/bin/util/df_percent.vbs: New VBS plugin to detect all 
        hardrives and return free disk on %.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3093 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-08-04 14:57:56 +00:00
Ramon Novoa
1df39b4c9d 2010-08-04 Ramon Novoa <rnovoa@artica.es>
* modules/pandora_module.cc: Changed sscanf format strings. They did
          not seem to work well in native Windows.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3092 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-08-04 12:38:42 +00:00
darode
2b18bd0ef7 2010-07-21 Dario Rodriguez <dario.rodriguez@artica.es>
* win32/pandora_agent_conf.cc, pandora_agent_conf.h: Added logic to search 
	existing collections in config file, and checking for ".." substrings in 
	path for security reasons.
	* win32/pandora_windows_service.h, pandora_windows_service.cc: Added logic
	to remove incoherences between collections directory and collection list 
	of config file.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3045 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-07-21 10:03:20 +00:00
darode
033040b10f 2010-07-20 Dario Rodriguez <dario.rodriguez@artica.es>
* win32/pandora_agent_conf.cc, pandora_agent_conf.h: Added a variable to
	control if the collection is added to the PATH.
	* win32/pandora_windows_service.h, pandora_windows_service.cc: Added logic
	to check if the collection is added to the PATH or not.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3043 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-07-20 16:38:29 +00:00
darode
24f85e81ca 2010-07-16 Dario Rodriguez <dario.rodriguez@artica.es>
* misc/pandora_file.cc: fixed error that caused double free.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3019 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-07-16 12:42:38 +00:00
darode
afb6e012a9 2010-07-16 Dario Rodriguez <dario.rodriguez@artica.es>
* misc/pandora_file.cc: fixed unclosed directory with function closedir
	and control posible delete errors.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3018 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-07-16 12:28:49 +00:00
darode
e78abe09af 2010-07-16 Dario Rodriguez <dario.rodriguez@artica.es>
* misc/pandora_file.cc: fixed unclosed directory with function closedir.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3017 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-07-16 12:10:49 +00:00
darode
d830a9dc36 2010-07-16 Dario Rodriguez <dario.rodriguez@artica.es>
* win32/bin/util/unzip.exe: Added to bin/utils to use it to unzip 
	collections.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3016 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-07-16 11:57:09 +00:00
darode
1ab8d24ba5 2010-07-16 Dario Rodriguez <dario.rodriguez@artica.es>
* misc/pandora_file.cc, pandora_file.h: Added function to remove directories
	recursively

        * win32/pandora_windows_service.cc, pandora_windows_service.h: Added
        support for unzip collections and improved functionality to manage
	collections.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3015 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-07-16 11:43:07 +00:00
darode
16f3d39f87 2010-07-14 Dario Rodriguez <dario.rodriguez@artica.es>
* win32/pandora_agent_conf.cc, pandora_agent_conf.h: Added functionality
	to get collection from configuration file.
        * win32/pandora_windows_service.cc, pandora_windows_service.h: Added
	support for manage collections



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3007 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-07-14 17:16:08 +00:00
darode
76e22972cf 2010-07-13 Dario Rodriguez <dario.rodriguez@artica.es>
* pandora_agent_conf.cc: Added support to parse collections
	* pandora_agent_conf.h: Added support to parse collections



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3002 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-07-13 17:24:00 +00:00
Ramon Novoa
9aed18321e 2010-07-12 Ramon Novoa <rnovoa@artica.es>
* modules/pandora_module.h, modules/pandora_module_factory.cc,
          modules/pandora_module.cc, pandora_windows_service.cc: Added the
          module_cron feature to schedule modules using a cron-like syntax and
          some small fixes.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2993 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-07-12 16:31:07 +00:00
darode
b439d5053c 2010-07-09 Dario Rodriguez <dario.rodriguez@artica.es>
* win32/configure.in, Makefile.am: Modified to compile executable with
	version information embedded

	* win32/versioninfo.rc: Added version information file for win32 
	executable
	Fixes: #3007874



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2984 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-07-09 12:58:15 +00:00
darode
d8e6992254 2010-07-07 Dario Rodriguez <dario.rodriguez@artica.es>
* win32/pandora_windows_service.h: Added constant for default port for
	ftp and ssh 
	
	* win32/pandora_windows_service.cc: Added support for change ssh and ftp
	port



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2971 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-07-07 15:14:18 +00:00
Ramon Novoa
7095a1626b 2010-07-06 Ramon Novoa <rnovoa@artica.es>
* pandora_windows_service.cc: Fixed the autotime feature. Was not
          working since tinyXML was removed.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2964 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-07-06 11:47:43 +00:00
raulmateos
1203784e8c 2010-07-05 Raul Mateos <raulfopandora@gmail.com>
* bin/pandora_agent.conf: Added example of D Drive. Added comments
        to some modules. Added lost module_begin. Improved command.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2960 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-07-05 09:12:14 +00:00
Ramon Novoa
e693d976b0 2010-07-02 Ramon Novoa <rnovoa@artica.es>
* modules/pandora_module.h, modules/pandora_module_factory.cc,
          modules/pandora_module.cc, pandora_windows_service.cc: Added the
          module_condition feature. See http://openideas.info/wiki/ for more
          information.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2956 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-07-02 14:25:53 +00:00
Ramon Novoa
cdd4f87774 2010-06-30 Ramon Novoa <rnovoa@artica.es>
* windows/pandora_wmi.cc: getDiskFreeSpacePercent should not return
          any value if the drive does not exist. Fixed.

        * modules/pandora_module.h, modules/pandora_module_factory.cc,
          modules/pandora_module.cc, pandora_windows_service.cc: Added support
          for saving the value of a module as an environment variable.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2935 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-06-30 15:40:25 +00:00
slerena
b59ccc26ee 2010-06-13 Sancho Lerena <slerena@artica.es>
* bin/util/logevent_log4x.vbs: Fixed a small undefinition who
        makes script not working on summer time.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2903 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-06-13 13:43:27 +00:00
Ramon Novoa
157bf2ec94 2010-06-08 Ramon Novoa <rnovoa@artica.es>
* unix/DEBIAN/control, unix/DEBIAN/make_deb_package.sh,
          unix/pandora_agent.spec, unix/pandora_agent,
          win32/installer/pandora.mpi, win32/pandora.cc: Updated version
          strings.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2880 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-06-08 17:06:14 +00:00
Ramon Novoa
4413cceabd 2010-06-08 Ramon Novoa <rnovoa@artica.es>
* windows/pandora_wmi.cc, modules/pandora_module_logevent.cc: Removed
          unnecessary log information.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2876 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-06-08 16:49:40 +00:00
raulmateos
f7d418031e 2010-05-27 Raul Mateos <raulofpandora@gmail.com>
* bin/pandora_agent.conf: Added some example. Changed
        description for Disk Free (added %). Updated build.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2807 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-27 06:59:39 +00:00
Ramon Novoa
6eb81e4838 2010-05-19 Ramon Novoa <rnovoa@artica.es>
* pandora_strutils.h, modules/pandora_module_odbc.h,
          modules/pandora_data.h, build.sh, pandora.h,
          udp_server/udp_server.h, Makefile.am: Small fixes so the agent
          builds under newer versions of MinGW.

        * installer/pandora.mpi: Updated build.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2752 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-19 15:21:10 +00:00
Ramon Novoa
d4611dc1cd 2010-05-13 Ramon Novoa <rnovoa@artica.es>
* pandora_windows_service.cc: Check the return codee of the tentacle
          client. Fixes bug #2972399.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2722 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-13 15:39:52 +00:00
Ramon Novoa
85dd1e7513 2010-05-12 Ramon Novoa <rnovoa@artica.es>
* build.sh: Added to repository. Pandora Agent installer build script.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2703 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-12 08:40:48 +00:00
slerena
2219ed336e 2010-04-23 Sancho Lerena <slerena@artica.es>
* bin/pandora_agent.conf: Updated sample conf with some examples of
        inventory usage, and agent plugins (commented).

        * bin/util/df.vbs, bin/util/ps.vbs: Added flush in the end of each module

        * bin/util/logevent_log4x.vbs: New agent plugin to parse eventlog and
        generate a Log4x format.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2604 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-23 16:47:28 +00:00
Ramon Novoa
a7b159323c 2010-04-23 Ramon Novoa <rnovoa@artica.es>
* modules/pandora_module_inventory.cc: Fixed a couple of XML tags.

        * installer/pandora.mpi: Added the vbs scripts to the installer.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2603 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-23 14:31:10 +00:00
Ramon Novoa
b363210cba 2010-04-21 Ramon Novoa <rnovoa@artica.es>
* main.cc: Updated headers after tinyxml removal.

        * modules/pandora_module_list.cc,
          modules/pandora_module_factory.cc: Added support for plugin modules.

        * modules/pandora_module_exec.cc, modules/pandora_module.h,
          modules/pandora_module.cc: Added the module_timeout configuration
          token and replaced tinyxml related code.

        * bin/pandora_agent.conf: Added a sample plugin module. Added the
          group configuration token (was missing).

        * modules/pandora_module_plugin.cc,
          modules/pandora_module_plugin.h: Added to repository. Plugin module.

        * bin/util/df.vbs, bin/util/ps.vbs: Added to repository. Sample
          VBScript plugins.

        * pandora_windows_service.cc, pandora_windows_service.h,
          modules/pandora_module_inventory.cc, ssh/pandora_ssh_test.cc,
          ftp/pandora_ftp_test.cc, modules/pandora_module_inventory.h: Replaced
          tinyxml related code.

        * tinyxml, tinyxml/tinyxmlerror.cpp, tinyxml/tinystr.h,
          tinyxml/tinyxmlparser.cpp, tinyxml/tinyxml.cpp,
          tinyxml/tinyxml.h, tinyxml/tinystr.cpp: Removed from repository. No
          longer used.

        * installer/pandora.mpi, pandora.cc: Updated build to RC1.

        * Makefile.am: Updated sources. Removed tinyxml and added the plugin
          module.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2584 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-21 20:00:31 +00:00
Ramon Novoa
f5a64d8e9d 2010-04-16 Ramon Novoa <rnovoa@artica.es>
* windows/pandora_wmi.cc: fixed getOSVersion. Crashed in Windows 2008
          and Windows 7.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2572 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-16 13:12:23 +00:00
Ramon Novoa
40febeca27 2009-12-18 Ramon Novoa <rnovoa@artica.es>
* windows/pandora_wmi.cc: Fixed bug #2907481.

        * bin/PandoraAgent.exe: Updated to current revision.
        
        * installer/pandora.mpi, pandora.cc: Updated build.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2223 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2009-12-18 20:04:42 +00:00
raulmateos
40f7f01680 2009-12-16 Raul Mateos <raulofpandora@gmail.com>
* installer/pandora.mpi, README:Preparing release
	changing version to final.

	* installer/logo.png: Updated logo

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2209 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2009-12-16 18:25:17 +00:00
Ramon Novoa
6eee94779b 2009-11-26 Ramon Novoa <rnovoa@artica.es>
* installer/pandora.mpi: Updated version and silent install mode.

        * pandora_windows_service.cc: Set the path from the agent to avoid
          having to reboot. Fixed a typo.

        * pandora.cc: Updated version.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2137 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2009-11-26 17:15:06 +00:00
raulmateos
0d8ae7f9db 2008-11-26 Raul Mateos <raulofpandora@gmail.com>
* installer/pandora.mpi: Updated installer build to RC3.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2136 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2009-11-26 14:46:36 +00:00
Ramon Novoa
6e4c5c4be1 2009-11-24 Ramon Novoa <rnovoa@artica.es>
* installer/pandora_silent.mpi: Removed from repository. Merged changes
          into pandora.mpi.

        * installer/pandora.mpi: Merged with pandora_silent.mpi.

        * pandora.cc: Updated version string.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2126 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2009-11-24 17:31:53 +00:00
Ramon Novoa
609e56c865 2009-11-19 Ramon Novoa <rnovoa@artica.es>
* windows/pandora_wmi.cc: Fixed bug #2895307.

        * modules/pandora_module.cc: Fixed bug #2835450.

        * bin/pandora_agent.conf: Added xml_buffer configuration token.

        * ssh/libssh2/libssh2_config.h, ssh/libssh2/packet.c: Renamed usleep to
          u_sleep to avoid conflicts.

        * pandora_windows_service.cc: Fixed bug #2899257.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2115 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2009-11-19 00:40:26 +00:00
slerena
b6ffbbda11 ancho Lerena <slerena@artica.es>
* Installer/Pandora_silent.mpi: Installer in silent mode. Should
        replace pandora.mpi in the future, includes both, using a
        command line to choose standard or un-attended install.


M    win32/ChangeLog
A    win32/installer/pandora_silent.mpi
M    win32/installer/pandora.mpi


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2111 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2009-11-17 00:51:22 +00:00