ossec-hids: common.c (HEAD) [dcid]
OSSEC CVS
Changes by: dcid 08/08/29 14:15:10
Modified files:
common.c
Log message:
Description: A few more fixes before the final release.
Reviewed by: dcid
Bug:
Index: common.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/win32/ui/common.c,v
diff -u -r1.11 -r1.12
--- common.c 17 Jun 2008 17:04:10 -0000 1.11
+++ common.c 29 Aug 2008 17:15:10 -0000 1.12
@@ -402,22 +402,23 @@
/* Getting ip */
str = OS_GetOneContentforElement(&xml, xml_serverip);
- if(str)
+ if(str && (OS_IsValidIP(str, NULL) == 1))
{
- if(OS_IsValidIP(str, NULL) == 1)
- {
- config_inst.server_type = SERVER_IP_USED;
- config_inst.server = str;
-
- OS_ClearXML(&xml);
- return(1);
- }
+ config_inst.server_type = SERVER_IP_USED;
+ config_inst.server = str;
- free(str);
+ OS_ClearXML(&xml);
+ return(1);
}
/* If we dont find the ip, try the server-hostname */
else
{
+ if(str)
+ {
+ free(str);
+ str = NULL;
+ }
+
str = OS_GetOneContentforElement(&xml, xml_serverhost);
if(str)
{
OSSEC CVS
Changes by: dcid 09/06/24 15:53:11
Modified files:
common.c os_win32ui.c os_win32ui.h win32ui.rc
Log message:
Description: Changing copyrights to Trend Micro
Reviewed by: dcid
Bug:
Index: common.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/win32/ui/common.c,v
diff -u -r1.12 -r1.13
--- common.c 29 Aug 2008 17:15:10 -0000 1.12
+++ common.c 24 Jun 2009 18:53:10 -0000 1.13
@@ -1,6 +1,6 @@
/* @(#) $Id$ */
-/* Copyright (C) 2008 Third Brigade, Inc.
+/* Copyright (C) 2009 Trend Micro Inc.
* All rights reserved.
*
* This program is a free software; you can redistribute it
Index: os_win32ui.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/win32/ui/os_win32ui.c,v
diff -u -r1.9 -r1.10
--- os_win32ui.c 17 Jun 2008 17:04:10 -0000 1.9
+++ os_win32ui.c 24 Jun 2009 18:53:10 -0000 1.10
@@ -1,6 +1,6 @@
/* @(#) $Id$ */
-/* Copyright (C) 2008 Third Brigade, Inc.
+/* Copyright (C) 2009 Trend Micro Inc.
* All rights reserved.
*
* This program is a free software; you can redistribute it
Index: os_win32ui.h
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/win32/ui/os_win32ui.h,v
diff -u -r1.7 -r1.8
--- os_win32ui.h 17 Jun 2008 17:04:10 -0000 1.7
+++ os_win32ui.h 24 Jun 2009 18:53:10 -0000 1.8
@@ -1,6 +1,6 @@
/* @(#) $Id$ */
-/* Copyright (C) 2008 Third Brigade, Inc.
+/* Copyright (C) 2009 Trend Micro Inc.
* All rights reserved.
*
* This program is a free software; you can redistribute it
Index: win32ui.rc
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/win32/ui/win32ui.rc,v
diff -u -r1.6 -r1.7
--- win32ui.rc 17 Jun 2008 17:04:10 -0000 1.6
+++ win32ui.rc 24 Jun 2009 18:53:11 -0000 1.7
@@ -1,6 +1,6 @@
/* @(#) $Id$ */
-/* Copyright (C) 2008 Third Brigade, Inc.
+/* Copyright (C) 2009 Trend Micro Inc.
* All rights reserved.
*
* This program is a free software; you can redistribute it
@@ -28,7 +28,7 @@
FONT 8, "MS Sans Serif"
BEGIN
DEFPUSHBUTTON "&Close",UI_ID_CLOSE,90,90,50,14
- GROUPBOX " Copyright (C) 2008 Third Brigade, Inc.",
+ GROUPBOX " Copyright (C) 2009 Trend Micro Inc.",
IDC_STATIC,7,7,245,82
CTEXT "This program is a free software; you can redistribute it" \
" and/or modify it under the terms of the GNU General" \