1 --- db-4.6.21/repmgr/repmgr_net.c.orig 2012-10-18 12:52:44.099497404 +0200
2 +++ db-4.6.21/repmgr/repmgr_net.c 2012-10-18 13:01:34.266824983 +0200
7 - __db_err(dbenv, ret, why);
8 + __db_err(dbenv, ret, "%s", why);
9 clean: if (s != INVALID_SOCKET)
12 --- db-4.6.21/crypto/aes_method.c.orig 2012-10-18 13:41:47.465441979 +0200
13 +++ db-4.6.21/crypto/aes_method.c 2012-10-18 13:42:30.641467820 +0200
15 errstr = "AES error unrecognized";
18 - __db_errx(dbenv, errstr);
19 + __db_errx(dbenv, "%s", errstr);
22 --- db-4.6.21/rpc_client/client.c~ 2007-05-17 18:15:51.000000000 +0300
23 +++ db-4.6.21/rpc_client/client.c 2012-12-07 20:04:59.377284475 +0200
26 if ((cl = clnt_create((char *)host, DB_RPC_SERVERPROG,
27 DB_RPC_SERVERVERS, "tcp")) == NULL) {
28 - __db_errx(dbenv, clnt_spcreateerror((char *)host));
29 + __db_errx(dbenv, "%s", clnt_spcreateerror((char *)host));
33 --- db-4.6.21/rpc_client/gen_client.c~ 2007-09-27 18:32:05.000000000 +0300
34 +++ db-4.6.21/rpc_client/gen_client.c 2012-12-07 20:08:08.219357575 +0200
37 replyp = __db_env_create_4006(&msg, cl);
39 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
40 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
46 replyp = __db_env_cdsgroup_begin_4006(&msg, cl);
48 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
49 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
55 replyp = __db_env_close_4006(&msg, cl);
57 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
58 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
64 replyp = __db_env_dbremove_4006(&msg, cl);
66 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
67 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
73 replyp = __db_env_dbrename_4006(&msg, cl);
75 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
76 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
82 replyp = __db_env_get_cachesize_4006(&msg, cl);
84 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
85 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
91 replyp = __db_env_get_encrypt_flags_4006(&msg, cl);
93 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
94 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
100 replyp = __db_env_get_flags_4006(&msg, cl);
101 if (replyp == NULL) {
102 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
103 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
109 replyp = __db_env_get_home_4006(&msg, cl);
110 if (replyp == NULL) {
111 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
112 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
118 replyp = __db_env_get_open_flags_4006(&msg, cl);
119 if (replyp == NULL) {
120 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
121 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
127 replyp = __db_env_open_4006(&msg, cl);
128 if (replyp == NULL) {
129 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
130 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
136 replyp = __db_env_remove_4006(&msg, cl);
137 if (replyp == NULL) {
138 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
139 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
145 replyp = __db_env_set_cachesize_4006(&msg, cl);
146 if (replyp == NULL) {
147 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
148 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
154 replyp = __db_env_set_encrypt_4006(&msg, cl);
155 if (replyp == NULL) {
156 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
157 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
163 replyp = __db_env_set_flags_4006(&msg, cl);
164 if (replyp == NULL) {
165 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
166 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
172 replyp = __db_env_txn_begin_4006(&msg, cl);
173 if (replyp == NULL) {
174 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
175 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
181 replyp = __db_env_txn_recover_4006(&msg, cl);
182 if (replyp == NULL) {
183 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
184 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
190 replyp = __db_db_create_4006(&msg, cl);
191 if (replyp == NULL) {
192 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
193 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
199 replyp = __db_db_associate_4006(&msg, cl);
200 if (replyp == NULL) {
201 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
202 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
208 replyp = __db_db_close_4006(&msg, cl);
209 if (replyp == NULL) {
210 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
211 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
217 replyp = __db_db_cursor_4006(&msg, cl);
218 if (replyp == NULL) {
219 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
220 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
226 replyp = __db_db_del_4006(&msg, cl);
227 if (replyp == NULL) {
228 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
229 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
233 @@ -1014,7 +1014,7 @@
235 replyp = __db_db_get_4006(&msg, cl);
236 if (replyp == NULL) {
237 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
238 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
242 @@ -1053,7 +1053,7 @@
244 replyp = __db_db_get_bt_minkey_4006(&msg, cl);
245 if (replyp == NULL) {
246 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
247 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
251 @@ -1096,7 +1096,7 @@
253 replyp = __db_db_get_dbname_4006(&msg, cl);
254 if (replyp == NULL) {
255 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
256 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
260 @@ -1139,7 +1139,7 @@
262 replyp = __db_db_get_encrypt_flags_4006(&msg, cl);
263 if (replyp == NULL) {
264 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
265 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
269 @@ -1180,7 +1180,7 @@
271 replyp = __db_db_get_flags_4006(&msg, cl);
272 if (replyp == NULL) {
273 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
274 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
278 @@ -1221,7 +1221,7 @@
280 replyp = __db_db_get_h_ffactor_4006(&msg, cl);
281 if (replyp == NULL) {
282 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
283 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
287 @@ -1262,7 +1262,7 @@
289 replyp = __db_db_get_h_nelem_4006(&msg, cl);
290 if (replyp == NULL) {
291 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
292 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
296 @@ -1303,7 +1303,7 @@
298 replyp = __db_db_get_lorder_4006(&msg, cl);
299 if (replyp == NULL) {
300 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
301 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
305 @@ -1344,7 +1344,7 @@
307 replyp = __db_db_get_open_flags_4006(&msg, cl);
308 if (replyp == NULL) {
309 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
310 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
314 @@ -1385,7 +1385,7 @@
316 replyp = __db_db_get_pagesize_4006(&msg, cl);
317 if (replyp == NULL) {
318 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
319 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
323 @@ -1426,7 +1426,7 @@
325 replyp = __db_db_get_priority_4006(&msg, cl);
326 if (replyp == NULL) {
327 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
328 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
332 @@ -1467,7 +1467,7 @@
334 replyp = __db_db_get_q_extentsize_4006(&msg, cl);
335 if (replyp == NULL) {
336 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
337 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
341 @@ -1508,7 +1508,7 @@
343 replyp = __db_db_get_re_delim_4006(&msg, cl);
344 if (replyp == NULL) {
345 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
346 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
350 @@ -1549,7 +1549,7 @@
352 replyp = __db_db_get_re_len_4006(&msg, cl);
353 if (replyp == NULL) {
354 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
355 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
359 @@ -1590,7 +1590,7 @@
361 replyp = __db_db_get_re_pad_4006(&msg, cl);
362 if (replyp == NULL) {
363 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
364 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
368 @@ -1646,7 +1646,7 @@
369 replyp = __db_db_join_4006(&msg, cl);
370 __os_free(dbenv, msg.curs.curs_val);
371 if (replyp == NULL) {
372 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
373 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
377 @@ -1700,7 +1700,7 @@
379 replyp = __db_db_key_range_4006(&msg, cl);
380 if (replyp == NULL) {
381 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
382 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
386 @@ -1760,7 +1760,7 @@
388 replyp = __db_db_open_4006(&msg, cl);
389 if (replyp == NULL) {
390 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
391 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
395 @@ -1827,7 +1827,7 @@
397 replyp = __db_db_pget_4006(&msg, cl);
398 if (replyp == NULL) {
399 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
400 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
404 @@ -1886,7 +1886,7 @@
406 replyp = __db_db_put_4006(&msg, cl);
407 if (replyp == NULL) {
408 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
409 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
413 @@ -1937,7 +1937,7 @@
415 replyp = __db_db_remove_4006(&msg, cl);
416 if (replyp == NULL) {
417 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
418 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
422 @@ -1993,7 +1993,7 @@
424 replyp = __db_db_rename_4006(&msg, cl);
425 if (replyp == NULL) {
426 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
427 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
431 @@ -2033,7 +2033,7 @@
433 replyp = __db_db_set_bt_minkey_4006(&msg, cl);
434 if (replyp == NULL) {
435 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
436 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
440 @@ -2078,7 +2078,7 @@
442 replyp = __db_db_set_encrypt_4006(&msg, cl);
443 if (replyp == NULL) {
444 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
445 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
449 @@ -2118,7 +2118,7 @@
451 replyp = __db_db_set_flags_4006(&msg, cl);
452 if (replyp == NULL) {
453 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
454 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
458 @@ -2158,7 +2158,7 @@
460 replyp = __db_db_set_h_ffactor_4006(&msg, cl);
461 if (replyp == NULL) {
462 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
463 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
467 @@ -2198,7 +2198,7 @@
469 replyp = __db_db_set_h_nelem_4006(&msg, cl);
470 if (replyp == NULL) {
471 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
472 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
476 @@ -2238,7 +2238,7 @@
478 replyp = __db_db_set_lorder_4006(&msg, cl);
479 if (replyp == NULL) {
480 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
481 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
485 @@ -2278,7 +2278,7 @@
487 replyp = __db_db_set_pagesize_4006(&msg, cl);
488 if (replyp == NULL) {
489 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
490 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
494 @@ -2318,7 +2318,7 @@
496 replyp = __db_db_set_priority_4006(&msg, cl);
497 if (replyp == NULL) {
498 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
499 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
503 @@ -2358,7 +2358,7 @@
505 replyp = __db_db_set_q_extentsize_4006(&msg, cl);
506 if (replyp == NULL) {
507 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
508 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
512 @@ -2398,7 +2398,7 @@
514 replyp = __db_db_set_re_delim_4006(&msg, cl);
515 if (replyp == NULL) {
516 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
517 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
521 @@ -2438,7 +2438,7 @@
523 replyp = __db_db_set_re_len_4006(&msg, cl);
524 if (replyp == NULL) {
525 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
526 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
530 @@ -2478,7 +2478,7 @@
532 replyp = __db_db_set_re_pad_4006(&msg, cl);
533 if (replyp == NULL) {
534 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
535 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
539 @@ -2524,7 +2524,7 @@
541 replyp = __db_db_stat_4006(&msg, cl);
542 if (replyp == NULL) {
543 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
544 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
548 @@ -2564,7 +2564,7 @@
550 replyp = __db_db_sync_4006(&msg, cl);
551 if (replyp == NULL) {
552 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
553 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
557 @@ -2611,7 +2611,7 @@
559 replyp = __db_db_truncate_4006(&msg, cl);
560 if (replyp == NULL) {
561 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
562 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
566 @@ -2649,7 +2649,7 @@
568 replyp = __db_dbc_close_4006(&msg, cl);
569 if (replyp == NULL) {
570 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
571 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
575 @@ -2690,7 +2690,7 @@
577 replyp = __db_dbc_count_4006(&msg, cl);
578 if (replyp == NULL) {
579 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
580 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
584 @@ -2730,7 +2730,7 @@
586 replyp = __db_dbc_del_4006(&msg, cl);
587 if (replyp == NULL) {
588 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
589 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
593 @@ -2771,7 +2771,7 @@
595 replyp = __db_dbc_dup_4006(&msg, cl);
596 if (replyp == NULL) {
597 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
598 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
602 @@ -2825,7 +2825,7 @@
604 replyp = __db_dbc_get_4006(&msg, cl);
605 if (replyp == NULL) {
606 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
607 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
611 @@ -2864,7 +2864,7 @@
613 replyp = __db_dbc_get_priority_4006(&msg, cl);
614 if (replyp == NULL) {
615 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
616 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
620 @@ -2927,7 +2927,7 @@
622 replyp = __db_dbc_pget_4006(&msg, cl);
623 if (replyp == NULL) {
624 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
625 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
629 @@ -2981,7 +2981,7 @@
631 replyp = __db_dbc_put_4006(&msg, cl);
632 if (replyp == NULL) {
633 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
634 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
638 @@ -3021,7 +3021,7 @@
640 replyp = __db_dbc_set_priority_4006(&msg, cl);
641 if (replyp == NULL) {
642 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
643 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
647 @@ -3059,7 +3059,7 @@
649 replyp = __db_txn_abort_4006(&msg, cl);
650 if (replyp == NULL) {
651 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
652 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
656 @@ -3099,7 +3099,7 @@
658 replyp = __db_txn_commit_4006(&msg, cl);
659 if (replyp == NULL) {
660 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
661 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
665 @@ -3139,7 +3139,7 @@
667 replyp = __db_txn_discard_4006(&msg, cl);
668 if (replyp == NULL) {
669 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
670 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));
674 @@ -3179,7 +3179,7 @@
676 replyp = __db_txn_prepare_4006(&msg, cl);
677 if (replyp == NULL) {
678 - __db_errx(dbenv, clnt_sperror(cl, "Berkeley DB"));
679 + __db_errx(dbenv, "%s", clnt_sperror(cl, "Berkeley DB"));