diff --git a/pandora_agents/win32/ChangeLog b/pandora_agents/win32/ChangeLog index a98e38ed82..7df6716349 100644 --- a/pandora_agents/win32/ChangeLog +++ b/pandora_agents/win32/ChangeLog @@ -1,3 +1,12 @@ +2007-08-27 Esteban Sanchez + + * pandora.cc: Updated buildname. + + * main.cc: Added a missing "]" character. Added version number when + showing the help. Fixes #1782569. + + * bin/PandoraAgent.exe: Updated to last commit. + 2007-08-24 Esteban Sanchez * pandora.cc: Changed log and debug file to have the same name that @@ -9,6 +18,7 @@ * win32/windows/pandora_wmi.cc: Fixed a bug when reading free space from a read-only device such as CD-ROM by improving the WQL query. + (Fixes #1780455) * bin/PandoraAgent.exe: Updated to last commit. diff --git a/pandora_agents/win32/bin/PandoraAgent.exe b/pandora_agents/win32/bin/PandoraAgent.exe index 916f1fc92b..d3b45ca387 100755 Binary files a/pandora_agents/win32/bin/PandoraAgent.exe and b/pandora_agents/win32/bin/PandoraAgent.exe differ diff --git a/pandora_agents/win32/main.cc b/pandora_agents/win32/main.cc index 6f91853bfb..eaceb9d1d7 100644 --- a/pandora_agents/win32/main.cc +++ b/pandora_agents/win32/main.cc @@ -92,6 +92,8 @@ main (int argc, char *argv[]) { } else if (_stricmp(argv[i], HELP_CMDLINE_PARAM) == 0) { /* Help parameter */ + cout << "Pandora agent for Windows. "; + cout << "Version " << getPandoraAgentVersion () << endl; cout << "Usage: " << argv[0] << " [OPTION]" << endl << endl; cout << "Available options are:" << endl; cout << "\t" << SERVICE_INSTALL_CMDLINE_PARAM; @@ -106,18 +108,21 @@ main (int argc, char *argv[]) { return 0; } else { /* No parameter recognized */ + cout << "Pandora agent for Windows. "; + cout << "Version " << getPandoraAgentVersion () << endl; cout << "Usage: " << argv[0] << " [" << SERVICE_INSTALL_CMDLINE_PARAM; cout << "] [" << SERVICE_UNINSTALL_CMDLINE_PARAM; cout << "] [" << SSH_TEST_CMDLINE_PARAM; - cout << "] [" << FTP_TEST_CMDLINE_PARAM; + cout << "] [" << FTP_TEST_CMDLINE_PARAM << "]"; cout << endl << endl; - cout << "Run " << argv[0] << "with " << HELP_CMDLINE_PARAM; + cout << "Run " << argv[0] << " with " << HELP_CMDLINE_PARAM; cout << " parameter for more info." << endl; return 1; } } - service->run (); + service->pandora_init (); + service->pandora_run (); delete service; diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 2dfc971a15..2ee121c37c 100644 --- a/pandora_agents/win32/pandora.cc +++ b/pandora_agents/win32/pandora.cc @@ -30,7 +30,7 @@ using namespace Pandora; using namespace Pandora_Strutils; #define PATH_SIZE _MAX_PATH+1 -#define PANDORA_VERSION ("1.3(Build 070807)") +#define PANDORA_VERSION ("1.3(Build 070827)") string pandora_path; string pandora_dir;