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/libnet | |
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/libnet')
-rw-r--r-- | source4/libnet/libnet_join.c | 4 | ||||
-rw-r--r-- | source4/libnet/libnet_join.h | 2 | ||||
-rw-r--r-- | source4/libnet/libnet_rpc.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c index bf8524c495..42c041aa83 100644 --- a/source4/libnet/libnet_join.c +++ b/source4/libnet/libnet_join.c @@ -64,8 +64,8 @@ static NTSTATUS libnet_JoinDomain_samr(struct libnet_context *ctx, struct samr_GetUserPwInfo pwp; struct samr_String samr_account_name; - uint32 acct_flags; - uint32 rid, access_granted; + uint32_t acct_flags; + uint32_t rid, access_granted; int policy_min_pw_len = 0; /* prepare connect to the SAMR pipe of users domain PDC */ diff --git a/source4/libnet/libnet_join.h b/source4/libnet/libnet_join.h index 830599929b..8614d59a77 100644 --- a/source4/libnet/libnet_join.h +++ b/source4/libnet/libnet_join.h @@ -34,7 +34,7 @@ union libnet_JoinDomain { struct _libnet_JoinDomain_in { const char *domain_name; const char *account_name; - uint32 acct_type; + uint32_t acct_type; } in; struct _libnet_JoinDomain_out { diff --git a/source4/libnet/libnet_rpc.h b/source4/libnet/libnet_rpc.h index 6b1eefd592..f241aea19a 100644 --- a/source4/libnet/libnet_rpc.h +++ b/source4/libnet/libnet_rpc.h @@ -53,7 +53,7 @@ union libnet_rpc_connect { const char *server_name; const char *dcerpc_iface_name; const char *dcerpc_iface_uuid; - uint32 dcerpc_iface_version; + uint32_t dcerpc_iface_version; } in; struct _libnet_rpc_connect_out { @@ -70,7 +70,7 @@ union libnet_rpc_connect { const char *domain_name; const char *dcerpc_iface_name; const char *dcerpc_iface_uuid; - uint32 dcerpc_iface_version; + uint32_t dcerpc_iface_version; } in; struct _libnet_rpc_connect_out out; |