[Nagios-checkins] CVS: nagios/cgi extinfo.c,1.11,1.12 notifications.c,1.5,1.6

[Ethan G. <ega...@us...>]

Update of /cvsroot/nagios/nagios/cgi
In directory usw-pr-cvs1:/tmp/cvs-serv11142/cgi

Modified Files:
	extinfo.c notifications.c 
Log Message:
Bug fixes

Index: extinfo.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/extinfo.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** extinfo.c	29 Jul 2002 04:50:53 -0000	1.11
--- extinfo.c	13 Aug 2002 01:31:16 -0000	1.12
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2002 Ethan Galstad (na...@na...)
!  * Last Modified: 07-28-2002
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2002 Ethan Galstad (na...@na...)
!  * Last Modified: 08-12-2002
   *
   * License:
***************
*** 488,496 ****
  			        }
  
! 			host_name=(char *)malloc(strlen(variables[x])+1);
  			if(host_name==NULL)
  				host_name="";
- 			else
- 				strcpy(host_name,variables[x]);
  			}
  
--- 488,494 ----
  			        }
  
! 			host_name=strdup(variables[x]);
  			if(host_name==NULL)
  				host_name="";
  			}
  
***************
*** 503,511 ****
  			        }
  
! 			hostgroup_name=(char *)malloc(strlen(variables[x])+1);
  			if(hostgroup_name==NULL)
  				hostgroup_name="";
- 			else
- 				strcpy(hostgroup_name,variables[x]);
  			}
  
--- 501,507 ----
  			        }
  
! 			hostgroup_name=strdup(variables[x]);
  			if(hostgroup_name==NULL)
  				hostgroup_name="";
  			}
  
***************
*** 518,526 ****
  			        }
  
! 			service_desc=(char *)malloc(strlen(variables[x])+1);
  			if(service_desc==NULL)
  				service_desc="";
- 			else
- 				strcpy(service_desc,variables[x]);
  			}
  
--- 514,520 ----
  			        }
  
! 			service_desc=strdup(variables[x]);
  			if(service_desc==NULL)
  				service_desc="";
  			}
  

Index: notifications.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/notifications.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** notifications.c	29 Jul 2002 04:50:53 -0000	1.5
--- notifications.c	13 Aug 2002 01:31:16 -0000	1.6
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2002 Ethan Galstad (na...@na...)
!  * Last Modified: 07-26-2002
   *
   * This CGI program will display the notification events for 
--- 4,8 ----
   *
   * Copyright (c) 1999-2002 Ethan Galstad (na...@na...)
!  * Last Modified: 08-12-2002
   *
   * This CGI program will display the notification events for 
***************
*** 68,73 ****
  int query_type=FIND_HOST;
  int find_all=TRUE;
! char *query_contact_name="all";
! char *query_host_name="all";
  char *query_svc_description="";
  
--- 68,73 ----
  int query_type=FIND_HOST;
  int find_all=TRUE;
! char *query_contact_name="";
! char *query_host_name="";
  char *query_svc_description="";
  
***************
*** 367,372 ****
  			        }
  
! 			query_host_name=variables[x];
! 
  			if(!strcmp(query_host_name,"all"))
  				find_all=TRUE;
--- 367,373 ----
  			        }
  
! 			query_host_name=strdup(variables[x]);
! 			if(query_host_name==NULL)
! 				query_host_name="";
  			if(!strcmp(query_host_name,"all"))
  				find_all=TRUE;
***************
*** 384,389 ****
  			        }
  
! 			query_contact_name=variables[x];
  
  			if(!strcmp(query_contact_name,"all"))
  				find_all=TRUE;
--- 385,392 ----
  			        }
  
! 			query_contact_name=strdup(variables[x]);
  
+ 			if(query_contact_name==NULL)
+ 				query_contact_name="";
  			if(!strcmp(query_contact_name,"all"))
  				find_all=TRUE;
***************
*** 401,405 ****
  			        }
  
! 			query_svc_description=variables[x];
  		        }
  	
--- 404,410 ----
  			        }
  
! 			query_svc_description=strdup(variables[x]);
! 			if(query_svc_description==NULL)
! 				query_svc_description="";
  		        }