File nagios-nsca.abuild.patch of Package nagios-nsca
--- src/nsca.c 2011-11-04 19:21:29.000000000 +0100
+++ src/nsca.c.a 2011-11-11 08:36:52.000000000 +0100
@@ -477,7 +477,7 @@
int checkresult_test_fd=-1;
char *checkresult_test=NULL;
asprintf(&checkresult_test,"%s/nsca.test.%i",check_result_path,getpid());
- checkresult_test_fd=open(checkresult_test,O_WRONLY|O_CREAT);
+ checkresult_test_fd=open(checkresult_test,O_WRONLY|O_CREAT,0666);
if (checkresult_test_fd>0){
unlink(checkresult_test);
}
@@ -723,6 +723,7 @@
/* we couldn't find the read handler */
syslog(LOG_ERR, "Handler stack corrupt - aborting");
do_exit(STATE_CRITICAL);
+ return 0; /* not reached */
}
@@ -739,6 +740,7 @@
/* we couldn't find the write handler */
syslog(LOG_ERR, "Handler stack corrupt - aborting");
do_exit(STATE_CRITICAL);
+ return 0; /* not reached */
}
@@ -1247,7 +1249,7 @@
fprintf(checkresult_file_fp,"### NSCA Passive Check Result ###\n");
fprintf(checkresult_file_fp,"# Time: %s",ctime(¤t_time));
fprintf(checkresult_file_fp,"file_time=%d\n\n",current_time);
- fprintf(checkresult_file_fp,"### %s Check Result ###\n",(svc_description=="")?"Host":"Service");
+ fprintf(checkresult_file_fp,"### %s Check Result ###\n",( strcmp(svc_description,"") == 0 )?"Host":"Service");
fprintf(checkresult_file_fp,"host_name=%s\n",host_name);
if(strcmp(svc_description,""))
fprintf(checkresult_file_fp,"service_description=%s\n",svc_description);