Mercurial > trustbridge
comparison cinst/main.c @ 978:d92b1594e974
Merged.
| author | Emanuel Schuetze <emanuel@intevation.de> |
|---|---|
| date | Fri, 29 Aug 2014 13:10:11 +0200 |
| parents | 76c410aff382 |
| children | 78798d3af8f0 |
comparison
equal
deleted
inserted
replaced
| 977:9ad1f18799fb | 978:d92b1594e974 |
|---|---|
| 259 ERRORPRINTF ("Failed to read certificate list.\n"); | 259 ERRORPRINTF ("Failed to read certificate list.\n"); |
| 260 return ERR_INVALID_INPUT_NO_LIST; | 260 return ERR_INVALID_INPUT_NO_LIST; |
| 261 } | 261 } |
| 262 | 262 |
| 263 all_valid_certs = get_certs_from_list (certificate_list, list_len); | 263 all_valid_certs = get_certs_from_list (certificate_list, list_len); |
| 264 free (certificate_list); | |
| 264 | 265 |
| 265 if (!all_valid_certs) | 266 if (!all_valid_certs) |
| 266 { | 267 { |
| 267 /* Impossible */ | 268 /* Impossible */ |
| 268 return -1; | 269 return -1; |
| 278 { | 279 { |
| 279 ERRORPRINTF ("Failed to write windows stores retval: %i\n", ret); | 280 ERRORPRINTF ("Failed to write windows stores retval: %i\n", ret); |
| 280 } | 281 } |
| 281 #endif | 282 #endif |
| 282 ret = write_stores_nss (NULL, all_valid_certs); | 283 ret = write_stores_nss (NULL, all_valid_certs); |
| 284 strv_free (all_valid_certs); | |
| 283 return ret; | 285 return ret; |
| 284 } | 286 } |
| 285 | 287 |
| 286 ret = read_choices_file (choices_file_name, &to_install, | 288 ret = read_choices_file (choices_file_name, &to_install, |
| 287 &to_remove); | 289 &to_remove); |
| 316 { | 318 { |
| 317 ERRORPRINTF ("Failed to validate removal choices\n"); | 319 ERRORPRINTF ("Failed to validate removal choices\n"); |
| 318 return ret; | 320 return ret; |
| 319 } | 321 } |
| 320 } | 322 } |
| 323 | |
| 324 strv_free (all_valid_certs); | |
| 321 | 325 |
| 322 #ifdef WIN32 | 326 #ifdef WIN32 |
| 323 ret = write_stores_win (to_install, to_remove); | 327 ret = write_stores_win (to_install, to_remove); |
| 324 if (ret != 0) | 328 if (ret != 0) |
| 325 { | 329 { |
| 333 } | 337 } |
| 334 | 338 |
| 335 /* Make valgrind happy */ | 339 /* Make valgrind happy */ |
| 336 strv_free (to_install); | 340 strv_free (to_install); |
| 337 strv_free (to_remove); | 341 strv_free (to_remove); |
| 338 free (certificate_list); | |
| 339 | 342 |
| 340 return 0; | 343 return 0; |
| 341 } | 344 } |