[1986] in Moira Commits
/svn/moira r4125 - trunk/moira/incremental/ldap
daemon@ATHENA.MIT.EDU (Garry Zacheiss)
Tue Jul 23 11:30:05 2013
Date: Tue, 23 Jul 2013 11:29:57 -0400
From: Garry Zacheiss <zacheiss@MIT.EDU>
Message-Id: <201307231529.r6NFTvLg032195@drugstore.mit.edu>
To: moira-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: zacheiss
Date: 2013-07-23 11:29:57 -0400 (Tue, 23 Jul 2013)
New Revision: 4125
Modified:
trunk/moira/incremental/ldap/winad.c
Log:
wrap macros to make them safer to use.
Modified: trunk/moira/incremental/ldap/winad.c
===================================================================
--- trunk/moira/incremental/ldap/winad.c 2013-07-23 14:09:47 UTC (rev 4124)
+++ trunk/moira/incremental/ldap/winad.c 2013-07-23 15:29:57 UTC (rev 4125)
@@ -375,16 +375,20 @@
CN=Microsoft Exchange,CN=Services,CN=Configuration,"
#define ADD_ATTR(t, v, o) \
+do { \
mods[n] = malloc(sizeof(LDAPMod)); \
mods[n]->mod_op = o; \
mods[n]->mod_type = t; \
- mods[n++]->mod_values = v
+ mods[n++]->mod_values = v; \
+} while (0)
#define DEL_ATTR(t, o) \
+do { \
DelMods[i] = malloc(sizeof(LDAPMod)); \
DelMods[i]->mod_op = o; \
DelMods[i]->mod_type = t; \
- DelMods[i++]->mod_values = NULL
+ DelMods[i++]->mod_values = NULL; \
+} while (0)
#define DOMAIN_SUFFIX "MIT.EDU"
#define DOMAIN "DOMAIN:"
