[Nagios-checkins] SF.net SVN: nagios:[1723] nagioscore/trunk
Nagios network monitoring software is enterprise server monitoring
Brought to you by:
egalstad,
sawolf-nagios
From: <to...@us...> - 2011-04-18 10:42:15
|
Revision: 1723 http://nagios.svn.sourceforge.net/nagios/?rev=1723&view=rev Author: tonvoon Date: 2011-04-18 10:42:04 +0000 (Mon, 18 Apr 2011) Log Message: ----------- Reverted change 1447 as this test fails: * host with alias or display_name set, or service with alias set * change definition in configuration and reload * host or service will have old configuration Modified Paths: -------------- nagioscore/trunk/Changelog nagioscore/trunk/xdata/xrddefault.c Modified: nagioscore/trunk/Changelog =================================================================== --- nagioscore/trunk/Changelog 2011-04-09 23:20:37 UTC (rev 1722) +++ nagioscore/trunk/Changelog 2011-04-18 10:42:04 UTC (rev 1723) @@ -77,7 +77,6 @@ * Fix for incorrect comment expiration times being passed to event broker (Mattieu Kermagot) * Doc updates related to cleaning of custom macros (Peter Valdemar Morch) * Fix to sample notify-service-by-email command (bug #62) -* Fix for retaining host display name and alias, as well as service display name (Folkert van Heusden) Modified: nagioscore/trunk/xdata/xrddefault.c =================================================================== --- nagioscore/trunk/xdata/xrddefault.c 2011-04-09 23:20:37 UTC (rev 1722) +++ nagioscore/trunk/xdata/xrddefault.c 2011-04-18 10:42:04 UTC (rev 1723) @@ -4,7 +4,7 @@ * * Copyright (c) 2009 Nagios Core Development Team and Community Contributors * Copyright (c) 1999-2010 Ethan Galstad (ega...@na...) - * Last Modified: 09-01-2010 + * Last Modified: 08-06-2010 * * License: * @@ -357,8 +357,6 @@ fprintf(fp,"host {\n"); fprintf(fp,"host_name=%s\n",temp_host->name); - fprintf(fp,"alias=%s\n",temp_host->alias); - fprintf(fp,"display_name=%s\n",temp_host->display_name); fprintf(fp,"modified_attributes=%lu\n",(temp_host->modified_attributes & ~host_attribute_mask)); fprintf(fp,"check_command=%s\n",(temp_host->host_check_command==NULL)?"":temp_host->host_check_command); fprintf(fp,"check_period=%s\n",(temp_host->check_period==NULL)?"":temp_host->check_period); @@ -429,7 +427,6 @@ fprintf(fp,"service {\n"); fprintf(fp,"host_name=%s\n",temp_service->host_name); - fprintf(fp,"display_name=%s\n",temp_service->display_name); fprintf(fp,"service_description=%s\n",temp_service->description); fprintf(fp,"modified_attributes=%lu\n",(temp_service->modified_attributes & ~service_attribute_mask)); fprintf(fp,"check_command=%s\n",(temp_service->service_check_command==NULL)?"":temp_service->service_check_command); @@ -1183,14 +1180,6 @@ temp_host->last_state=atoi(val); else if(!strcmp(var,"last_hard_state")) temp_host->last_hard_state=atoi(val); - else if(!strcmp(var,"alias")){ - my_free(temp_host->alias); - temp_host->alias=(char *)strdup(val); - } - else if(!strcmp(var,"display_name")){ - my_free(temp_host->display_name); - temp_host->display_name=(char *)strdup(val); - } else if(!strcmp(var,"plugin_output")){ my_free(temp_host->plugin_output); temp_host->plugin_output=(char *)strdup(val); @@ -1462,10 +1451,6 @@ temp_service->last_state=atoi(val); else if(!strcmp(var,"last_hard_state")) temp_service->last_hard_state=atoi(val); - else if(!strcmp(var,"display_name")){ - my_free(temp_service->display_name); - temp_service->display_name=(char *)strdup(val); - } else if(!strcmp(var,"current_attempt")) temp_service->current_attempt=atoi(val); else if(!strcmp(var,"current_event_id")) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |