[26247] in Source-Commits
Re: /svn/athena r25472 - in trunk/third/moira: clients/mailmaint
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Thu May 3 15:43:25 2012
Date: Thu, 3 May 2012 12:43:22 -0700 (PDT)
From: Geoffrey Thomas <geofft@MIT.EDU>
To: Jonathan D Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201205031938.q43Jc4v7031283@drugstore.mit.edu>
Message-ID: <alpine.DEB.2.00.1205031240020.2871@dr-wily.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
On Thu, 3 May 2012, Jonathan D Reed wrote:
> 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
Huh?
> 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;
> }
This seems a little redundant...
> @@ -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
> {
>
As does this
> 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
>
BTW, I'm not thrilled about modifying files outside of debian/. If you can
get this upstream before next time we snapshot, that's fine; otherwise we
risk these changes ending up in an orig tarball.
--
Geoffrey Thomas
geofft@mit.edu
