diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-06-13 06:06:29 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:18:04 -0500 |
| commit | 816f4f7c4afa1022075fb36563fadf4820f37afd (patch) | |
| tree | 400e7a462e46a9ca5b6994920cbbea70ad75505a /source4/cldap_server | |
| parent | 490a5a5d595c021771fb6965829a3821d6dddb6a (diff) | |
| download | samba-816f4f7c4afa1022075fb36563fadf4820f37afd.tar.gz samba-816f4f7c4afa1022075fb36563fadf4820f37afd.tar.bz2 samba-816f4f7c4afa1022075fb36563fadf4820f37afd.zip | |
r7519: rip the copy of the ldap expression parser out of libcli/ldap/ and use
the original one in lib/ldb/ instead. Having two copies of this code
is silly.
(This used to be commit 0e9f18c44858b692c724c004f362de9e3dc15db5)
Diffstat (limited to 'source4/cldap_server')
| -rw-r--r-- | source4/cldap_server/netlogon.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/cldap_server/netlogon.c b/source4/cldap_server/netlogon.c index 9e7ddc6989..f4f1c226af 100644 --- a/source4/cldap_server/netlogon.c +++ b/source4/cldap_server/netlogon.c @@ -181,7 +181,7 @@ void cldapd_netlogon_request(struct cldap_socket *cldap, const char *src_address, int src_port) { struct cldapd_server *cldapd = talloc_get_type(cldap->incoming.private, struct cldapd_server); - struct ldap_parse_tree *tree; + struct ldb_parse_tree *tree; int i; const char *domain = NULL; const char *host = NULL; @@ -197,15 +197,15 @@ void cldapd_netlogon_request(struct cldap_socket *cldap, DEBUG(5,("cldap filter='%s'\n", filter)); - tree = ldap_parse_filter_string(tmp_ctx, filter); + tree = ldb_parse_tree(tmp_ctx, filter); if (tree == NULL) goto failed; - if (tree->operation != LDAP_OP_AND) goto failed; + if (tree->operation != LDB_OP_AND) goto failed; /* extract the query elements */ for (i=0;i<tree->u.list.num_elements;i++) { - struct ldap_parse_tree *t = tree->u.list.elements[i]; - if (t->operation != LDAP_OP_SIMPLE) goto failed; + struct ldb_parse_tree *t = tree->u.list.elements[i]; + if (t->operation != LDB_OP_SIMPLE) goto failed; if (strcasecmp(t->u.simple.attr, "DnsDomain") == 0) { domain = talloc_strndup(tmp_ctx, t->u.simple.value.data, |