Mercurial > trustbridge
comparison cinst/mozilla.c @ 278:539c856cb5da
Ditched warning about no profiles for separate failed add/remove warnings.
| author | Sascha Wilde <wilde@intevation.de> |
|---|---|
| date | Wed, 02 Apr 2014 13:17:04 +0200 |
| parents | 22408d797c92 |
| children | cb5f082e90c5 |
comparison
equal
deleted
inserted
replaced
| 277:22408d797c92 | 278:539c856cb5da |
|---|---|
| 268 } | 268 } |
| 269 } | 269 } |
| 270 if (inis == NULL) | 270 if (inis == NULL) |
| 271 { | 271 { |
| 272 DEBUGPRINTF("No ini files found - will do nothing!\n"); | 272 DEBUGPRINTF("No ini files found - will do nothing!\n"); |
| 273 exit(WARN_MOZ_NO_PROFILES); | |
| 274 } | 273 } |
| 275 return inis; | 274 return inis; |
| 276 } | 275 } |
| 277 | 276 |
| 278 /** | 277 /** |
| 554 { | 553 { |
| 555 for (int i=0; pdirs[i] != NULL; i++) | 554 for (int i=0; pdirs[i] != NULL; i++) |
| 556 { | 555 { |
| 557 puts(pdirs[i]); | 556 puts(pdirs[i]); |
| 558 if (! remove_cert(pdirs[i], secitemp)) | 557 if (! remove_cert(pdirs[i], secitemp)) |
| 559 return_code |= WARN_MOZ_COULD_NOT_ADD_OR_REMOVE_CERT; | 558 return_code |= WARN_MOZ_COULD_NOT_REMOVE_CERT; |
| 560 puts("List of installed certs:"); | 559 puts("List of installed certs:"); |
| 561 nss_list_certs(pdirs[i]); | 560 nss_list_certs(pdirs[i]); |
| 562 } | 561 } |
| 563 free(secitemp->data); | 562 free(secitemp->data); |
| 564 free(secitemp); | 563 free(secitemp); |
| 568 { | 567 { |
| 569 for (int i=0; pdirs[i] != NULL; i++) | 568 for (int i=0; pdirs[i] != NULL; i++) |
| 570 { | 569 { |
| 571 puts(pdirs[i]); | 570 puts(pdirs[i]); |
| 572 if (! import_cert(pdirs[i], secitemp)) | 571 if (! import_cert(pdirs[i], secitemp)) |
| 573 return_code |= WARN_MOZ_COULD_NOT_ADD_OR_REMOVE_CERT; | 572 return_code |= WARN_MOZ_COULD_NOT_ADD_CERT; |
| 574 nss_list_certs(pdirs[i]); | 573 nss_list_certs(pdirs[i]); |
| 575 } | 574 } |
| 576 free(secitemp->data); | 575 free(secitemp->data); |
| 577 free(secitemp); | 576 free(secitemp); |
| 578 } | 577 } |