From: zacheiss <zacheiss>
Date: Sun, 5 Apr 2009 18:09:05 +0000 (+0000)
Subject: Replace filter with search_filter.
X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/commitdiff_plain/fa8a8b327923d1e00fbc81c6b6f4e6afe020f31a

Replace filter with search_filter.
---

diff --git a/incremental/ldap/winad.c b/incremental/ldap/winad.c
index 02bc6979..4e31c7a6 100755
--- a/incremental/ldap/winad.c
+++ b/incremental/ldap/winad.c
@@ -2419,6 +2419,7 @@ int group_rename(LDAP *ldap_handle, char *dn_path,
   LK_ENTRY  *group_base;
   int       group_count;
   int       MailDisabled = 0;
+  char      search_filter[1024];
 
   if(UseGroupUniversal)
     groupTypeControl = ADS_GROUP_TYPE_UNIVERSAL_GROUP;
@@ -2447,12 +2448,13 @@ int group_rename(LDAP *ldap_handle, char *dn_path,
 	  group_count = 0;
 	  group_base = NULL;
 	  
-	  sprintf(filter, "(&(objectClass=user)(cn=%s))", after_group_name);
+	  sprintf(search_filter, "(&(objectClass=user)(cn=%s))", 
+		  after_group_name);
 	  attr_array[0] = "cn";
 	  attr_array[1] = NULL;
 
-	  if ((rc = linklist_build(ldap_handle, dn_path, filter, attr_array,
-				   &group_base, &group_count,
+	  if ((rc = linklist_build(ldap_handle, dn_path, search_filter, 
+				   attr_array, &group_base, &group_count,
 				   LDAP_SCOPE_SUBTREE)) != 0)
 	  {
 	    com_err(whoami, 0, "Unable to process group %s : %s",
diff --git a/incremental/winad/winad.c b/incremental/winad/winad.c
index 36aa5ca0..8da0b4df 100755
--- a/incremental/winad/winad.c
+++ b/incremental/winad/winad.c
@@ -2352,6 +2352,7 @@ int group_rename(LDAP *ldap_handle, char *dn_path,
   LK_ENTRY  *group_base;
   int       group_count;
   int       MailDisabled = 0;
+  char      search_filter[1024];
 
   if(UseGroupUniversal)
     groupTypeControl = ADS_GROUP_TYPE_UNIVERSAL_GROUP;
@@ -2380,12 +2381,13 @@ int group_rename(LDAP *ldap_handle, char *dn_path,
 	  group_count = 0;
 	  group_base = NULL;
 	  
-	  sprintf(filter, "(&(objectClass=user)(cn=%s))", after_group_name);
+	  sprintf(search_filter, "(&(objectClass=user)(cn=%s))", 
+		  after_group_name);
 	  attr_array[0] = "cn";
 	  attr_array[1] = NULL;
 
-	  if ((rc = linklist_build(ldap_handle, dn_path, filter, attr_array,
-				   &group_base, &group_count,
+	  if ((rc = linklist_build(ldap_handle, dn_path, search_filter, 
+				   attr_array, &group_base, &group_count,
 				   LDAP_SCOPE_SUBTREE)) != 0)
 	  {
 	    com_err(whoami, 0, "Unable to process group %s : %s",
@@ -5734,6 +5736,7 @@ int ad_get_group(LDAP *ldap_handle, char *dn_path,
   (*linklist_base) = NULL;
   (*linklist_count) = 0;
   sprintf(filter, "(sAMAccountName=%s%s)", group_name, group_suffix);
+  com_err(whoami, 0, "AD_GET_GROUP: samname is %s%s", group_name, group_suffix);
   attr_array[0] = attribute;
   attr_array[1] = NULL;