diff -Naurp cyrus-imapd-2.3.14/imap/arbitron.c cyrus-imapd-2.3.14.oden/imap/arbitron.c --- cyrus-imapd-2.3.14/imap/arbitron.c 2009-02-09 06:01:56.000000000 +0100 +++ cyrus-imapd-2.3.14.oden/imap/arbitron.c 2009-04-08 13:10:09.000000000 +0200 @@ -203,7 +203,7 @@ int main(int argc,char **argv) /* Set namespace -- force standard (internal) */ if ((r = mboxname_init_namespace(&arb_namespace, 1)) != 0) { - syslog(LOG_ERR, error_message(r)); + syslog(LOG_ERR, "%s", error_message(r)); fatal(error_message(r), EC_CONFIG); } diff -Naurp cyrus-imapd-2.3.14/imap/cyrdump.c cyrus-imapd-2.3.14.oden/imap/cyrdump.c --- cyrus-imapd-2.3.14/imap/cyrdump.c 2009-02-09 06:01:56.000000000 +0100 +++ cyrus-imapd-2.3.14.oden/imap/cyrdump.c 2009-04-08 13:10:09.000000000 +0200 @@ -133,7 +133,7 @@ int main(int argc, char *argv[]) /* Set namespace -- force standard (internal) */ if ((r = mboxname_init_namespace(&dump_namespace, 1)) != 0) { - syslog(LOG_ERR, error_message(r)); + syslog(LOG_ERR, "%s", error_message(r)); fatal(error_message(r), EC_CONFIG); } diff -Naurp cyrus-imapd-2.3.14/imap/cyr_virusscan.c cyrus-imapd-2.3.14.oden/imap/cyr_virusscan.c --- cyrus-imapd-2.3.14/imap/cyr_virusscan.c 2009-02-09 06:01:56.000000000 +0100 +++ cyrus-imapd-2.3.14.oden/imap/cyr_virusscan.c 2009-04-08 13:10:09.000000000 +0200 @@ -277,7 +277,7 @@ int main (int argc, char *argv[]) { /* Set namespace -- force standard (internal) */ if ((r = mboxname_init_namespace(&scan_namespace, 1)) != 0) { - syslog(LOG_ERR, error_message(r)); + syslog(LOG_ERR, "%s", error_message(r)); fatal(error_message(r), EC_CONFIG); } diff -Naurp cyrus-imapd-2.3.14/imap/deliver.c cyrus-imapd-2.3.14.oden/imap/deliver.c --- cyrus-imapd-2.3.14/imap/deliver.c 2008-10-08 17:47:06.000000000 +0200 +++ cyrus-imapd-2.3.14.oden/imap/deliver.c 2009-04-08 13:10:09.000000000 +0200 @@ -278,7 +278,7 @@ int main(int argc, char **argv) void just_exit(const char *msg) { - com_err(msg, 0, error_message(errno)); + com_err(msg, 0, "%s", error_message(errno)); fatal(msg, EC_CONFIG); } diff -Naurp cyrus-imapd-2.3.14/imap/fetchnews.c cyrus-imapd-2.3.14.oden/imap/fetchnews.c --- cyrus-imapd-2.3.14/imap/fetchnews.c 2008-08-27 10:28:46.000000000 +0200 +++ cyrus-imapd-2.3.14.oden/imap/fetchnews.c 2009-04-08 13:10:09.000000000 +0200 @@ -293,7 +293,7 @@ int main(int argc, char *argv[]) break; case 'f': /* timestamp file */ - snprintf(sfile, sizeof(sfile), optarg); + snprintf(sfile, sizeof(sfile), "%s", optarg); break; case 'a': /* authname */ diff -Naurp cyrus-imapd-2.3.14/imap/fud.c cyrus-imapd-2.3.14.oden/imap/fud.c --- cyrus-imapd-2.3.14/imap/fud.c 2009-02-09 06:01:56.000000000 +0100 +++ cyrus-imapd-2.3.14.oden/imap/fud.c 2009-04-08 13:10:09.000000000 +0200 @@ -200,7 +200,7 @@ int service_main(int argc __attribute__( /* Set namespace */ if ((r = mboxname_init_namespace(&fud_namespace, 1)) != 0) { - syslog(LOG_ERR, error_message(r)); + syslog(LOG_ERR, "%s", error_message(r)); fatal(error_message(r), EC_CONFIG); } diff -Naurp cyrus-imapd-2.3.14/imap/global.c cyrus-imapd-2.3.14.oden/imap/global.c --- cyrus-imapd-2.3.14/imap/global.c 2009-04-08 13:09:51.000000000 +0200 +++ cyrus-imapd-2.3.14.oden/imap/global.c 2009-04-08 13:10:09.000000000 +0200 @@ -557,7 +557,7 @@ static int acl_ok(const char *user, stru /* Set namespace */ if ((r = mboxname_init_namespace(&namespace, 0)) != 0) { - syslog(LOG_ERR, error_message(r)); + syslog(LOG_ERR, "%s", error_message(r)); fatal(error_message(r), EC_CONFIG); } diff -Naurp cyrus-imapd-2.3.14/imap/imapd.c cyrus-imapd-2.3.14.oden/imap/imapd.c --- cyrus-imapd-2.3.14/imap/imapd.c 2009-04-08 13:09:51.000000000 +0200 +++ cyrus-imapd-2.3.14.oden/imap/imapd.c 2009-04-08 13:10:09.000000000 +0200 @@ -2183,7 +2183,7 @@ void cmd_login(char *tag, char *user) /* Set namespace */ if ((r = mboxname_init_namespace(&imapd_namespace, imapd_userisadmin || imapd_userisproxyadmin)) != 0) { - syslog(LOG_ERR, error_message(r)); + syslog(LOG_ERR, "%s", error_message(r)); fatal(error_message(r), EC_CONFIG); } @@ -2344,7 +2344,7 @@ cmd_authenticate(char *tag, char *authty /* Set namespace */ if ((r = mboxname_init_namespace(&imapd_namespace, imapd_userisadmin || imapd_userisproxyadmin)) != 0) { - syslog(LOG_ERR, error_message(r)); + syslog(LOG_ERR, "%s", error_message(r)); fatal(error_message(r), EC_CONFIG); } diff -Naurp cyrus-imapd-2.3.14/imap/ipurge.c cyrus-imapd-2.3.14.oden/imap/ipurge.c --- cyrus-imapd-2.3.14/imap/ipurge.c 2009-02-09 06:01:57.000000000 +0100 +++ cyrus-imapd-2.3.14.oden/imap/ipurge.c 2009-04-08 13:10:09.000000000 +0200 @@ -173,7 +173,7 @@ int main (int argc, char *argv[]) { /* Set namespace -- force standard (internal) */ if ((r = mboxname_init_namespace(&purge_namespace, 1)) != 0) { - syslog(LOG_ERR, error_message(r)); + syslog(LOG_ERR, "%s", error_message(r)); fatal(error_message(r), EC_CONFIG); } diff -Naurp cyrus-imapd-2.3.14/imap/lmtpd.c cyrus-imapd-2.3.14.oden/imap/lmtpd.c --- cyrus-imapd-2.3.14/imap/lmtpd.c 2009-04-08 13:09:50.000000000 +0200 +++ cyrus-imapd-2.3.14.oden/imap/lmtpd.c 2009-04-08 13:10:09.000000000 +0200 @@ -235,7 +235,7 @@ int service_init(int argc __attribute__( /* Set namespace */ if ((r = mboxname_init_namespace(&lmtpd_namespace, 0)) != 0) { - syslog(LOG_ERR, error_message(r)); + syslog(LOG_ERR, "%s", error_message(r)); fatal(error_message(r), EC_CONFIG); } diff -Naurp cyrus-imapd-2.3.14/imap/mbexamine.c cyrus-imapd-2.3.14.oden/imap/mbexamine.c --- cyrus-imapd-2.3.14/imap/mbexamine.c 2008-09-19 03:03:20.000000000 +0200 +++ cyrus-imapd-2.3.14.oden/imap/mbexamine.c 2009-04-08 13:10:09.000000000 +0200 @@ -162,7 +162,7 @@ int main(int argc, char **argv) /* Set namespace -- force standard (internal) */ if ((r = mboxname_init_namespace(&recon_namespace, 1)) != 0) { - syslog(LOG_ERR, error_message(r)); + syslog(LOG_ERR, "%s", error_message(r)); fatal(error_message(r), EC_CONFIG); } diff -Naurp cyrus-imapd-2.3.14/imap/pop3d.c cyrus-imapd-2.3.14.oden/imap/pop3d.c --- cyrus-imapd-2.3.14/imap/pop3d.c 2009-04-08 13:09:51.000000000 +0200 +++ cyrus-imapd-2.3.14.oden/imap/pop3d.c 2009-04-08 13:10:09.000000000 +0200 @@ -428,7 +428,7 @@ int service_init(int argc __attribute__( /* Set namespace */ if ((r = mboxname_init_namespace(&popd_namespace, 1)) != 0) { - syslog(LOG_ERR, error_message(r)); + syslog(LOG_ERR, "%s", error_message(r)); fatal(error_message(r), EC_CONFIG); } diff -Naurp cyrus-imapd-2.3.14/imap/quota.c cyrus-imapd-2.3.14.oden/imap/quota.c --- cyrus-imapd-2.3.14/imap/quota.c 2009-02-09 06:01:58.000000000 +0100 +++ cyrus-imapd-2.3.14.oden/imap/quota.c 2009-04-08 13:10:09.000000000 +0200 @@ -166,7 +166,7 @@ int main(int argc,char **argv) /* Set namespace -- force standard (internal) */ if ((r = mboxname_init_namespace("a_namespace, 1)) != 0) { - syslog(LOG_ERR, error_message(r)); + syslog(LOG_ERR, "%s", error_message(r)); fatal(error_message(r), EC_CONFIG); } @@ -226,7 +226,7 @@ void errmsg(const char *fmt, const char if ((err == IMAP_IOERROR) && (len < sizeof(buf))) len += snprintf(buf+len, sizeof(buf)-len, ": %%m"); - syslog(LOG_ERR, buf); + syslog(LOG_ERR, "%s", buf); fprintf(stderr, "%s\n", buf); } diff -Naurp cyrus-imapd-2.3.14/imap/reconstruct.c cyrus-imapd-2.3.14.oden/imap/reconstruct.c --- cyrus-imapd-2.3.14/imap/reconstruct.c 2009-02-11 19:53:04.000000000 +0100 +++ cyrus-imapd-2.3.14.oden/imap/reconstruct.c 2009-04-08 13:10:09.000000000 +0200 @@ -215,7 +215,7 @@ int main(int argc, char **argv) /* Set namespace -- force standard (internal) */ if ((r = mboxname_init_namespace(&recon_namespace, 1)) != 0) { - syslog(LOG_ERR, error_message(r)); + syslog(LOG_ERR, "%s", error_message(r)); fatal(error_message(r), EC_CONFIG); } if (syncflag) @@ -433,8 +433,11 @@ do_reconstruct(char *name, r = reconstruct(lastname, rock); if (r) { - com_err(lastname, r, - (r == IMAP_IOERROR) ? error_message(errno) : NULL); + if (r == IMAP_IOERROR) + com_err(lastname, r, "%s", error_message(errno)); + else + com_err(lastname, r, NULL); + code = convert_code(r); } else { /* Convert internal name to external */ diff -Naurp cyrus-imapd-2.3.14/imap/smmapd.c cyrus-imapd-2.3.14.oden/imap/smmapd.c --- cyrus-imapd-2.3.14/imap/smmapd.c 2009-02-09 06:01:59.000000000 +0100 +++ cyrus-imapd-2.3.14.oden/imap/smmapd.c 2009-04-08 13:10:09.000000000 +0200 @@ -192,7 +192,7 @@ int service_init(int argc, char **argv, /* Set namespace */ if ((r = mboxname_init_namespace(&map_namespace, 1)) != 0) { - syslog(LOG_ERR, error_message(r)); + syslog(LOG_ERR, "%s", error_message(r)); fatal(error_message(r), EC_CONFIG); } diff -Naurp cyrus-imapd-2.3.14/imap/unexpunge.c cyrus-imapd-2.3.14.oden/imap/unexpunge.c --- cyrus-imapd-2.3.14/imap/unexpunge.c 2008-03-24 18:09:20.000000000 +0100 +++ cyrus-imapd-2.3.14.oden/imap/unexpunge.c 2009-04-08 13:10:09.000000000 +0200 @@ -519,7 +519,7 @@ int main(int argc, char *argv[]) /* Set namespace -- force standard (internal) */ if ((r = mboxname_init_namespace(&unex_namespace, 1)) != 0) { - syslog(LOG_ERR, error_message(r)); + syslog(LOG_ERR, "%s", error_message(r)); fatal(error_message(r), EC_CONFIG); } diff -Naurp cyrus-imapd-2.3.14/imap/version.c cyrus-imapd-2.3.14.oden/imap/version.c --- cyrus-imapd-2.3.14/imap/version.c 2008-03-24 18:09:20.000000000 +0100 +++ cyrus-imapd-2.3.14.oden/imap/version.c 2009-04-08 13:10:09.000000000 +0200 @@ -78,7 +78,7 @@ static char id_resp_arguments[MAXIDVALUE */ void id_getcmdline(int argc, char **argv) { - snprintf(id_resp_command, MAXIDVALUELEN, *argv); + snprintf(id_resp_command, MAXIDVALUELEN, "%s", *argv); while (--argc > 0) { snprintf(id_resp_arguments + strlen(id_resp_arguments), MAXIDVALUELEN - strlen(id_resp_arguments), diff -Naurp cyrus-imapd-2.3.14/timsieved/parser.c cyrus-imapd-2.3.14.oden/timsieved/parser.c --- cyrus-imapd-2.3.14/timsieved/parser.c 2009-02-09 06:01:59.000000000 +0100 +++ cyrus-imapd-2.3.14.oden/timsieved/parser.c 2009-04-08 13:10:09.000000000 +0200 @@ -693,7 +693,7 @@ static int cmd_authenticate(struct prots /* Set namespace */ if ((r = mboxname_init_namespace(&sieved_namespace, 0)) != 0) { - syslog(LOG_ERR, error_message(r)); + syslog(LOG_ERR, "%s", error_message(r)); fatal(error_message(r), EC_CONFIG); } @@ -709,7 +709,7 @@ static int cmd_authenticate(struct prots if(r && !sieved_userisadmin) { /* mboxlist_detail error */ - syslog(LOG_ERR, error_message(r)); + syslog(LOG_ERR, "%s", error_message(r)); if(reset_saslconn(&sieved_saslconn, ssf, authid) != SASL_OK) fatal("could not reset the sasl_conn_t after failure", diff -Naurp cyrus-imapd-2.3.14/perl/imap/IMAP.xs cyrus-imapd-2.3.14.oden/perl/imap/IMAP.xs --- cyrus-imapd-2.3.14/perl/imap/IMAP.xs 2008-04-04 14:47:09.000000000 +0200 +++ cyrus-imapd-2.3.14.oden/perl/imap/IMAP.xs 2009-04-08 13:10:51.000000000 +0200 @@ -74,7 +74,7 @@ typedef struct xscyrus *Cyrus_IMAP; /* hack, since libcyrus apparently expects fatal() to exist */ void fatal(const char *s, int exit) { - croak(s); + croak("%s", s); } /*