[1873] in Moira Commits
/svn/moira r4015 - trunk/moira/incremental/ldap
daemon@ATHENA.MIT.EDU (Garry Zacheiss)
Tue Aug 24 11:52:02 2010
Date: Tue, 24 Aug 2010 11:51:54 -0400
From: Garry Zacheiss <zacheiss@MIT.EDU>
Message-Id: <201008241551.o7OFpsoq012310@drugstore.mit.edu>
To: moira-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: zacheiss
Date: 2010-08-24 11:51:54 -0400 (Tue, 24 Aug 2010)
New Revision: 4015
Modified:
trunk/moira/incremental/ldap/winad.c
Log:
From mark.
Modified: trunk/moira/incremental/ldap/winad.c
===================================================================
--- trunk/moira/incremental/ldap/winad.c 2010-07-22 20:10:20 UTC (rev 4014)
+++ trunk/moira/incremental/ldap/winad.c 2010-08-24 15:51:54 UTC (rev 4015)
@@ -2570,6 +2570,10 @@
ADD_ATTR("mitMoiraId", mitMoiraId_v, LDAP_MOD_REPLACE);
ADD_ATTR("groupType", groupTypeControl_v, LDAP_MOD_REPLACE);
+ if(!ActiveDirectory) {
+ ADD_ATTR("name", name_v, LDAP_MOD_REPLACE);
+ }
+
if (Exchange)
{
if(atoi(maillist) && !MailDisabled && email_isvalid(mail))
@@ -5162,6 +5166,7 @@
sprintf(userAccountControlStr, "%ld", userAccountControl);
userAccountControl_v[0] = userAccountControlStr;
userPrincipalName_v[0] = upn;
+ sprintf(mail,"%s@%s", user_name, lowercase(ldap_domain));
if(ActiveDirectory)
cn_v[0] = user_name;
@@ -5195,7 +5200,6 @@
else
sprintf(new_dn, "uid=%s,%s,%s", user_name, user_ou, call_args[1]);
- sprintf(mail,"%s@%s", user_name, lowercase(ldap_domain));
if(Exchange)
sprintf(contact_mail, "%s@exchange-forwarding.mit.edu", user_name);
else
@@ -5359,7 +5363,7 @@
{
mitMoiraId_v[0] = call_args[2];
ADD_ATTR("mitMoiraId", mitMoiraId_v, LDAP_MOD_ADD);
- }
+ }
ADD_ATTR("altSecurityIdentities", altSecurityIdentities_v, LDAP_MOD_ADD);
@@ -9202,7 +9206,8 @@
while(gPtr) {
if (((s = strstr(gPtr->dn, "Public")) != (char *) NULL) ||
((s = strstr(gPtr->dn, "Recover")) != (char *) NULL) ||
- ((s = strstr(gPtr->dn, "Reserve")) != (char *) NULL))
+ ((s = strstr(gPtr->dn, "Reserve")) != (char *) NULL) ||
+ ((s = strstr(gPtr->dn, "PF")) != (char *) NULL))
{
gPtr = gPtr->next;
continue;
