[26245] in Source-Commits
/svn/athena r25472 - in trunk/third/moira: clients/mailmaint clients/moira clients/mrcheck clients/mrtest debian lib update
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Thu May 3 15:38:05 2012
Date: Thu, 3 May 2012 15:38:04 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201205031938.q43Jc4v7031283@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-05-03 15:38:03 -0400 (Thu, 03 May 2012)
New Revision: 25472
Modified:
trunk/third/moira/clients/mailmaint/mailmaint.c
trunk/third/moira/clients/moira/attach.c
trunk/third/moira/clients/moira/main.c
trunk/third/moira/clients/moira/namespace.c
trunk/third/moira/clients/mrcheck/mrcheck.c
trunk/third/moira/clients/mrtest/mrtest.c
trunk/third/moira/debian/changelog
trunk/third/moira/lib/critical.c
trunk/third/moira/update/client.c
trunk/third/moira/update/update_server.c
Log:
In moira:
* Make -Werror=format-security happy
Modified: trunk/third/moira/clients/mailmaint/mailmaint.c
===================================================================
--- trunk/third/moira/clients/mailmaint/mailmaint.c 2012-05-03 17:15:39 UTC (rev 25471)
+++ trunk/third/moira/clients/mailmaint/mailmaint.c 2012-05-03 19:38:03 UTC (rev 25472)
@@ -216,7 +216,7 @@
exit(0);
punt:
- com_err(whoami, status, buf);
+ com_err(whoami, status, "%s", buf);
exit(1);
}
Modified: trunk/third/moira/clients/moira/attach.c
===================================================================
--- trunk/third/moira/clients/moira/attach.c 2012-05-03 17:15:39 UTC (rev 25471)
+++ trunk/third/moira/clients/moira/attach.c 2012-05-03 19:38:03 UTC (rev 25472)
@@ -188,7 +188,7 @@
static char *GetFSLabel(char **info)
{
- snprintf(labelbuf, sizeof(labelbuf), info[ALIAS_TRANS]);
+ snprintf(labelbuf, sizeof(labelbuf), "%s", info[ALIAS_TRANS]);
}
static int fsgCount = 1;
Modified: trunk/third/moira/clients/moira/main.c
===================================================================
--- trunk/third/moira/clients/moira/main.c 2012-05-03 17:15:39 UTC (rev 25471)
+++ trunk/third/moira/clients/moira/main.c 2012-05-03 19:38:03 UTC (rev 25472)
@@ -116,7 +116,7 @@
if (status == MR_USER_AUTH)
{
char buf[BUFSIZ];
- com_err(program_name, status, "\nPress [RETURN] to continue");
+ com_err(program_name, status, "%s", "\nPress [RETURN] to continue");
fgets(buf, BUFSIZ, stdin);
}
else
@@ -169,7 +169,7 @@
static void ErrorExit(char *buf, int status)
{
- com_err(program_name, status, buf);
+ com_err(program_name, status, "%s", buf);
mr_disconnect();
exit(1);
}
Modified: trunk/third/moira/clients/moira/namespace.c
===================================================================
--- trunk/third/moira/clients/moira/namespace.c 2012-05-03 17:15:39 UTC (rev 25471)
+++ trunk/third/moira/clients/moira/namespace.c 2012-05-03 19:38:03 UTC (rev 25472)
@@ -293,7 +293,7 @@
static void ErrorExit(char *buf, int status)
{
- com_err(program_name, status, buf);
+ com_err(program_name, status, "%s", buf);
mr_disconnect();
exit(1);
}
Modified: trunk/third/moira/clients/mrcheck/mrcheck.c
===================================================================
--- trunk/third/moira/clients/mrcheck/mrcheck.c 2012-05-03 17:15:39 UTC (rev 25471)
+++ trunk/third/moira/clients/mrcheck/mrcheck.c 2012-05-03 19:38:03 UTC (rev 25472)
@@ -224,7 +224,7 @@
exit(0);
punt:
- com_err(whoami, status, buf);
+ com_err(whoami, status, "%s", buf);
mr_disconnect();
exit(1);
}
Modified: trunk/third/moira/clients/mrtest/mrtest.c
===================================================================
--- trunk/third/moira/clients/mrtest/mrtest.c 2012-05-03 17:15:39 UTC (rev 25471)
+++ trunk/third/moira/clients/mrtest/mrtest.c 2012-05-03 19:38:03 UTC (rev 25472)
@@ -373,7 +373,7 @@
if (!inp)
{
sprintf(input, "Cannot open input file %s", argv[1]);
- com_err("moira (script)", 0, input);
+ com_err("moira (script)", 0, "%s", input);
return;
}
@@ -390,7 +390,7 @@
dup2(oldstdout, 1);
argc = 2;
sprintf(input, "Unable to redirect output to %s\n", argv[2]);
- com_err("moira (script)", errno, input);
+ com_err("moira (script)", errno, "%s", input);
}
else
{
Modified: trunk/third/moira/debian/changelog
===================================================================
--- trunk/third/moira/debian/changelog 2012-05-03 17:15:39 UTC (rev 25471)
+++ trunk/third/moira/debian/changelog 2012-05-03 19:38:03 UTC (rev 25472)
@@ -1,3 +1,9 @@
+debathena-moira (4.0.0-r4073-0debathena2) unstable; urgency=low
+
+ * Make -Werror=format-security happy
+
+ -- Jonathan Reed <jdreed@mit.edu> Thu, 03 May 2012 15:37:54 -0400
+
debathena-moira (4.0.0-r4073-0debathena1) unstable; urgency=low
* Re-snapshot moira at r4073 to pick up new changes to clients; the
Modified: trunk/third/moira/lib/critical.c
===================================================================
--- trunk/third/moira/lib/critical.c 2012-05-03 17:15:39 UTC (rev 25471)
+++ trunk/third/moira/lib/critical.c 2012-05-03 19:38:03 UTC (rev 25472)
@@ -73,7 +73,7 @@
va_end(ap);
send_zgram(instance, buf);
- com_err(whoami, 0, buf);
+ com_err(whoami, 0, "%s", buf);
free(buf);
}
Modified: trunk/third/moira/update/client.c
===================================================================
--- trunk/third/moira/update/client.c 2012-05-03 17:15:39 UTC (rev 25471)
+++ trunk/third/moira/update/client.c 2012-05-03 19:38:03 UTC (rev 25472)
@@ -169,6 +169,6 @@
void fail(int conn, int err, char *msg)
{
- com_err(whoami, err, msg);
+ com_err(whoami, err, "%s", msg);
return;
}
Modified: trunk/third/moira/update/update_server.c
===================================================================
--- trunk/third/moira/update/update_server.c 2012-05-03 17:15:39 UTC (rev 25471)
+++ trunk/third/moira/update/update_server.c 2012-05-03 19:38:03 UTC (rev 25472)
@@ -227,7 +227,7 @@
void fail(int conn, int err, char *msg)
{
- com_err(whoami, err, msg);
+ com_err(whoami, err, "%s", msg);
close(conn);
exit(1);
}
