--- lib/libisc/mem.c	2009-03-30 15:11:28.000000000 +0200
+++ lib/libisc/mem.c.oden	2009-03-31 13:23:29.000000000 +0200
@@ -1099,7 +1099,7 @@ print_active(isc_mem_t *mctx, FILE *out)
 		const char *format;
 		isc_boolean_t found;
 
-		fprintf(out, isc_msgcat_get(isc_msgcat, ISC_MSGSET_MEM,
+		fprintf(out, "%s", isc_msgcat_get(isc_msgcat, ISC_MSGSET_MEM,
 					    ISC_MSG_DUMPALLOC,
 					    "Dump of all outstanding "
 					    "memory allocations:\n"));
@@ -1125,7 +1125,7 @@ print_active(isc_mem_t *mctx, FILE *out)
 			}
 		}
 		if (!found)
-			fprintf(out, isc_msgcat_get(isc_msgcat, ISC_MSGSET_MEM,
+			fprintf(out, "%s", isc_msgcat_get(isc_msgcat, ISC_MSGSET_MEM,
 						    ISC_MSG_NONE, "\tNone.\n"));
 	}
 }
@@ -1168,7 +1168,7 @@ isc_mem_stats(isc_mem_t *ctx, FILE *out)
 	 */
 	pool = ISC_LIST_HEAD(ctx->pools);
 	if (pool != NULL) {
-		fprintf(out, isc_msgcat_get(isc_msgcat, ISC_MSGSET_MEM,
+		fprintf(out, "%s", isc_msgcat_get(isc_msgcat, ISC_MSGSET_MEM,
 					    ISC_MSG_POOLSTATS,
 					    "[Pool statistics]\n"));
 		fprintf(out, "%15s %10s %10s %10s %10s %10s %10s %10s %1s\n",
--- programs/pluto/state.c	2009-03-30 15:11:28.000000000 +0200
+++ programs/pluto/state.c.oden	2009-03-31 13:26:52.000000000 +0200
@@ -1408,9 +1408,9 @@ show_states_status(void)
 	  st = array[i];
 	  fmt_state(st, n, state_buf, sizeof(state_buf)
 		, state_buf2, sizeof(state_buf2));
-	  whack_log(RC_COMMENT, state_buf);
+	  whack_log(RC_COMMENT, "%s", state_buf);
 	  if (state_buf2[0] != '\0')
-		whack_log(RC_COMMENT, state_buf2);
+		whack_log(RC_COMMENT, "%s", state_buf2);
 
 	  /* show any associated pending Phase 2s */
 	  if (IS_PHASE1(st->st_state))