[26262] in Source-Commits
Re: /svn/athena r25477 - in trunk/third/moira: clients/mailmaint
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Mon May 7 15:37:21 2012
Date: Mon, 7 May 2012 12:37:19 -0700 (PDT)
From: Geoffrey Thomas <geofft@MIT.EDU>
To: Jonathan D Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201205071834.q47IY1lx003568@drugstore.mit.edu>
Message-ID: <alpine.DEB.2.00.1205071237170.15734@dr-wily.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
ACK
--
Geoffrey Thomas
geofft@mit.edu
On Mon, 7 May 2012, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2012-05-07 14:34:01 -0400 (Mon, 07 May 2012)
> New Revision: 25477
>
> 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/incremental/ldap/winad.c
> trunk/third/moira/lib/critical.c
> trunk/third/moira/reg_svr/coupons/coupon.ps
> trunk/third/moira/reg_svr/reg_svr.pc
> trunk/third/moira/update/client.c
> trunk/third/moira/update/update_server.c
> Log:
> In moira:
> * Re-snapshot moira at r4077, which incorporates the
> -Werror=format-security fixes from 4.0.0-r4073-0debathena2, except
> from upstream instead of from us.
>
>
> Modified: trunk/third/moira/clients/mailmaint/mailmaint.c
> ===================================================================
> --- trunk/third/moira/clients/mailmaint/mailmaint.c 2012-05-07 16:27:33 UTC (rev 25476)
> +++ trunk/third/moira/clients/mailmaint/mailmaint.c 2012-05-07 18:34:01 UTC (rev 25477)
> @@ -1,4 +1,4 @@
> -/* $Id: mailmaint.c 3956 2010-01-05 20:56:56Z zacheiss $
> +/* $Id: mailmaint.c 4077 2012-05-07 16:53:10Z zacheiss $
> *
> * Simple add-me-to/remove-me-from list client
> *
> @@ -52,7 +52,7 @@
> #define DELETE_A_CHAR() printf("\b \b");
> #endif /* !_WIN32 */
>
> -RCSID("$HeadURL: svn+ssh://svn.mit.edu/moira/trunk/moira/clients/mailmaint/mailmaint.c $ $Id: mailmaint.c 3956 2010-01-05 20:56:56Z zacheiss $");
> +RCSID("$HeadURL: svn+ssh://svn.mit.edu/moira/trunk/moira/clients/mailmaint/mailmaint.c $ $Id: mailmaint.c 4077 2012-05-07 16:53:10Z zacheiss $");
>
> #define STARTCOL 0
> #define STARTROW 3
>
> Modified: trunk/third/moira/clients/moira/attach.c
> ===================================================================
> --- trunk/third/moira/clients/moira/attach.c 2012-05-07 16:27:33 UTC (rev 25476)
> +++ trunk/third/moira/clients/moira/attach.c 2012-05-07 18:34:01 UTC (rev 25477)
> @@ -1,4 +1,4 @@
> -/* $Id: attach.c 3956 2010-01-05 20:56:56Z zacheiss $
> +/* $Id: attach.c 4077 2012-05-07 16:53:10Z zacheiss $
> *
> * This is the file attach.c for the Moira Client, which allows users
> * to quickly and easily maintain most parts of the Moira database.
> @@ -32,7 +32,7 @@
> #include <unistd.h>
> #endif /* HAVE_UNISTD_H */
>
> -RCSID("$HeadURL: svn+ssh://svn.mit.edu/moira/trunk/moira/clients/moira/attach.c $ $Id: attach.c 3956 2010-01-05 20:56:56Z zacheiss $");
> +RCSID("$HeadURL: svn+ssh://svn.mit.edu/moira/trunk/moira/clients/moira/attach.c $ $Id: attach.c 4077 2012-05-07 16:53:10Z zacheiss $");
>
> char *canonicalize_cell(char *c);
> int GetAliasValue(int argc, char **argv, void *retval);
>
> Modified: trunk/third/moira/clients/moira/main.c
> ===================================================================
> --- trunk/third/moira/clients/moira/main.c 2012-05-07 16:27:33 UTC (rev 25476)
> +++ trunk/third/moira/clients/moira/main.c 2012-05-07 18:34:01 UTC (rev 25477)
> @@ -1,4 +1,4 @@
> -/* $Id: main.c 3956 2010-01-05 20:56:56Z zacheiss $
> +/* $Id: main.c 4077 2012-05-07 16:53:10Z zacheiss $
> *
> * This is the file main.c for the Moira Client, which allows users
> * to quickly and easily maintain most parts of the Moira database.
> @@ -26,7 +26,7 @@
> #include <unistd.h>
> #endif /* HAVE_UNISTD_H */
>
> -RCSID("$HeadURL: svn+ssh://svn.mit.edu/moira/trunk/moira/clients/moira/main.c $ $Id: main.c 3956 2010-01-05 20:56:56Z zacheiss $");
> +RCSID("$HeadURL: svn+ssh://svn.mit.edu/moira/trunk/moira/clients/moira/main.c $ $Id: main.c 4077 2012-05-07 16:53:10Z zacheiss $");
>
> static void ErrorExit(char *buf, int status);
> static void Usage(void);
>
> Modified: trunk/third/moira/clients/moira/namespace.c
> ===================================================================
> --- trunk/third/moira/clients/moira/namespace.c 2012-05-07 16:27:33 UTC (rev 25476)
> +++ trunk/third/moira/clients/moira/namespace.c 2012-05-07 18:34:01 UTC (rev 25477)
> @@ -1,4 +1,4 @@
> -/* $Id: namespace.c 3956 2010-01-05 20:56:56Z zacheiss $
> +/* $Id: namespace.c 4077 2012-05-07 16:53:10Z zacheiss $
> *
> * This is the file main.c for the Moira Client, which allows users
> * to quickly and easily maintain most parts of the Moira database.
> @@ -23,7 +23,7 @@
> #include <stdio.h>
> #include <string.h>
>
> -RCSID("$HeadURL: svn+ssh://svn.mit.edu/moira/trunk/moira/clients/moira/namespace.c $ $Id: namespace.c 3956 2010-01-05 20:56:56Z zacheiss $");
> +RCSID("$HeadURL: svn+ssh://svn.mit.edu/moira/trunk/moira/clients/moira/namespace.c $ $Id: namespace.c 4077 2012-05-07 16:53:10Z zacheiss $");
>
> static void ErrorExit(char *buf, int status);
> static void Usage(void);
>
> Modified: trunk/third/moira/clients/mrcheck/mrcheck.c
> ===================================================================
> --- trunk/third/moira/clients/mrcheck/mrcheck.c 2012-05-07 16:27:33 UTC (rev 25476)
> +++ trunk/third/moira/clients/mrcheck/mrcheck.c 2012-05-07 18:34:01 UTC (rev 25477)
> @@ -1,4 +1,4 @@
> -/* $Id: mrcheck.c 3956 2010-01-05 20:56:56Z zacheiss $
> +/* $Id: mrcheck.c 4077 2012-05-07 16:53:10Z zacheiss $
> *
> * Verify that all Moira updates are successful
> *
> @@ -19,7 +19,7 @@
>
> #define argis(a, b) (!strcmp(*arg + 1, a) || !strcmp(*arg + 1, b))
>
> -RCSID("$HeadURL: svn+ssh://svn.mit.edu/moira/trunk/moira/clients/mrcheck/mrcheck.c $ $Id: mrcheck.c 3956 2010-01-05 20:56:56Z zacheiss $");
> +RCSID("$HeadURL: svn+ssh://svn.mit.edu/moira/trunk/moira/clients/mrcheck/mrcheck.c $ $Id: mrcheck.c 4077 2012-05-07 16:53:10Z zacheiss $");
>
> char *atot(char *itime);
> int process_server(int argc, char **argv, void *sqv);
>
> Modified: trunk/third/moira/clients/mrtest/mrtest.c
> ===================================================================
> --- trunk/third/moira/clients/mrtest/mrtest.c 2012-05-07 16:27:33 UTC (rev 25476)
> +++ trunk/third/moira/clients/mrtest/mrtest.c 2012-05-07 18:34:01 UTC (rev 25477)
> @@ -1,4 +1,4 @@
> -/* $Id: mrtest.c 3956 2010-01-05 20:56:56Z zacheiss $
> +/* $Id: mrtest.c 4077 2012-05-07 16:53:10Z zacheiss $
> *
> * Bare-bones Moira client
> *
> @@ -43,7 +43,7 @@
> #include "readline/history.h"
> #endif
>
> -RCSID("$HeadURL: svn+ssh://svn.mit.edu/moira/trunk/moira/clients/mrtest/mrtest.c $ $Id: mrtest.c 3956 2010-01-05 20:56:56Z zacheiss $");
> +RCSID("$HeadURL: svn+ssh://svn.mit.edu/moira/trunk/moira/clients/mrtest/mrtest.c $ $Id: mrtest.c 4077 2012-05-07 16:53:10Z zacheiss $");
>
> int recursion = 0, quote_output = 0, interactive;
> int count, quit = 0, cancel = 0;
> @@ -388,7 +388,7 @@
> close(status);
> dup2(oldstdout, 1);
> argc = 2;
> - com_err("moira (script)", errno, "Unable to redirect output to %s\n", argv[2]);
> + com_err("moira (script)", errno, "Unable to redirect output to %s", argv[2]);
> }
> else
> {
>
> Modified: trunk/third/moira/debian/changelog
> ===================================================================
> --- trunk/third/moira/debian/changelog 2012-05-07 16:27:33 UTC (rev 25476)
> +++ trunk/third/moira/debian/changelog 2012-05-07 18:34:01 UTC (rev 25477)
> @@ -1,3 +1,11 @@
> +debathena-moira (4.0.0-r4077-0debathena1) unstable; urgency=low
> +
> + * Re-snapshot moira at r4077, which incorporates the
> + -Werror=format-security fixes from 4.0.0-r4073-0debathena2, except
> + from upstream instead of from us.
> +
> + -- Jonathan Reed <jdreed@mit.edu> Mon, 07 May 2012 14:31:58 -0400
> +
> debathena-moira (4.0.0-r4073-0debathena2) unstable; urgency=low
>
> * Make -Werror=format-security happy
>
> Modified: trunk/third/moira/incremental/ldap/winad.c
> ===================================================================
> --- trunk/third/moira/incremental/ldap/winad.c 2012-05-07 16:27:33 UTC (rev 25476)
> +++ trunk/third/moira/incremental/ldap/winad.c 2012-05-07 18:34:01 UTC (rev 25477)
> @@ -1,4 +1,4 @@
> -/* $HeadURL: svn+ssh://svn.mit.edu/moira/trunk/moira/incremental/ldap/winad.c $ $Id: winad.c 4062 2011-12-07 21:07:25Z zacheiss $ */
> +/* $HeadURL: svn+ssh://svn.mit.edu/moira/trunk/moira/incremental/ldap/winad.c $ $Id: winad.c 4074 2012-03-28 13:24:31Z zacheiss $ */
> /* ldap.incr arguments example
> *
> * arguments when moira creates the account - ignored by ldap.incr since the
> @@ -9284,7 +9284,9 @@
> ((s = strstr(gPtr->dn, "Reserve")) != (char *) NULL) ||
> ((s = strstr(gPtr->dn, "reserve")) != (char *) NULL) ||
> ((s = strstr(gPtr->dn, "PF")) != (char *) NULL) ||
> - ((s = strstr(gPtr->dn, "pf")) != (char *) NULL))
> + ((s = strstr(gPtr->dn, "pf")) != (char *) NULL) ||
> + ((s = strstr(gPtr->dn, "TSM")) != (char *) NULL) ||
> + ((s = strstr(gPtr->dn, "tsm")) != (char *) NULL))
> {
> gPtr = gPtr->next;
> continue;
>
> Modified: trunk/third/moira/lib/critical.c
> ===================================================================
> --- trunk/third/moira/lib/critical.c 2012-05-07 16:27:33 UTC (rev 25476)
> +++ trunk/third/moira/lib/critical.c 2012-05-07 18:34:01 UTC (rev 25477)
> @@ -1,4 +1,4 @@
> -/* $Id: critical.c 3956 2010-01-05 20:56:56Z zacheiss $
> +/* $Id: critical.c 4077 2012-05-07 16:53:10Z zacheiss $
> *
> * Log and send a zephyrgram about any critical errors.
> *
> @@ -28,7 +28,7 @@
> #endif
> #include <time.h>
>
> -RCSID("$HeadURL: svn+ssh://svn.mit.edu/moira/trunk/moira/lib/critical.c $ $Id: critical.c 3956 2010-01-05 20:56:56Z zacheiss $");
> +RCSID("$HeadURL: svn+ssh://svn.mit.edu/moira/trunk/moira/lib/critical.c $ $Id: critical.c 4077 2012-05-07 16:53:10Z zacheiss $");
>
> /* mode to create the file with */
> #define LOGFILEMODE 0644
>
> Modified: trunk/third/moira/reg_svr/coupons/coupon.ps
> ===================================================================
> --- trunk/third/moira/reg_svr/coupons/coupon.ps 2012-05-07 16:27:33 UTC (rev 25476)
> +++ trunk/third/moira/reg_svr/coupons/coupon.ps 2012-05-07 18:34:01 UTC (rev 25477)
> @@ -433,7 +433,7 @@
> (Technology) 125 658 rightjustify
>
> (TimesNewRomanPSMT) cvn findfont 6.6123 scalefont setfont
> -(web.mit.edu/ist) 125 648 rightjustify
> +(ist.mit.edu) 125 648 rightjustify
>
> (TimesNewRomanPS-BoldMT) cvn findfont 6.6123 scalefont setfont
> (Need Help?) 100 618 rightjustify
> @@ -1268,7 +1268,7 @@
> % Bold Weight
> 0 0 moveto
> 0.0 0.0 32 0.0844905 0.0 300.582 146.2 1 setshowparams
> -(web.mit.edu/ist/start/students) awidthshow
> +(http://ist.mit.edu/start-students) awidthshow
> 0.7347 setlinewidth
> 0.0 0.0 0.0 setrgbcolor
> % TimesNewRomanPS-BoldMT TimesNewRomanPS-BoldMT nonstandard font
>
> Modified: trunk/third/moira/reg_svr/reg_svr.pc
> ===================================================================
> --- trunk/third/moira/reg_svr/reg_svr.pc 2012-05-07 16:27:33 UTC (rev 25476)
> +++ trunk/third/moira/reg_svr/reg_svr.pc 2012-05-07 18:34:01 UTC (rev 25477)
> @@ -1,4 +1,4 @@
> -/* $Id: reg_svr.pc 4071 2012-02-03 18:02:54Z zacheiss $
> +/* $Id: reg_svr.pc 4075 2012-04-18 16:22:46Z zacheiss $
> *
> * Server for user registration with Moira and Kerberos.
> *
> @@ -39,7 +39,7 @@
>
> EXEC SQL INCLUDE sqlca;
>
> -RCSID("$HeadURL: svn+ssh://svn.mit.edu/moira/trunk/moira/reg_svr/reg_svr.pc $ $Id: reg_svr.pc 4071 2012-02-03 18:02:54Z zacheiss $");
> +RCSID("$HeadURL: svn+ssh://svn.mit.edu/moira/trunk/moira/reg_svr/reg_svr.pc $ $Id: reg_svr.pc 4075 2012-04-18 16:22:46Z zacheiss $");
>
> char *whoami, *hostname, *shorthostname;
>
> @@ -50,6 +50,7 @@
> int update_user_status(char *username, int account_status);
> void mr_com_err(const char *whoami, long code, const char *fmt, va_list pvar);
> void sigshut(int);
> +char *remove_char(char *str, int ch);
>
> reg_client *cl = NULL;
> enum { RS_RUNNING, RS_SLEEPING, RS_EXITING } state = RS_RUNNING;
> @@ -317,8 +318,9 @@
> ufirst = argv[0];
> umiddle = argv[1];
> ulast = argv[2];
> - id = argv[3];
> -
> + /* Remove dashes from MIT ID */
> + id = remove_char(argv[3], '-');
> +
> EXEC SQL SELECT count(login) INTO :count FROM users WHERE clearid = :id;
>
> /* "ORDER BY status" so that if there's both a matching state 0 entry
> @@ -1103,3 +1105,20 @@
> {
> state = RS_EXITING;
> }
> +
> +char *remove_char(char *str, int ch)
> +{
> + char *dst = strchr(str, ch);
> +
> + if (dst != NULL)
> + {
> + const char *src = dst;
> + while (*dst != '\0')
> + {
> + while (*src == ch)
> + src++;
> + *dst++ = *src++;
> + }
> + }
> + return str;
> +}
>
> Modified: trunk/third/moira/update/client.c
> ===================================================================
> --- trunk/third/moira/update/client.c 2012-05-07 16:27:33 UTC (rev 25476)
> +++ trunk/third/moira/update/client.c 2012-05-07 18:34:01 UTC (rev 25477)
> @@ -1,4 +1,4 @@
> -/* $Id: client.c 3956 2010-01-05 20:56:56Z zacheiss $
> +/* $Id: client.c 4077 2012-05-07 16:53:10Z zacheiss $
> *
> * This code handles the actual distribution of data files
> * to servers in the Moira server-update program.
> @@ -23,7 +23,7 @@
> #endif
> #include <krb5.h>
>
> -RCSID("$HeadURL: svn+ssh://svn.mit.edu/moira/trunk/moira/update/client.c $ $Id: client.c 3956 2010-01-05 20:56:56Z zacheiss $");
> +RCSID("$HeadURL: svn+ssh://svn.mit.edu/moira/trunk/moira/update/client.c $ $Id: client.c 4077 2012-05-07 16:53:10Z zacheiss $");
>
> #ifdef HAVE_KRB4
> extern des_cblock session;
>
> Modified: trunk/third/moira/update/update_server.c
> ===================================================================
> --- trunk/third/moira/update/update_server.c 2012-05-07 16:27:33 UTC (rev 25476)
> +++ trunk/third/moira/update/update_server.c 2012-05-07 18:34:01 UTC (rev 25477)
> @@ -1,4 +1,4 @@
> -/* $Id: update_server.c 3956 2010-01-05 20:56:56Z zacheiss $
> +/* $Id: update_server.c 4077 2012-05-07 16:53:10Z zacheiss $
> *
> * Copyright 1988-1998 by the Massachusetts Institute of Technology.
> * For copying and distribution information, please see the file
> @@ -30,7 +30,7 @@
> #endif
> #include "update.h"
>
> -RCSID("$HeadURL: svn+ssh://svn.mit.edu/moira/trunk/moira/update/update_server.c $ $Id: update_server.c 3956 2010-01-05 20:56:56Z zacheiss $");
> +RCSID("$HeadURL: svn+ssh://svn.mit.edu/moira/trunk/moira/update/update_server.c $ $Id: update_server.c 4077 2012-05-07 16:53:10Z zacheiss $");
>
> char *whoami, *hostname;
>
>
>
