Commit b83731752c11ac1b1d17cfbe7973af2b4ca0bd53
1 parent
713ee93e
Exists in
master
and in
3 other branches
Fixing CRL messages translation.
Showing
2 changed files
with
66 additions
and
66 deletions
Show diff stats
src/lib3270/ssl/linux/getcrl.c
... | ... | @@ -243,9 +243,9 @@ int lib3270_get_X509_CRL(H3270 *hSession, SSL_ERROR_MESSAGE * message) |
243 | 243 | if(!(consturl && *consturl)) |
244 | 244 | { |
245 | 245 | message->error = hSession->ssl.error = 0; |
246 | - message->title = N_( "Security error" ); | |
247 | - message->text = N_( "Can't open CRL File" ); | |
248 | - message->description = N_("The URL for the CRL is undefined or empty"); | |
246 | + message->title = _( "Security error" ); | |
247 | + message->text = _( "Can't open CRL File" ); | |
248 | + message->description = _("The URL for the CRL is undefined or empty"); | |
249 | 249 | return errno = ENOENT; |
250 | 250 | } |
251 | 251 | |
... | ... | @@ -261,8 +261,8 @@ int lib3270_get_X509_CRL(H3270 *hSession, SSL_ERROR_MESSAGE * message) |
261 | 261 | int err = errno; |
262 | 262 | |
263 | 263 | message->error = hSession->ssl.error = 0; |
264 | - message->title = N_( "Security error" ); | |
265 | - message->text = N_( "Can't open CRL File" ); | |
264 | + message->title = _( "Security error" ); | |
265 | + message->text = _( "Can't open CRL File" ); | |
266 | 266 | message->description = strerror(err); |
267 | 267 | trace_ssl(hSession,"Can't open %s: %s\n",consturl,message->description); |
268 | 268 | return err; |
... | ... | @@ -284,8 +284,8 @@ int lib3270_get_X509_CRL(H3270 *hSession, SSL_ERROR_MESSAGE * message) |
284 | 284 | if(!base) |
285 | 285 | { |
286 | 286 | message->error = hSession->ssl.error = 0; |
287 | - message->title = N_( "Security error" ); | |
288 | - message->text = N_( "No DN of the entry at which to start the search on the URL" ); | |
287 | + message->title = _( "Security error" ); | |
288 | + message->text = _( "No DN of the entry at which to start the search on the URL" ); | |
289 | 289 | message->description = _( "The URL argument should be in the format ldap://[HOST]/[DN]?attribute" ); |
290 | 290 | return errno = EINVAL; |
291 | 291 | } |
... | ... | @@ -296,8 +296,8 @@ int lib3270_get_X509_CRL(H3270 *hSession, SSL_ERROR_MESSAGE * message) |
296 | 296 | if(!base) |
297 | 297 | { |
298 | 298 | message->error = hSession->ssl.error = 0; |
299 | - message->title = N_( "Security error" ); | |
300 | - message->text = N_( "No LDAP attribute on the URL" ); | |
299 | + message->title = _( "Security error" ); | |
300 | + message->text = _( "No LDAP attribute on the URL" ); | |
301 | 301 | message->description = _( "The URL argument should be in the format ldap://[HOST]/[DN]?attribute" ); |
302 | 302 | return errno = EINVAL; |
303 | 303 | } |
... | ... | @@ -316,8 +316,8 @@ int lib3270_get_X509_CRL(H3270 *hSession, SSL_ERROR_MESSAGE * message) |
316 | 316 | if(rc != LDAP_SUCCESS) |
317 | 317 | { |
318 | 318 | message->error = hSession->ssl.error = 0; |
319 | - message->title = N_( "Security error" ); | |
320 | - message->text = N_( "Can't initialize LDAP" ); | |
319 | + message->title = _( "Security error" ); | |
320 | + message->text = _( "Can't initialize LDAP" ); | |
321 | 321 | message->description = ldap_err2string(rc); |
322 | 322 | lib3270_write_log(hSession,"ssl","%s: %s",url, message->description); |
323 | 323 | return -1; |
... | ... | @@ -327,8 +327,8 @@ int lib3270_get_X509_CRL(H3270 *hSession, SSL_ERROR_MESSAGE * message) |
327 | 327 | rc = ldap_set_option(ld, LDAP_OPT_PROTOCOL_VERSION,(void *) &version); |
328 | 328 | if(rc != LDAP_SUCCESS) { |
329 | 329 | message->error = hSession->ssl.error = 0; |
330 | - message->title = N_( "Security error" ); | |
331 | - message->text = N_( "Can't set LDAP version" ); | |
330 | + message->title = _( "Security error" ); | |
331 | + message->text = _( "Can't set LDAP version" ); | |
332 | 332 | message->description = ldap_err2string(rc); |
333 | 333 | lib3270_write_log(hSession,"ssl","%s: %s",url, message->description); |
334 | 334 | return -1; |
... | ... | @@ -338,8 +338,8 @@ int lib3270_get_X509_CRL(H3270 *hSession, SSL_ERROR_MESSAGE * message) |
338 | 338 | if(rc != LDAP_SUCCESS) |
339 | 339 | { |
340 | 340 | message->error = hSession->ssl.error = 0; |
341 | - message->title = N_( "Security error" ); | |
342 | - message->text = N_( "Can't bind to LDAP server" ); | |
341 | + message->title = _( "Security error" ); | |
342 | + message->text = _( "Can't bind to LDAP server" ); | |
343 | 343 | message->description = ldap_err2string(rc); |
344 | 344 | lib3270_write_log(hSession,"ssl","%s: %s",url, message->description); |
345 | 345 | return -1; |
... | ... | @@ -363,8 +363,8 @@ int lib3270_get_X509_CRL(H3270 *hSession, SSL_ERROR_MESSAGE * message) |
363 | 363 | if(rc != LDAP_SUCCESS) |
364 | 364 | { |
365 | 365 | message->error = hSession->ssl.error = 0; |
366 | - message->title = N_( "Security error" ); | |
367 | - message->text = N_( "Can't search LDAP server" ); | |
366 | + message->title = _( "Security error" ); | |
367 | + message->text = _( "Can't search LDAP server" ); | |
368 | 368 | message->description = ldap_err2string(rc); |
369 | 369 | lib3270_write_log(hSession,"ssl","%s: %s",url, message->description); |
370 | 370 | return -1; |
... | ... | @@ -374,9 +374,9 @@ int lib3270_get_X509_CRL(H3270 *hSession, SSL_ERROR_MESSAGE * message) |
374 | 374 | if(!attr) |
375 | 375 | { |
376 | 376 | message->error = hSession->ssl.error = 0; |
377 | - message->title = N_( "Security error" ); | |
378 | - message->text = N_( "Can't get LDAP attribute" ); | |
379 | - message->description = N_("Search did not produce any attributes."); | |
377 | + message->title = _( "Security error" ); | |
378 | + message->text = _( "Can't get LDAP attribute" ); | |
379 | + message->description = _("Search did not produce any attributes."); | |
380 | 380 | lib3270_write_log(hSession,"ssl","%s: %s",url, message->description); |
381 | 381 | return errno = ENOENT; |
382 | 382 | } |
... | ... | @@ -385,9 +385,9 @@ int lib3270_get_X509_CRL(H3270 *hSession, SSL_ERROR_MESSAGE * message) |
385 | 385 | if(!value) |
386 | 386 | { |
387 | 387 | message->error = hSession->ssl.error = 0; |
388 | - message->title = N_( "Security error" ); | |
389 | - message->text = N_( "Can't get LDAP attribute" ); | |
390 | - message->description = N_("Search did not produce any values."); | |
388 | + message->title = _( "Security error" ); | |
389 | + message->text = _( "Can't get LDAP attribute" ); | |
390 | + message->description = _("Search did not produce any values."); | |
391 | 391 | lib3270_write_log(hSession,"ssl","%s: %s",url, message->description); |
392 | 392 | return errno = ENOENT; |
393 | 393 | } |
... | ... | @@ -408,8 +408,8 @@ int lib3270_get_X509_CRL(H3270 *hSession, SSL_ERROR_MESSAGE * message) |
408 | 408 | if(!d2i_X509_CRL(&hSession->ssl.crl.cert, &crl_data, value[0]->bv_len)) |
409 | 409 | { |
410 | 410 | message->error = hSession->ssl.error = ERR_get_error(); |
411 | - message->title = N_( "Security error" ); | |
412 | - message->text = N_( "Can't decode CRL got from LDAP Search" ); | |
411 | + message->title = _( "Security error" ); | |
412 | + message->text = _( "Can't decode CRL got from LDAP Search" ); | |
413 | 413 | lib3270_write_log(hSession,"ssl","%s: %s",url, message->text); |
414 | 414 | ldap_value_free_len(value); |
415 | 415 | return -1; |
... | ... | @@ -459,7 +459,7 @@ int lib3270_get_X509_CRL(H3270 *hSession, SSL_ERROR_MESSAGE * message) |
459 | 459 | if(res != CURLE_OK) |
460 | 460 | { |
461 | 461 | message->error = hSession->ssl.error = 0; |
462 | - message->title = N_( "Security error" ); | |
462 | + message->title = _( "Security error" ); | |
463 | 463 | |
464 | 464 | if(crl_data->errbuf[0]) |
465 | 465 | { |
... | ... | @@ -468,7 +468,7 @@ int lib3270_get_X509_CRL(H3270 *hSession, SSL_ERROR_MESSAGE * message) |
468 | 468 | } |
469 | 469 | else |
470 | 470 | { |
471 | - message->text = N_( "Error loading CRL" ); | |
471 | + message->text = _( "Error loading CRL" ); | |
472 | 472 | message->description = curl_easy_strerror(res); |
473 | 473 | } |
474 | 474 | |
... | ... | @@ -482,8 +482,8 @@ int lib3270_get_X509_CRL(H3270 *hSession, SSL_ERROR_MESSAGE * message) |
482 | 482 | if(res != CURLE_OK) |
483 | 483 | { |
484 | 484 | message->error = hSession->ssl.error = 0; |
485 | - message->title = N_( "Security error" ); | |
486 | - message->text = N_( "Error loading CRL" ); | |
485 | + message->title = _( "Security error" ); | |
486 | + message->text = _( "Error loading CRL" ); | |
487 | 487 | message->description = curl_easy_strerror(res); |
488 | 488 | lib3270_write_log(hSession,"ssl","%s: %s",consturl, message->description); |
489 | 489 | return -1; |
... | ... | @@ -502,8 +502,8 @@ int lib3270_get_X509_CRL(H3270 *hSession, SSL_ERROR_MESSAGE * message) |
502 | 502 | if(!d2i_X509_CRL(&hSession->ssl.crl.cert, &data, crl_data->length)) |
503 | 503 | { |
504 | 504 | message->error = hSession->ssl.error = ERR_get_error(); |
505 | - message->title = N_( "Security error" ); | |
506 | - message->text = N_( "Got an invalid CRL from server" ); | |
505 | + message->title = _( "Security error" ); | |
506 | + message->text = _( "Got an invalid CRL from server" ); | |
507 | 507 | lib3270_write_log(hSession,"ssl","%s: %s",consturl, message->text); |
508 | 508 | return -1; |
509 | 509 | } |
... | ... | @@ -511,8 +511,8 @@ int lib3270_get_X509_CRL(H3270 *hSession, SSL_ERROR_MESSAGE * message) |
511 | 511 | else |
512 | 512 | { |
513 | 513 | message->error = hSession->ssl.error = ERR_get_error(); |
514 | - message->title = N_( "Security error" ); | |
515 | - message->text = N_( "Got an invalid CRL from server" ); | |
514 | + message->title = _( "Security error" ); | |
515 | + message->text = _( "Got an invalid CRL from server" ); | |
516 | 516 | lib3270_write_log(hSession,"ssl","%s: content-type unexpected: \"%s\"",consturl, ct); |
517 | 517 | return -1; |
518 | 518 | } |
... | ... | @@ -524,8 +524,8 @@ int lib3270_get_X509_CRL(H3270 *hSession, SSL_ERROR_MESSAGE * message) |
524 | 524 | if(!data) |
525 | 525 | { |
526 | 526 | message->error = hSession->ssl.error = ERR_get_error(); |
527 | - message->title = N_( "Security error" ); | |
528 | - message->text = N_( "Got an invalid CRL from LDAP server" ); | |
527 | + message->title = _( "Security error" ); | |
528 | + message->text = _( "Got an invalid CRL from LDAP server" ); | |
529 | 529 | lib3270_write_log(hSession,"ssl","%s: invalid format:\n%s\n",consturl, crl_data->data.contents); |
530 | 530 | return -1; |
531 | 531 | } |
... | ... | @@ -541,8 +541,8 @@ int lib3270_get_X509_CRL(H3270 *hSession, SSL_ERROR_MESSAGE * message) |
541 | 541 | if(!d2i_X509_CRL_bio(bio, &hSession->ssl.crl.cert)) |
542 | 542 | { |
543 | 543 | message->error = hSession->ssl.error = ERR_get_error(); |
544 | - message->title = N_( "Security error" ); | |
545 | - message->text = N_( "Got an invalid CRL from server" ); | |
544 | + message->title = _( "Security error" ); | |
545 | + message->text = _( "Got an invalid CRL from server" ); | |
546 | 546 | lib3270_write_log(hSession,"ssl","%s: %s",consturl, message->text); |
547 | 547 | return -1; |
548 | 548 | } |
... | ... | @@ -555,9 +555,9 @@ int lib3270_get_X509_CRL(H3270 *hSession, SSL_ERROR_MESSAGE * message) |
555 | 555 | // Can't get CRL. |
556 | 556 | |
557 | 557 | message->error = hSession->ssl.error = 0; |
558 | - message->title = N_( "Security error" ); | |
559 | - message->text = N_( "Unexpected or invalid CRL URL" ); | |
560 | - message->description = N_("The URL scheme is unknown"); | |
558 | + message->title = _( "Security error" ); | |
559 | + message->text = _( "Unexpected or invalid CRL URL" ); | |
560 | + message->description = _("The URL scheme is unknown"); | |
561 | 561 | lib3270_write_log(hSession,"ssl","%s: %s",consturl, message->description); |
562 | 562 | return errno = EINVAL; |
563 | 563 | #endif // HAVE_LIBCURL | ... | ... |
src/lib3270/ssl/windows/getcrl.c
... | ... | @@ -197,9 +197,9 @@ int lib3270_get_X509_CRL(H3270 *hSession, SSL_ERROR_MESSAGE * message) |
197 | 197 | if(!(consturl && *consturl)) |
198 | 198 | { |
199 | 199 | message->error = hSession->ssl.error = 0; |
200 | - message->title = N_( "Security error" ); | |
201 | - message->text = N_( "Can't open CRL File" ); | |
202 | - message->description = N_("The URL for the CRL is undefined or empty"); | |
200 | + message->title = _( "Security error" ); | |
201 | + message->text = _( "Can't open CRL File" ); | |
202 | + message->description = _("The URL for the CRL is undefined or empty"); | |
203 | 203 | return errno = ENOENT; |
204 | 204 | } |
205 | 205 | |
... | ... | @@ -215,8 +215,8 @@ int lib3270_get_X509_CRL(H3270 *hSession, SSL_ERROR_MESSAGE * message) |
215 | 215 | int err = errno; |
216 | 216 | |
217 | 217 | message->error = hSession->ssl.error = 0; |
218 | - message->title = N_( "Security error" ); | |
219 | - message->text = N_( "Can't open CRL File" ); | |
218 | + message->title = _( "Security error" ); | |
219 | + message->text = _( "Can't open CRL File" ); | |
220 | 220 | message->description = strerror(err); |
221 | 221 | trace_ssl(hSession,"Can't open %s: %s\n",consturl,message->description); |
222 | 222 | return err; |
... | ... | @@ -244,8 +244,8 @@ int lib3270_get_X509_CRL(H3270 *hSession, SSL_ERROR_MESSAGE * message) |
244 | 244 | if(!hCurl) |
245 | 245 | { |
246 | 246 | message->error = hSession->ssl.error = 0; |
247 | - message->title = N_( "Security error" ); | |
248 | - message->text = N_( "Can't initialize curl" ); | |
247 | + message->title = _( "Security error" ); | |
248 | + message->text = _( "Can't initialize curl" ); | |
249 | 249 | lib3270_write_log(hSession,"ssl","%s: %s",consturl, message->text); |
250 | 250 | return -1; |
251 | 251 | } |
... | ... | @@ -274,7 +274,7 @@ int lib3270_get_X509_CRL(H3270 *hSession, SSL_ERROR_MESSAGE * message) |
274 | 274 | if(res != CURLE_OK) |
275 | 275 | { |
276 | 276 | message->error = hSession->ssl.error = 0; |
277 | - message->title = N_( "Security error" ); | |
277 | + message->title = _( "Security error" ); | |
278 | 278 | |
279 | 279 | if(crl_data->errbuf[0]) |
280 | 280 | { |
... | ... | @@ -283,7 +283,7 @@ int lib3270_get_X509_CRL(H3270 *hSession, SSL_ERROR_MESSAGE * message) |
283 | 283 | } |
284 | 284 | else |
285 | 285 | { |
286 | - message->text = N_( "Error loading CRL" ); | |
286 | + message->text = _( "Error loading CRL" ); | |
287 | 287 | message->description = curl_easy_strerror(res); |
288 | 288 | } |
289 | 289 | |
... | ... | @@ -298,8 +298,8 @@ int lib3270_get_X509_CRL(H3270 *hSession, SSL_ERROR_MESSAGE * message) |
298 | 298 | if(res != CURLE_OK) |
299 | 299 | { |
300 | 300 | message->error = hSession->ssl.error = 0; |
301 | - message->title = N_( "Security error" ); | |
302 | - message->text = N_( "Error loading CRL" ); | |
301 | + message->title = _( "Security error" ); | |
302 | + message->text = _( "Error loading CRL" ); | |
303 | 303 | message->description = curl_easy_strerror(res); |
304 | 304 | lib3270_write_log(hSession,"ssl","%s: %s",consturl, message->description); |
305 | 305 | return -1; |
... | ... | @@ -319,8 +319,8 @@ int lib3270_get_X509_CRL(H3270 *hSession, SSL_ERROR_MESSAGE * message) |
319 | 319 | if(!d2i_X509_CRL(&hSession->ssl.crl.cert, &data, crl_data->length)) |
320 | 320 | { |
321 | 321 | message->error = hSession->ssl.error = ERR_get_error(); |
322 | - message->title = N_( "Security error" ); | |
323 | - message->text = N_( "Got an invalid CRL from server" ); | |
322 | + message->title = _( "Security error" ); | |
323 | + message->text = _( "Got an invalid CRL from server" ); | |
324 | 324 | lib3270_write_log(hSession,"ssl","%s: %s",consturl, message->text); |
325 | 325 | return -1; |
326 | 326 | } |
... | ... | @@ -328,8 +328,8 @@ int lib3270_get_X509_CRL(H3270 *hSession, SSL_ERROR_MESSAGE * message) |
328 | 328 | else |
329 | 329 | { |
330 | 330 | message->error = hSession->ssl.error = ERR_get_error(); |
331 | - message->title = N_( "Security error" ); | |
332 | - message->text = N_( "Got an invalid CRL from server" ); | |
331 | + message->title = _( "Security error" ); | |
332 | + message->text = _( "Got an invalid CRL from server" ); | |
333 | 333 | lib3270_write_log(hSession,"ssl","%s: content-type unexpected: \"%s\"",consturl, ct); |
334 | 334 | return -1; |
335 | 335 | } |
... | ... | @@ -341,8 +341,8 @@ int lib3270_get_X509_CRL(H3270 *hSession, SSL_ERROR_MESSAGE * message) |
341 | 341 | if(!attr) |
342 | 342 | { |
343 | 343 | message->error = hSession->ssl.error = 0; |
344 | - message->title = N_( "Security error" ); | |
345 | - message->text = N_( "No attribute in LDAP search URL" ); | |
344 | + message->title = _( "Security error" ); | |
345 | + message->text = _( "No attribute in LDAP search URL" ); | |
346 | 346 | return errno = ENOENT; |
347 | 347 | } |
348 | 348 | |
... | ... | @@ -366,8 +366,8 @@ int lib3270_get_X509_CRL(H3270 *hSession, SSL_ERROR_MESSAGE * message) |
366 | 366 | if(!ptr) |
367 | 367 | { |
368 | 368 | message->error = hSession->ssl.error = 0; |
369 | - message->title = N_( "Security error" ); | |
370 | - message->text = N_( "Can't find attribute in LDAP response" ); | |
369 | + message->title = _( "Security error" ); | |
370 | + message->text = _( "Can't find attribute in LDAP response" ); | |
371 | 371 | return errno = ENOENT; |
372 | 372 | } |
373 | 373 | |
... | ... | @@ -386,8 +386,8 @@ int lib3270_get_X509_CRL(H3270 *hSession, SSL_ERROR_MESSAGE * message) |
386 | 386 | if(ix >= length) |
387 | 387 | { |
388 | 388 | message->error = hSession->ssl.error = 0; |
389 | - message->title = N_( "Security error" ); | |
390 | - message->text = N_( "Can't find attribute end in LDAP response" ); | |
389 | + message->title = _( "Security error" ); | |
390 | + message->text = _( "Can't find attribute end in LDAP response" ); | |
391 | 391 | return errno = ENOENT; |
392 | 392 | } |
393 | 393 | |
... | ... | @@ -406,8 +406,8 @@ int lib3270_get_X509_CRL(H3270 *hSession, SSL_ERROR_MESSAGE * message) |
406 | 406 | if(!d2i_X509_CRL(&hSession->ssl.crl.cert, (const unsigned char **) &ptr, length)) |
407 | 407 | { |
408 | 408 | message->error = hSession->ssl.error = ERR_get_error(); |
409 | - message->title = N_( "Security error" ); | |
410 | - message->text = N_( "Can't decode CRL got from LDAP Search" ); | |
409 | + message->title = _( "Security error" ); | |
410 | + message->text = _( "Can't decode CRL got from LDAP Search" ); | |
411 | 411 | lib3270_write_log(hSession,"ssl","%s: %s",consturl, message->text); |
412 | 412 | return -1; |
413 | 413 | } |
... | ... | @@ -417,9 +417,9 @@ int lib3270_get_X509_CRL(H3270 *hSession, SSL_ERROR_MESSAGE * message) |
417 | 417 | // Can't get CRL. |
418 | 418 | |
419 | 419 | message->error = hSession->ssl.error = 0; |
420 | - message->title = N_( "Security error" ); | |
421 | - message->text = N_( "Unexpected or invalid CRL URL" ); | |
422 | - message->description = N_("The URL scheme is unknown"); | |
420 | + message->title = _( "Security error" ); | |
421 | + message->text = _( "Unexpected or invalid CRL URL" ); | |
422 | + message->description = _("The URL scheme is unknown"); | |
423 | 423 | lib3270_write_log(hSession,"ssl","%s: %s",consturl, message->description); |
424 | 424 | return errno= EINVAL; |
425 | 425 | #endif // HAVE_LIBCURL | ... | ... |