[1985] in Moira Commits
/svn/moira r4124 - trunk/moira/incremental/ldap
daemon@ATHENA.MIT.EDU (Garry Zacheiss)
Tue Jul 23 10:09:57 2013
Date: Tue, 23 Jul 2013 10:09:47 -0400
From: Garry Zacheiss <zacheiss@MIT.EDU>
Message-Id: <201307231409.r6NE9l3n019365@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 10:09:47 -0400 (Tue, 23 Jul 2013)
New Revision: 4124
Modified:
trunk/moira/incremental/ldap/winad.c
Log:
I hate you, cpp.
Modified: trunk/moira/incremental/ldap/winad.c
===================================================================
--- trunk/moira/incremental/ldap/winad.c 2013-07-22 13:51:41 UTC (rev 4123)
+++ trunk/moira/incremental/ldap/winad.c 2013-07-23 14:09:47 UTC (rev 4124)
@@ -7035,25 +7035,32 @@
}
if(strlen(av[U_FIRST]))
- ADD_ATTR("givenName", givenName_v, LDAP_MOD_ADD);
-
+ {
+ ADD_ATTR("givenName", givenName_v, LDAP_MOD_ADD);
+ }
if(strlen(av[U_LAST]) || strlen(av[U_NAME]))
- ADD_ATTR("sn", sn_v, LDAP_MOD_ADD);
+ {
+ ADD_ATTR("sn", sn_v, LDAP_MOD_ADD);
+ }
if(strlen(av[U_FIRST]) || strlen(av[U_MIDDLE]) || strlen(av[U_LAST]))
{
ADD_ATTR("displayName", displayName_v, LDAP_MOD_ADD);
- if(!ActiveDirectory)
- ADD_ATTR("eduPersonNickname", displayName_v, LDAP_MOD_ADD);
+ if(!ActiveDirectory)
+ {
+ ADD_ATTR("eduPersonNickname", displayName_v, LDAP_MOD_ADD);
+ }
}
else
{
ADD_ATTR("displayName", name_v, LDAP_MOD_ADD);
- if(!ActiveDirectory)
- ADD_ATTR("eduPersonNickname", name_v, LDAP_MOD_ADD);
+ if(!ActiveDirectory)
+ {
+ ADD_ATTR("eduPersonNickname", name_v, LDAP_MOD_ADD);
+ }
}
if (strlen(av[U_MIDDLE]) == 1)
