--- common/src/miscutil/conffile.c.str	2011-01-21 10:18:41.000000000 +0100
+++ common/src/miscutil/conffile.c	2011-01-21 10:19:29.000000000 +0100
@@ -147,34 +147,34 @@
     char errbuf[CONFFILE_MAX_ERRMSGLEN];
 
     if (cf == NULL) 
-        rv = snprintf(errbuf, CONFFILE_MAX_ERRMSGLEN, 
+        rv = snprintf(errbuf, CONFFILE_MAX_ERRMSGLEN, "%s",
                       _errmsg[CONFFILE_ERR_NULLHANDLE]);
     else if (cf->magic != CONFFILE_MAGIC)
-        rv = snprintf(errbuf, CONFFILE_MAX_ERRMSGLEN, 
+        rv = snprintf(errbuf, CONFFILE_MAX_ERRMSGLEN, "%s", 
                       _errmsg[CONFFILE_ERR_MAGIC]);
     else if (cf->errnum < CONFFILE_ERR_SUCCESS 
              || cf->errnum > CONFFILE_ERR_ERRNUMRANGE)
-        rv = snprintf(errbuf, CONFFILE_MAX_ERRMSGLEN, 
+        rv = snprintf(errbuf, CONFFILE_MAX_ERRMSGLEN, "%s",
                       _errmsg[CONFFILE_ERR_ERRNUMRANGE]);
     else if (cf->errnum == CONFFILE_ERR_PARSE_OPTION_UNKNOWN
              || cf->errnum == CONFFILE_ERR_PARSE_ARG_MISSING
              || cf->errnum == CONFFILE_ERR_PARSE_ARG_TOOMANY
              || cf->errnum == CONFFILE_ERR_PARSE_ARG_INVALID)
-        rv = snprintf(errbuf, CONFFILE_MAX_ERRMSGLEN, 
+        rv = snprintf(errbuf, CONFFILE_MAX_ERRMSGLEN, "%s", 
                       _errmsg[cf->errnum], cf->optionname, cf->line_num);
     else if (cf->errnum == CONFFILE_ERR_PARSE_OPTION_TOOMANY
              || cf->errnum == CONFFILE_ERR_PARSE_OPTION_TOOFEW)
-        rv = snprintf(errbuf, CONFFILE_MAX_ERRMSGLEN, 
+        rv = snprintf(errbuf, CONFFILE_MAX_ERRMSGLEN, "%s", 
                       _errmsg[cf->errnum], cf->optionname);
     else if (cf->errnum == CONFFILE_ERR_PARSE_OVERFLOW_LINELEN
              || cf->errnum == CONFFILE_ERR_PARSE_OVERFLOW_OPTIONLEN
              || cf->errnum == CONFFILE_ERR_PARSE_OVERFLOW_ARGLEN
              || cf->errnum == CONFFILE_ERR_PARSE_QUOTE
              || cf->errnum == CONFFILE_ERR_PARSE_CONTINUATION)
-        rv = snprintf(errbuf, CONFFILE_MAX_ERRMSGLEN, 
+        rv = snprintf(errbuf, CONFFILE_MAX_ERRMSGLEN, "%s",
                       _errmsg[cf->errnum], cf->line_num);
     else
-        rv = snprintf(errbuf, CONFFILE_MAX_ERRMSGLEN, 
+        rv = snprintf(errbuf, CONFFILE_MAX_ERRMSGLEN, "%s",
                       _errmsg[cf->errnum]);
 
     if (rv >= buflen)
--- libfreeipmi/src/util/ipmi-device-types-util.c.str	2011-01-21 10:25:02.000000000 +0100
+++ libfreeipmi/src/util/ipmi-device-types-util.c	2011-01-21 10:25:22.000000000 +0100
@@ -55,7 +55,7 @@
       return (-1);
     }
 
-  return (snprintf (buf, buflen, string_array[offset]));
+  return (snprintf (buf, buflen, "%s", string_array[offset]));
 }
 
 int
--- libfreeipmi/src/util/ipmi-sensor-and-event-code-tables-util.c.str	2011-01-21 10:26:02.000000000 +0100
+++ libfreeipmi/src/util/ipmi-sensor-and-event-code-tables-util.c	2011-01-21 10:26:27.000000000 +0100
@@ -1104,7 +1104,7 @@
       return (-1);
     }
 
-  return (snprintf (buf, buflen, string_array[offset]));
+  return (snprintf (buf, buflen, "%s", string_array[offset]));
 }
 
 int
--- libfreeipmi/src/util/ipmi-sensor-util.c.str	2011-01-21 10:27:12.000000000 +0100
+++ libfreeipmi/src/util/ipmi-sensor-util.c	2011-01-21 10:27:23.000000000 +0100
@@ -64,7 +64,7 @@
       return (-1);
     }
 
-  return (snprintf (buf, buflen, threshold_comparison_status_desc[offset]));
+  return (snprintf (buf, buflen, "%s", threshold_comparison_status_desc[offset]));
 }
 
 const char *