[gq-commit] gq/src ldapops.c,1.13,1.14 browse-dnd.c,1.6,1.7

[<sta...@us...>]

Update of /cvsroot/gqclient/gq/src
In directory usw-pr-cvs1:/tmp/cvs-serv17962

Modified Files:
	ldapops.c browse-dnd.c 
Log Message:
* Some optimizations wrt what attributes get requested with some 
  LDAP search operations


Index: ldapops.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/ldapops.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ldapops.c	27 Jun 2002 08:16:24 -0000	1.13
--- ldapops.c	13 Jul 2002 07:06:32 -0000	1.14
***************
*** 135,138 ****
--- 135,139 ----
       gboolean ok = TRUE;
       char message[MAX_DN_LEN + 256];
+      char *dn_only[] = { "dn", NULL };
  
       sdn =  gq_ldap_explode_dn(source_dn, 0);
***************
*** 192,195 ****
--- 193,197 ----
  	  struct berval **bervals = ldap_get_values_len(sld, e, a);
  	  
+ #warning "FIXME: deal with ref when moving entries"
  	  mods[i] = calloc(sizeof(LDAPMod), 1);
  	  mods[i]->mod_op = LDAP_MOD_ADD | LDAP_MOD_BVALUES;
***************
*** 239,243 ****
  		    
  		    rc = ldap_search_s(sld, source_dn, LDAP_SCOPE_ONELEVEL,
! 				       "objectClass=*", NULL, 0,
  				       &res);
  		    if (rc == LDAP_SUCCESS) {
--- 241,245 ----
  		    
  		    rc = ldap_search_s(sld, source_dn, LDAP_SCOPE_ONELEVEL,
! 				       "objectClass=*", dn_only, 0,
  				       &res);
  		    if (rc == LDAP_SUCCESS) {

Index: browse-dnd.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/browse-dnd.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** browse-dnd.c	18 Jun 2002 22:07:14 -0000	1.6
--- browse-dnd.c	13 Jul 2002 07:06:32 -0000	1.7
***************
*** 829,832 ****
--- 829,833 ----
       GString *out = NULL;
       gboolean ok = FALSE;
+      char *attrs[] = { "*", "+", NULL };
  
  #ifdef DEBUG_DND
***************
*** 840,844 ****
       rc = ldap_search_s(ld, dn, 
  			g_hash_table_lookup(selhash, "recursively") ? LDAP_SCOPE_SUBTREE : LDAP_SCOPE_BASE,
! 			"objectClass=*", NULL, 0, &msg);
  
       if (rc == LDAP_SERVER_DOWN) {
--- 841,845 ----
       rc = ldap_search_s(ld, dn, 
  			g_hash_table_lookup(selhash, "recursively") ? LDAP_SCOPE_SUBTREE : LDAP_SCOPE_BASE,
! 			"objectClass=*", attrs, 0, &msg);
  
       if (rc == LDAP_SERVER_DOWN) {