Update of /cvsroot/gqclient/gq/src
In directory sc8-pr-cvs1:/tmp/cvs-serv15807
Modified Files:
input.c ldapops.c
Log Message:
* Referral support fixes
Index: input.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/input.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** input.c 23 Oct 2003 05:53:24 -0000 1.75
--- input.c 24 Oct 2003 19:15:34 -0000 1.76
***************
*** 760,765 ****
gtk_table_attach(GTK_TABLE(iform->table), ff->event_box,
0, 1, row, row + 1,
! /* GTK_FILL| */ GTK_FILL|GTK_EXPAND,
! GTK_FILL|GTK_EXPAND,
0, 0);
--- 760,765 ----
gtk_table_attach(GTK_TABLE(iform->table), ff->event_box,
0, 1, row, row + 1,
! /* GTK_FILL| */ GTK_FILL,
! GTK_FILL,
0, 0);
***************
*** 1501,1504 ****
--- 1501,1516 ----
LDAPMessage *res = NULL;
+ #if defined(HAVE_LDAP_RENAME)
+ LDAPControl cc, *ctrls[2] = { NULL, NULL } ;
+
+ /* prepare ManageDSAit in case we deal with referrals */
+ cc.ldctl_oid = LDAP_CONTROL_MANAGEDSAIT;
+ cc.ldctl_value.bv_val = NULL;
+ cc.ldctl_value.bv_len = 0;
+ cc.ldctl_iscritical = 1;
+
+ ctrls[0] = &cc;
+ #endif
+
server = iform->server;
if( (ld = open_connection(server)) == NULL)
***************
*** 1566,1570 ****
#if defined(HAVE_LDAP_RENAME)
! rc = ldap_rename_s(ld, olddn, rdn[0], NULL, remove_flag, NULL, NULL);
#else
rc = ldap_modrdn2_s(ld, olddn, rdn[0], remove_flag);
--- 1578,1591 ----
#if defined(HAVE_LDAP_RENAME)
! /* see draft-ietf-ldapext-ldap-c-api-xx.txt for details */
! rc = ldap_rename_s(ld,
! olddn, /* dn */
! rdn[0], /* newrdn */
! NULL, /* newparent */
! remove_flag, /* deleteoldrdn */
! ctrls, /* serverctrls */
! NULL /* clientctrls */
! );
!
#else
rc = ldap_modrdn2_s(ld, olddn, rdn[0], remove_flag);
***************
*** 2033,2037 ****
the next LDAP object to be shown in this browser */
iform->hide_status = hidden;
-
}
--- 2054,2057 ----
Index: ldapops.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/ldapops.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ldapops.c 23 Oct 2003 05:46:23 -0000 1.19
--- ldapops.c 24 Oct 2003 19:15:35 -0000 1.20
***************
*** 185,190 ****
if (sld == tld && (flags & MOVE_DELETE_MOVED) &&
source_server->version == LDAP_VERSION3) {
! rc = ldap_rename_s(sld, source_dn, sdn[0], target_dn, 1,
! NULL, NULL);
if (rc == LDAP_SUCCESS) {
--- 185,206 ----
if (sld == tld && (flags & MOVE_DELETE_MOVED) &&
source_server->version == LDAP_VERSION3) {
! LDAPControl cc, *ctrls[2] = { NULL, NULL } ;
!
! /* prepare ManageDSAit in case we deal with referrals */
! cc.ldctl_oid = LDAP_CONTROL_MANAGEDSAIT;
! cc.ldctl_value.bv_val = NULL;
! cc.ldctl_value.bv_len = 0;
! cc.ldctl_iscritical = 1;
!
! ctrls[0] = &cc;
!
! rc = ldap_rename_s(sld,
! source_dn, /* dn */
! sdn[0], /* newrdn */
! target_dn, /* newparent */
! 1, /* deleteoldrdn */
! ctrls, /* serverctrls */
! NULL /* clientctrls */
! );
if (rc == LDAP_SUCCESS) {
|
