diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-02-10 05:09:35 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:09:38 -0500 |
| commit | e82aad1ce39a6b7a2e51b9e2cb494d74ec70e158 (patch) | |
| tree | b66f04c223e55e435b6ba56f4f05d2bf03132a12 /source4/libcli/ldap | |
| parent | e3aae721a7d5c8130448d67feb3a9200e14393ac (diff) | |
| download | samba-e82aad1ce39a6b7a2e51b9e2cb494d74ec70e158.tar.gz samba-e82aad1ce39a6b7a2e51b9e2cb494d74ec70e158.tar.bz2 samba-e82aad1ce39a6b7a2e51b9e2cb494d74ec70e158.zip | |
r5298: - got rid of pstring.h from includes.h. This at least makes it a bit
less likely that anyone will use pstring for new code
- got rid of winbind_client.h from includes.h. This one triggered a
huge change, as winbind_client.h was including system/filesys.h and
defining the old uint32 and uint16 types, as well as its own
pstring and fstring.
(This used to be commit 9db6c79e902ec538108d6b7d3324039aabe1704f)
Diffstat (limited to 'source4/libcli/ldap')
| -rw-r--r-- | source4/libcli/ldap/ldap.c | 5 | ||||
| -rw-r--r-- | source4/libcli/ldap/ldap_client.c | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source4/libcli/ldap/ldap.c b/source4/libcli/ldap/ldap.c index 655838b64f..545759c494 100644 --- a/source4/libcli/ldap/ldap.c +++ b/source4/libcli/ldap/ldap.c @@ -25,6 +25,7 @@ #include "includes.h" #include "system/iconv.h" +#include "system/filesys.h" #include "asn_1.h" /**************************************************************************** @@ -697,7 +698,7 @@ static void ldap_decode_response(TALLOC_CTX *mem_ctx, static BOOL ldap_decode_filter(TALLOC_CTX *mem_ctx, struct asn1_data *data, char **filter) { - uint8 filter_tag, tag_desc; + uint8_t filter_tag, tag_desc; if (!asn1_peek_uint8(data, &filter_tag)) return False; @@ -836,7 +837,7 @@ static void ldap_decode_attribs(TALLOC_CTX *mem_ctx, struct asn1_data *data, BOOL ldap_decode(struct asn1_data *data, struct ldap_message *msg) { - uint8 tag; + uint8_t tag; asn1_start_tag(data, ASN1_SEQUENCE(0)); asn1_read_Integer(data, &msg->messageid); diff --git a/source4/libcli/ldap/ldap_client.c b/source4/libcli/ldap/ldap_client.c index 73099ec1be..ddf0932fa1 100644 --- a/source4/libcli/ldap/ldap_client.c +++ b/source4/libcli/ldap/ldap_client.c @@ -25,6 +25,7 @@ #include "includes.h" #include "system/network.h" +#include "system/filesys.h" #include "auth/auth.h" #include "asn_1.h" #include "dlinklist.h" |