diff options
Diffstat (limited to 'web/attachments/36789-NSClient-1.07.0_1.patch')
-rw-r--r-- | web/attachments/36789-NSClient-1.07.0_1.patch | 240 |
1 files changed, 240 insertions, 0 deletions
diff --git a/web/attachments/36789-NSClient-1.07.0_1.patch b/web/attachments/36789-NSClient-1.07.0_1.patch new file mode 100644 index 0000000..7ce4552 --- /dev/null +++ b/web/attachments/36789-NSClient-1.07.0_1.patch | |||
@@ -0,0 +1,240 @@ | |||
1 | diff -uNr NSClient-1.07.0.orig/UnixSource/check_nt.c NSClient-1.07.0/UnixSource/check_nt.c | ||
2 | --- NSClient-1.07.0.orig/UnixSource/check_nt.c Sun Feb 24 14:55:48 2002 | ||
3 | +++ NSClient-1.07.0/UnixSource/check_nt.c Wed Nov 27 12:10:46 2002 | ||
4 | @@ -95,7 +95,7 @@ | ||
5 | int updays=0; | ||
6 | int uphours=0; | ||
7 | int upminutes=0; | ||
8 | - req_password=strscpy(req_password,"None"); | ||
9 | + asprintf(&req_password,"None"); | ||
10 | |||
11 | if(process_arguments(argc,argv)==ERROR) | ||
12 | usage("Could not parse arguments\n"); | ||
13 | @@ -108,11 +108,11 @@ | ||
14 | |||
15 | if (vars_to_check==CHECK_CLIENTVERSION) { | ||
16 | |||
17 | - send_buffer = strscpy(send_buffer,strcat(req_password,"&1")); | ||
18 | + asprintf(&send_buffer,strcat(req_password,"&1")); | ||
19 | result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer)); | ||
20 | if(result!=STATE_OK) | ||
21 | return result; | ||
22 | - output_message = strscpy(output_message,recv_buffer); | ||
23 | + asprintf(&output_message,recv_buffer); | ||
24 | return_code=STATE_OK; | ||
25 | } | ||
26 | else if(vars_to_check==CHECK_CPULOAD){ | ||
27 | @@ -121,14 +121,14 @@ | ||
28 | if (strtolarray(&lvalue_list,value_list,",")==TRUE) { | ||
29 | // -l parameters is present with only integers | ||
30 | return_code=STATE_OK; | ||
31 | - temp_string = strscpy(temp_string,"CPU Load"); | ||
32 | + asprintf(&temp_string,"CPU Load"); | ||
33 | while (lvalue_list[0+offset]>0 && lvalue_list[0+offset]<=17280 && | ||
34 | lvalue_list[1+offset]>=0 && lvalue_list[1+offset]<=100 && | ||
35 | lvalue_list[2+offset]>=0 && lvalue_list[2+offset]<=100) { | ||
36 | // loop until one of the parameters is wrong or not present | ||
37 | |||
38 | // Send request and retrieve data | ||
39 | - send_buffer = ssprintf(send_buffer,"%s&2&%lu",req_password,lvalue_list[0+offset]); | ||
40 | + asprintf(&send_buffer,"%s&2&%lu",req_password,lvalue_list[0+offset]); | ||
41 | result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer)); | ||
42 | if(result!=STATE_OK) | ||
43 | return result; | ||
44 | @@ -146,27 +146,27 @@ | ||
45 | else if(utilization >= lvalue_list[1+offset] && return_code<STATE_WARNING) | ||
46 | return_code=STATE_WARNING; | ||
47 | |||
48 | - output_message = ssprintf(output_message," (%lu min. %lu%)",lvalue_list[0+offset], utilization); | ||
49 | - temp_string = strscat(temp_string,output_message); | ||
50 | + asprintf(&output_message," (%lu min. %lu%)",lvalue_list[0+offset], utilization); | ||
51 | + asprintf(&temp_string,"%s%s",temp_string,output_message); | ||
52 | offset+=3; //move accross the array | ||
53 | } | ||
54 | if (strlen(temp_string)>10) { | ||
55 | // we had at least on loop | ||
56 | - output_message = ssprintf(output_message,"%s",temp_string); | ||
57 | + asprintf(&output_message,"%s",temp_string); | ||
58 | } | ||
59 | else | ||
60 | - output_message = strscpy(output_message,"not enough values for -l parameters"); | ||
61 | + asprintf(&output_message,"%s","not enough values for -l parameters"); | ||
62 | |||
63 | } else | ||
64 | - output_message = strscpy(output_message,"wrong -l parameter."); | ||
65 | + asprintf(&output_message,"wrong -l parameter."); | ||
66 | |||
67 | } else | ||
68 | - output_message = strscpy(output_message,"missing -l parameters"); | ||
69 | + asprintf(&output_message,"missing -l parameters"); | ||
70 | } | ||
71 | |||
72 | else if(vars_to_check==CHECK_UPTIME){ | ||
73 | |||
74 | - send_buffer = strscpy(send_buffer,strcat(req_password,"&3")); | ||
75 | + asprintf(&send_buffer,strcat(req_password,"&3")); | ||
76 | result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer)); | ||
77 | if(result!=STATE_OK) | ||
78 | return result; | ||
79 | @@ -180,7 +180,7 @@ | ||
80 | updays = uptime / 86400; | ||
81 | uphours = (uptime % 86400) / 3600; | ||
82 | upminutes = ((uptime % 86400) % 3600) / 60; | ||
83 | - output_message = ssprintf(output_message,"System Uptime : %u day(s) %u hour(s) %u minute(s)",updays,uphours, upminutes); | ||
84 | + asprintf(&output_message,"System Uptime : %u day(s) %u hour(s) %u minute(s)",updays,uphours, upminutes); | ||
85 | return_code=STATE_OK; | ||
86 | } | ||
87 | |||
88 | @@ -189,7 +189,7 @@ | ||
89 | return_code=STATE_UNKNOWN; | ||
90 | if (check_value_list==TRUE) { | ||
91 | if (strlen(value_list)==1) { | ||
92 | - send_buffer = ssprintf(send_buffer,"%s&4&%s", req_password, value_list); | ||
93 | + asprintf(&send_buffer,"%s&4&%s", req_password, value_list); | ||
94 | result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer)); | ||
95 | if(result!=STATE_OK) | ||
96 | return result; | ||
97 | @@ -204,7 +204,7 @@ | ||
98 | percent_used_space = ((total_disk_space - free_disk_space) / total_disk_space) * 100; | ||
99 | |||
100 | if (free_disk_space>=0) { | ||
101 | - temp_string = ssprintf(temp_string,"%s:\\ - total: %.2f Gb - used: %.2f Gb (%.0f%%) - free %.2f Gb (%.0f%%)", | ||
102 | + asprintf(&temp_string,"%s:\\ - total: %.2f Gb - used: %.2f Gb (%.0f%%) - free %.2f Gb (%.0f%%)", | ||
103 | value_list, total_disk_space / 1073741824, (total_disk_space - free_disk_space) / 1073741824, percent_used_space, | ||
104 | free_disk_space / 1073741824, (free_disk_space / total_disk_space)*100); | ||
105 | |||
106 | @@ -216,18 +216,18 @@ | ||
107 | else | ||
108 | return_code=STATE_OK; | ||
109 | |||
110 | - output_message = ssprintf(output_message,"%s",temp_string); | ||
111 | + asprintf(&output_message,"%s",temp_string); | ||
112 | |||
113 | } | ||
114 | else { | ||
115 | - output_message = ssprintf(output_message,"Free disk space : Invalid drive "); | ||
116 | + asprintf(&output_message,"Free disk space : Invalid drive "); | ||
117 | return_code=STATE_UNKNOWN; | ||
118 | } | ||
119 | } | ||
120 | else | ||
121 | - output_message = strscpy(output_message,"wrong -l argument"); | ||
122 | + asprintf(&output_message,"wrong -l argument"); | ||
123 | } else | ||
124 | - output_message = strscpy(output_message,"missing -l parameters"); | ||
125 | + asprintf(&output_message,"missing -l parameters"); | ||
126 | |||
127 | } | ||
128 | |||
129 | @@ -235,7 +235,7 @@ | ||
130 | |||
131 | if (check_value_list==TRUE) { | ||
132 | preparelist(value_list); // replace , between services with & to send the request | ||
133 | - send_buffer = ssprintf(send_buffer,"%s&%u&%s&%s", req_password,(vars_to_check==CHECK_SERVICESTATE)?5:6, | ||
134 | + asprintf(&send_buffer,"%s&%u&%s&%s", req_password,(vars_to_check==CHECK_SERVICESTATE)?5:6, | ||
135 | (show_all==TRUE)?"ShowAll":"ShowFail",value_list); | ||
136 | result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer)); | ||
137 | if(result!=STATE_OK) | ||
138 | @@ -247,15 +247,15 @@ | ||
139 | } | ||
140 | return_code=atoi(strtok(recv_buffer,"&")); | ||
141 | temp_string=strtok(NULL,"&"); | ||
142 | - output_message = ssprintf(output_message, "%s",temp_string); | ||
143 | + asprintf(&output_message, "%s",temp_string); | ||
144 | } | ||
145 | else | ||
146 | - output_message = strscpy(output_message,"No service/process specified"); | ||
147 | + asprintf(&output_message,"No service/process specified"); | ||
148 | } | ||
149 | |||
150 | else if(vars_to_check==CHECK_MEMUSE) { | ||
151 | |||
152 | - send_buffer = ssprintf(send_buffer,"%s&7", req_password); | ||
153 | + asprintf(&send_buffer,"%s&7", req_password); | ||
154 | result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer)); | ||
155 | if (result!=STATE_OK) | ||
156 | return result; | ||
157 | @@ -268,7 +268,7 @@ | ||
158 | mem_commitLimit=atof(strtok(recv_buffer,"&")); | ||
159 | mem_commitByte=atof(strtok(NULL,"&")); | ||
160 | percent_used_space = (mem_commitByte / mem_commitLimit) * 100; | ||
161 | - output_message = ssprintf(output_message,"Memory usage: total:%.2f Mb - used: %.2f Mb (%.0f%%) - free: %.2f Mb (%.0f%%)", | ||
162 | + asprintf(&output_message,"Memory usage: total:%.2f Mb - used: %.2f Mb (%.0f%%) - free: %.2f Mb (%.0f%%)", | ||
163 | mem_commitLimit / 1048576, mem_commitByte / 1048567, percent_used_space, | ||
164 | (mem_commitLimit - mem_commitByte) / 1048576, (mem_commitLimit - mem_commitByte) / mem_commitLimit * 100); | ||
165 | |||
166 | @@ -285,7 +285,7 @@ | ||
167 | |||
168 | if (check_value_list==TRUE) { | ||
169 | preparelist(value_list); // replace , between services with & to send the request | ||
170 | - send_buffer = ssprintf(send_buffer,"%s&8&%s", req_password,value_list); | ||
171 | + asprintf(&send_buffer,"%s&8&%s", req_password,value_list); | ||
172 | result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer)); | ||
173 | if (result!=STATE_OK) | ||
174 | return result; | ||
175 | @@ -299,9 +299,9 @@ | ||
176 | description = strtok(NULL,"&"); | ||
177 | counter_value = atof(recv_buffer); | ||
178 | if (description == NULL) | ||
179 | - output_message = ssprintf(output_message, "%.f", counter_value); | ||
180 | + asprintf(&output_message, "%.f", counter_value); | ||
181 | else | ||
182 | - output_message = ssprintf(output_message, description, counter_value); | ||
183 | + asprintf(&output_message, description, counter_value); | ||
184 | |||
185 | if (critical_value > warning_value) { | ||
186 | // Normal thresholds | ||
187 | @@ -324,7 +324,7 @@ | ||
188 | |||
189 | } | ||
190 | else { | ||
191 | - output_message = strscpy(output_message,"No counter specified"); | ||
192 | + asprintf(&output_message,"No counter specified"); | ||
193 | result=STATE_UNKNOWN; | ||
194 | } | ||
195 | } | ||
196 | @@ -332,7 +332,7 @@ | ||
197 | |||
198 | if (check_value_list==TRUE) { | ||
199 | preparelist(value_list); // replace , between services with & to send the request | ||
200 | - send_buffer = ssprintf(send_buffer,"%s&9&%s", req_password,value_list); | ||
201 | + asprintf(&send_buffer,"%s&9&%s", req_password,value_list); | ||
202 | result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer)); | ||
203 | if (result!=STATE_OK) | ||
204 | return result; | ||
205 | @@ -344,7 +344,7 @@ | ||
206 | |||
207 | age_in_minutes = atoi(strtok(recv_buffer,"&")); | ||
208 | description = strtok(NULL,"&"); | ||
209 | - output_message = ssprintf(output_message, description); | ||
210 | + asprintf(&output_message, description); | ||
211 | |||
212 | if (critical_value > warning_value) { | ||
213 | // Normal thresholds | ||
214 | @@ -367,7 +367,7 @@ | ||
215 | |||
216 | } | ||
217 | else { | ||
218 | - output_message = strscpy(output_message,"No file specified"); | ||
219 | + asprintf(&output_message,"No file specified"); | ||
220 | result=STATE_UNKNOWN; | ||
221 | } | ||
222 | } | ||
223 | @@ -447,7 +447,7 @@ | ||
224 | server_address=optarg; | ||
225 | break; | ||
226 | case 's': /* password */ | ||
227 | - req_password=strscpy(req_password,optarg); | ||
228 | + asprintf(&req_password,optarg); | ||
229 | break; | ||
230 | case 'p': /* port */ | ||
231 | if (is_intnonneg(optarg)) | ||
232 | @@ -480,7 +480,7 @@ | ||
233 | return ERROR; | ||
234 | break; | ||
235 | case 'l': /* value list */ | ||
236 | - value_list=strscpy(value_list,optarg); | ||
237 | + asprintf(&value_list,optarg); | ||
238 | check_value_list=TRUE; | ||
239 | break; | ||
240 | case 'w': /* warning threshold */ | ||