[1801] in Moira Commits
/svn/moira r3945 - trunk/moira/incremental/ldap
daemon@ATHENA.MIT.EDU (Garry Zacheiss)
Fri Jan 1 20:22:11 2010
Date: Fri, 1 Jan 2010 20:22:10 -0500
From: Garry Zacheiss <zacheiss@MIT.EDU>
Message-Id: <201001020122.o021MAtR009488@drugstore.mit.edu>
To: moira-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: zacheiss
Date: 2010-01-01 20:22:09 -0500 (Fri, 01 Jan 2010)
New Revision: 3945
Modified:
trunk/moira/incremental/ldap/winad.c
Log:
From mark: homeMBB changes
Modified: trunk/moira/incremental/ldap/winad.c
===================================================================
--- trunk/moira/incremental/ldap/winad.c 2009-12-30 19:52:15 UTC (rev 3944)
+++ trunk/moira/incremental/ldap/winad.c 2010-01-02 01:22:09 UTC (rev 3945)
@@ -2441,7 +2441,7 @@
group_count = 0;
group_base = NULL;
- sprintf(search_filter, "(&(objectClass=user)(cn=%s))",
+ sprintf(search_filter, "(&(objectClass=user)(homeMDB=*)(cn=%s))",
after_group_name);
attr_array[0] = "cn";
attr_array[1] = NULL;
@@ -2767,7 +2767,8 @@
group_count = 0;
group_base = NULL;
- sprintf(filter, "(&(objectClass=user)(cn=%s))", av[L_NAME]);
+ sprintf(filter, "(&(objectClass=user)(homeMDB=*)(cn=%s))",
+ av[L_NAME]);
attr_array[0] = "cn";
attr_array[1] = NULL;
@@ -2909,7 +2910,8 @@
group_count = 0;
group_base = NULL;
- sprintf(filter, "(&(objectClass=user)(cn=%s))", av[L_NAME]);
+ sprintf(filter, "(&(objectClass=user)(homeMDB=*)(cn=%s))",
+ av[L_NAME]);
attr_array[0] = "cn";
attr_array[1] = NULL;
@@ -3622,54 +3624,6 @@
goto cleanup;
}
- if ((!strcmp(UserOu, contact_ou)) || (!strcmp(UserOu, kerberos_ou)))
- {
- if (Exchange)
- {
- if(!strcmp(UserOu, contact_ou) &&
- ((s = strstr(user_name,
- "@exchange-forwarding.mit.edu")) != (char *) NULL))
- {
- memset(temp, '\0', sizeof(temp));
- strcpy(temp, user_name);
- s = strchr(temp, '@');
- *s = '\0';
-
- sprintf(filter, "(&(objectClass=user)(mailNickName=%s))", temp);
-
- if ((rc = linklist_build(ldap_handle, dn_path, filter, NULL,
- &group_base, &group_count,
- LDAP_SCOPE_SUBTREE) != 0))
- return(rc);
-
- if(group_count)
- goto cleanup;
-
- linklist_free(group_base);
- group_base = NULL;
- group_count = 0;
- }
-
- sprintf(filter, "(distinguishedName=%s)", temp);
- attr_array[0] = "memberOf";
- attr_array[1] = NULL;
-
- if ((rc = linklist_build(ldap_handle, dn_path, filter, attr_array,
- &group_base, &group_count,
- LDAP_SCOPE_SUBTREE) != 0))
- return(rc);
-
-
- if(!group_count)
- {
- com_err(whoami, 0, "Removing unreferenced object %s", temp);
-
- if ((rc = ldap_delete_s(ldap_handle, temp)) != 0)
- return(rc);
- }
- }
- }
-
cleanup:
return(rc);
}
@@ -3932,7 +3886,7 @@
group_count = 0;
group_base = NULL;
- sprintf(filter, "(&(objectClass=user)(cn=%s))", mail);
+ sprintf(filter, "(&(objectClass=user)(homeMDB=*)(cn=%s))", mail);
attr_array[0] = "cn";
attr_array[1] = NULL;
@@ -3980,7 +3934,7 @@
group_count = 0;
group_base = NULL;
- sprintf(filter, "(&(objectClass=user)(mail=%s))", mail);
+ sprintf(filter, "(&(objectClass=user)(homeMDB=*)(mail=%s))", mail);
attr_array[0] = "cn";
attr_array[1] = NULL;
@@ -4028,7 +3982,9 @@
group_base = NULL;
group_count = 0;
- sprintf(filter, "(&(objectClass=user)(proxyAddresses=smtp:%s))", mail);
+ sprintf(filter,
+ "(&(objectClass=user)(homeMDB=*)(proxyAddresses=smtp:%s))",
+ mail);
attr_array[0] = "cn";
attr_array[1] = NULL;
@@ -4052,7 +4008,8 @@
group_base = NULL;
group_count = 0;
- sprintf(filter, "(&(objectClass=group)(proxyAddresses=smtp:%s))", mail);
+ sprintf(filter, "(&(objectClass=group)(proxyAddresses=smtp:%s))",
+ mail);
attr_array[0] = "cn";
attr_array[1] = NULL;
