From: Ethan G. <ega...@us...> - 2005-12-23 20:20:14
|
Update of /cvsroot/nagios/nagios/xdata In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1992/xdata Modified Files: xodtemplate.c Log Message: Bug fix for non-registered objects in wildcard/regex template logic Index: xodtemplate.c =================================================================== RCS file: /cvsroot/nagios/nagios/xdata/xodtemplate.c,v retrieving revision 1.103 retrieving revision 1.104 diff -C2 -d -r1.103 -r1.104 *** xodtemplate.c 13 Dec 2005 00:42:45 -0000 1.103 --- xodtemplate.c 23 Dec 2005 20:20:00 -0000 1.104 *************** *** 10355,10358 **** --- 10355,10362 ---- found_match=TRUE; + /* dont' add contacts that shouldn't be registered */ + if(temp_contact->register_object==FALSE) + continue; + /* add contact to list */ xodtemplate_add_contact_to_contactlist(list,temp_contact->contact_name); *************** *** 10376,10379 **** --- 10380,10387 ---- continue; + /* dont' add contacts that shouldn't be registered */ + if(temp_contact->register_object==FALSE) + continue; + /* add contact to list */ xodtemplate_add_contact_to_contactlist(list,temp_contact->contact_name); *************** *** 10594,10597 **** --- 10602,10609 ---- found_match=TRUE; + /* dont' add hostgroups that shouldn't be registered */ + if(temp_hostgroup->register_object==FALSE) + continue; + /* add hostgroup members to list */ xodtemplate_add_hostgroup_members_to_hostlist(list,temp_hostgroup); *************** *** 10612,10615 **** --- 10624,10631 ---- for(temp_hostgroup=xodtemplate_hostgroup_list;temp_hostgroup!=NULL;temp_hostgroup=temp_hostgroup->next){ + /* dont' add hostgroups that shouldn't be registered */ + if(temp_hostgroup->register_object==FALSE) + continue; + /* add hostgroup to list */ xodtemplate_add_hostgroup_members_to_hostlist(list,temp_hostgroup); *************** *** 10721,10724 **** --- 10737,10744 ---- found_match=TRUE; + /* dont' add hosts that shouldn't be registered */ + if(temp_host->register_object==FALSE) + continue; + /* add host to list */ xodtemplate_add_host_to_hostlist(list,temp_host->host_name); *************** *** 10742,10745 **** --- 10762,10769 ---- continue; + /* dont' add hosts that shouldn't be registered */ + if(temp_host->register_object==FALSE) + continue; + /* add host to list */ xodtemplate_add_host_to_hostlist(list,temp_host->host_name); *************** *** 10993,10996 **** --- 11017,11024 ---- found_match=TRUE; + /* dont' add servicegroups that shouldn't be registered */ + if(temp_servicegroup->register_object==FALSE) + continue; + /* add servicegroup members to list */ xodtemplate_add_servicegroup_members_to_servicelist(list,temp_servicegroup); *************** *** 11011,11014 **** --- 11039,11046 ---- for(temp_servicegroup=xodtemplate_servicegroup_list;temp_servicegroup!=NULL;temp_servicegroup=temp_servicegroup->next){ + /* dont' add servicegroups that shouldn't be registered */ + if(temp_servicegroup->register_object==FALSE) + continue; + /* add servicegroup to list */ xodtemplate_add_servicegroup_members_to_servicelist(list,temp_servicegroup); *************** *** 11157,11160 **** --- 11189,11196 ---- found_match=TRUE; + /* dont' add services that shouldn't be registered */ + if(temp_service->register_object==FALSE) + continue; + /* add service to the list */ xodtemplate_add_service_to_servicelist(list,host_name,temp_service->service_description); *************** *** 11181,11184 **** --- 11217,11224 ---- continue; + /* dont' add services that shouldn't be registered */ + if(temp_service->register_object==FALSE) + continue; + /* add service to the list */ xodtemplate_add_service_to_servicelist(list,host_name,temp_service->service_description); |