[1938] in Moira Commits
/svn/moira r4077 - in trunk/moira: clients/mailmaint clients/moira clients/mrcheck clients/mrtest lib update
daemon@ATHENA.MIT.EDU (Garry Zacheiss)
Mon May 7 12:53:11 2012
Date: Mon, 7 May 2012 12:53:11 -0400
From: Garry Zacheiss <zacheiss@MIT.EDU>
Message-Id: <201205071653.q47GrB4e020291@drugstore.mit.edu>
To: moira-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: zacheiss
Date: 2012-05-07 12:53:10 -0400 (Mon, 07 May 2012)
New Revision: 4077
Modified:
trunk/moira/clients/mailmaint/mailmaint.c
trunk/moira/clients/moira/attach.c
trunk/moira/clients/moira/main.c
trunk/moira/clients/moira/namespace.c
trunk/moira/clients/mrcheck/mrcheck.c
trunk/moira/clients/mrtest/mrtest.c
trunk/moira/lib/critical.c
trunk/moira/update/client.c
trunk/moira/update/update_server.c
Log:
Compile with -Werror=format-security
Modified: trunk/moira/clients/mailmaint/mailmaint.c
===================================================================
--- trunk/moira/clients/mailmaint/mailmaint.c 2012-04-26 14:08:52 UTC (rev 4076)
+++ trunk/moira/clients/mailmaint/mailmaint.c 2012-05-07 16:53:10 UTC (rev 4077)
@@ -216,7 +216,7 @@
exit(0);
punt:
- com_err(whoami, status, buf);
+ com_err(whoami, status, "%s", buf);
exit(1);
}
Modified: trunk/moira/clients/moira/attach.c
===================================================================
--- trunk/moira/clients/moira/attach.c 2012-04-26 14:08:52 UTC (rev 4076)
+++ trunk/moira/clients/moira/attach.c 2012-05-07 16:53:10 UTC (rev 4077)
@@ -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/moira/clients/moira/main.c
===================================================================
--- trunk/moira/clients/moira/main.c 2012-04-26 14:08:52 UTC (rev 4076)
+++ trunk/moira/clients/moira/main.c 2012-05-07 16:53:10 UTC (rev 4077)
@@ -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/moira/clients/moira/namespace.c
===================================================================
--- trunk/moira/clients/moira/namespace.c 2012-04-26 14:08:52 UTC (rev 4076)
+++ trunk/moira/clients/moira/namespace.c 2012-05-07 16:53:10 UTC (rev 4077)
@@ -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/moira/clients/mrcheck/mrcheck.c
===================================================================
--- trunk/moira/clients/mrcheck/mrcheck.c 2012-04-26 14:08:52 UTC (rev 4076)
+++ trunk/moira/clients/mrcheck/mrcheck.c 2012-05-07 16:53:10 UTC (rev 4077)
@@ -224,7 +224,7 @@
exit(0);
punt:
- com_err(whoami, status, buf);
+ com_err(whoami, status, "%s", buf);
mr_disconnect();
exit(1);
}
Modified: trunk/moira/clients/mrtest/mrtest.c
===================================================================
--- trunk/moira/clients/mrtest/mrtest.c 2012-04-26 14:08:52 UTC (rev 4076)
+++ trunk/moira/clients/mrtest/mrtest.c 2012-05-07 16:53:10 UTC (rev 4077)
@@ -372,8 +372,7 @@
inp = fopen(argv[1], "r");
if (!inp)
{
- sprintf(input, "Cannot open input file %s", argv[1]);
- com_err("moira (script)", 0, input);
+ com_err("moira (script)", 0, "Cannot open input file %s", argv[1]);
return;
}
@@ -389,8 +388,7 @@
close(status);
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, "Unable to redirect output to %s", argv[2]);
}
else
{
Modified: trunk/moira/lib/critical.c
===================================================================
--- trunk/moira/lib/critical.c 2012-04-26 14:08:52 UTC (rev 4076)
+++ trunk/moira/lib/critical.c 2012-05-07 16:53:10 UTC (rev 4077)
@@ -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/moira/update/client.c
===================================================================
--- trunk/moira/update/client.c 2012-04-26 14:08:52 UTC (rev 4076)
+++ trunk/moira/update/client.c 2012-05-07 16:53:10 UTC (rev 4077)
@@ -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/moira/update/update_server.c
===================================================================
--- trunk/moira/update/update_server.c 2012-04-26 14:08:52 UTC (rev 4076)
+++ trunk/moira/update/update_server.c 2012-05-07 16:53:10 UTC (rev 4077)
@@ -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);
}
