[gq-commit] gq/src Makefile.am,1.34,1.35 util.c,1.91,1.92

[<he...@us...>]

Update of /cvsroot/gqclient/gq/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24185/src

Modified Files:
	Makefile.am util.c 
Log Message:
2006-04-08  Sven Herzberg  <he...@gn...>

        * src/Makefile.am: allow deprecated functions for now
        * src/util.c: fix gq_ldap_explode_dn() for both OpenLDAP 2.1 and 2.2


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gqclient/gq/src/Makefile.am,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** Makefile.am	5 Apr 2006 00:05:55 -0000	1.34
--- Makefile.am	7 Apr 2006 21:48:15 -0000	1.35
***************
*** 29,32 ****
--- 29,33 ----
  AM_CPPFLAGS=\
  	$(WARN_CFLAGS) \
+ 	-DLDAP_DEPRECATED \
  	$(NULL)
  bin_PROGRAMS = gq

Index: util.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/util.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** util.c	5 Apr 2006 00:18:04 -0000	1.91
--- util.c	7 Apr 2006 21:48:15 -0000	1.92
***************
*** 1919,1923 ****
--- 1919,1927 ----
  gq_ldap_explode_dn(gchar const* dn, int dummy) {
  	int i, rc;
+ #if LDAP_API_VERSION > 2004
+ 	LDAPDN parts;
+ #else
  	LDAPDN *parts;
+ #endif
  	GArray* array = NULL;
  	gchar **retval = NULL;
***************
*** 1932,1937 ****
  	for(i = 0; parts[i]; i++) {
  		gchar* part = NULL;
! 		ldap_rdn2str(parts[0][i], &part,
! 			LDAP_DN_FORMAT_LDAPV3 | LDAP_DN_PRETTY );
  		if(part && *part) {
  			/* don't append the last (empty) part, to be compatible
--- 1936,1946 ----
  	for(i = 0; parts[i]; i++) {
  		gchar* part = NULL;
! 		ldap_rdn2str(
! #if LDAP_API_VERSION > 2004
! 			parts[i],
! #else
! 			parts[0][i],
! #endif
! 			&part, LDAP_DN_FORMAT_LDAPV3 | LDAP_DN_PRETTY );
  		if(part && *part) {
  			/* don't append the last (empty) part, to be compatible