r26639: librpc: Pass iconv convenience on from RPC connection to NDR library, so...

[bbaumbach/samba-autobuild/.git] / source4 / libcli / cldap / cldap.h

diff --git a/source4/libcli/cldap/cldap.h b/source4/libcli/cldap/cldap.h
index 928cf1f3e4efd39b78e69bcdb1f328777c6c67dd..8aa98f03312eeaf8c16a70ad22179d5eac434f86 100644 (file)
--- a/source4/libcli/cldap/cldap.h
+++ b/source4/libcli/cldap/cldap.h
@@ -7,7 +7,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "libcli/util/asn_1.h"
@@ -48,7 +47,7 @@ struct cldap_request {
        int timeout;
        int num_retries;
 
-       BOOL is_reply;
+       bool is_reply;
 
        /* the ldap message_id */
        int message_id;
@@ -59,7 +58,7 @@ struct cldap_request {
        DATA_BLOB encoded;
 
        /* the reply data */
-       struct asn1_data asn1;
+       struct asn1_data *asn1;
 
        /* information on what to do on completion */
        struct {
@@ -99,6 +98,7 @@ struct cldap_socket {
 struct cldap_search {
        struct {
                const char *dest_address;
+               uint16_t dest_port;
                const char *filter;
                const char **attributes;
                int timeout;
@@ -151,6 +151,7 @@ NTSTATUS cldap_error_reply(struct cldap_socket *cldap,
 struct cldap_netlogon {
        struct {
                const char *dest_address;
+               uint16_t dest_port;
                const char *realm;
                const char *host;
                const char *user;