[1983] in Moira Commits
/svn/moira r4122 - trunk/moira/clients/moira
daemon@ATHENA.MIT.EDU (Garry Zacheiss)
Tue Jul 16 13:53:47 2013
Date: Tue, 16 Jul 2013 13:53:39 -0400
From: Garry Zacheiss <zacheiss@MIT.EDU>
Message-Id: <201307161753.r6GHrdn5026980@drugstore.mit.edu>
To: moira-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: zacheiss
Date: 2013-07-16 13:53:39 -0400 (Tue, 16 Jul 2013)
New Revision: 4122
Modified:
trunk/moira/clients/moira/user.c
Log:
Fix this problem the right way.
Modified: trunk/moira/clients/moira/user.c
===================================================================
--- trunk/moira/clients/moira/user.c 2013-07-15 22:54:05 UTC (rev 4121)
+++ trunk/moira/clients/moira/user.c 2013-07-16 17:53:39 UTC (rev 4122)
@@ -370,6 +370,8 @@
FreeAndClear(&info[U_MODTIME], TRUE);
FreeAndClear(&info[U_MODBY], TRUE);
FreeAndClear(&info[U_MODWITH], TRUE);
+ FreeAndClear(&info[U_AFF_BASIC], TRUE);
+ FreeAndClear(&info[U_AFF_DETAILED], TRUE);
/*
* Slide the newname into the #2 slot, this screws up all future references
@@ -708,10 +710,7 @@
return;
}
- /* Subtract 2 from CountArgs() because affiliation fields are returned by
- * get query but aren't exposed to update query.
- */
- if ((status = do_mr_query("update_user_account", CountArgs(args) - 2,
+ if ((status = do_mr_query("update_user_account", CountArgs(args),
args, NULL, NULL)))
{
com_err(program_name, status, " in ModifyFields");
