|
|
@@ -1,30 +1,6 @@
|
|
|
-Index: src/configfile.h
|
|
|
---- src/configfile.h.orig 2003-11-03 22:34:52 +0100
|
|
|
-+++ src/configfile.h 2006-01-30 20:02:32 +0100
|
|
|
-@@ -31,6 +31,7 @@
|
|
|
- #include <glib.h>
|
|
|
-
|
|
|
- #include "common.h"
|
|
|
-+#include "util.h"
|
|
|
-
|
|
|
- #define CURRENT_CONFIG_VERSION 3
|
|
|
-
|
|
|
-@@ -220,9 +221,9 @@
|
|
|
- extern struct gq_config *config;
|
|
|
- extern GList *transient_servers;
|
|
|
-
|
|
|
--extern const struct tokenlist token_bindtype[];
|
|
|
--extern const struct tokenlist token_ldifformat[];
|
|
|
--extern const struct tokenlist token_searchargument[];
|
|
|
-+extern const struct tokenlist token_bindtype[4];
|
|
|
-+extern const struct tokenlist token_ldifformat[3];
|
|
|
-+extern const struct tokenlist token_searchargument[5];
|
|
|
-
|
|
|
- #endif
|
|
|
-
|
|
|
Index: src/state.c
|
|
|
---- src/state.c.orig 2003-11-03 22:19:54 +0100
|
|
|
-+++ src/state.c 2006-01-30 20:00:09 +0100
|
|
|
+--- src/state.c.orig 2006-04-05 02:53:55 +0200
|
|
|
++++ src/state.c 2006-04-05 19:14:43 +0200
|
|
|
@@ -754,7 +754,7 @@
|
|
|
}
|
|
|
}
|
|
|
@@ -34,30 +10,9 @@ Index: src/state.c
|
|
|
char *ep;
|
|
|
|
|
|
assert(v);
|
|
|
-Index: src/util.c
|
|
|
---- src/util.c.orig 2003-11-03 23:28:24 +0100
|
|
|
-+++ src/util.c 2006-01-30 20:00:09 +0100
|
|
|
-@@ -1909,7 +1909,7 @@
|
|
|
- char **gq_ldap_explode_dn(const char *dn, int dummy)
|
|
|
- {
|
|
|
- int i, rc;
|
|
|
-- LDAPDN *parts;
|
|
|
-+ LDAPDN parts;
|
|
|
- char **v = 0;
|
|
|
-
|
|
|
- rc = ldap_str2dn(dn, &parts, LDAP_DN_FORMAT_LDAPV3);
|
|
|
-@@ -1921,7 +1921,7 @@
|
|
|
- v = (char **) calloc((i + 2), sizeof(char*));
|
|
|
-
|
|
|
- for( i = 0 ; parts[i] ; i++ ) {
|
|
|
-- ldap_rdn2str(parts[0][i], &v[i],
|
|
|
-+ ldap_rdn2str(parts[i], &v[i],
|
|
|
- LDAP_DN_FORMAT_LDAPV3 | LDAP_DN_PRETTY );
|
|
|
- }
|
|
|
- return v;
|
|
|
Index: src/xmlparse.c
|
|
|
---- src/xmlparse.c.orig 2003-11-03 22:05:18 +0100
|
|
|
-+++ src/xmlparse.c 2006-01-30 20:00:09 +0100
|
|
|
+--- src/xmlparse.c.orig 2006-04-05 02:49:19 +0200
|
|
|
++++ src/xmlparse.c 2006-04-05 19:23:16 +0200
|
|
|
@@ -51,7 +51,7 @@
|
|
|
#include "xmlparse.h"
|
|
|
|
|
|
@@ -74,9 +29,9 @@ Index: src/xmlparse.c
|
|
|
- e->attrs = calloc(i, sizeof(xmlChar *));
|
|
|
+ e->attrs = calloc(i+1, sizeof(xmlChar *));
|
|
|
for (i = 0 ; attrs[i] ; i++) {
|
|
|
- e->attrs[i] = strdup(attrs[i]);
|
|
|
+ e->attrs[i] = (guchar*)strdup((gchar*)attrs[i]);
|
|
|
}
|
|
|
-+ e->attrs[i] = NULL;
|
|
|
++ e->attrs[i] = NULL;
|
|
|
}
|
|
|
|
|
|
/* lookup handler */
|
