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/auth | |
| 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/auth')
| -rw-r--r-- | source4/libcli/auth/gensec_ntlmssp.c | 4 | ||||
| -rw-r--r-- | source4/libcli/auth/ntlmssp.c | 1 | ||||
| -rw-r--r-- | source4/libcli/auth/ntlmssp_parse.c | 1 | ||||
| -rw-r--r-- | source4/libcli/auth/smbencrypt.c | 1 | ||||
| -rw-r--r-- | source4/libcli/auth/spnego.c | 2 |
5 files changed, 6 insertions, 3 deletions
diff --git a/source4/libcli/auth/gensec_ntlmssp.c b/source4/libcli/auth/gensec_ntlmssp.c index 59bab6ced2..524815382d 100644 --- a/source4/libcli/auth/gensec_ntlmssp.c +++ b/source4/libcli/auth/gensec_ntlmssp.c @@ -29,7 +29,7 @@ struct gensec_ntlmssp_state { struct auth_context *auth_context; struct auth_serversupplied_info *server_info; struct ntlmssp_state *ntlmssp_state; - uint32 have_features; + uint32_t have_features; }; @@ -470,7 +470,7 @@ static NTSTATUS gensec_ntlmssp_session_info(struct gensec_security *gensec_secur } static BOOL gensec_ntlmssp_have_feature(struct gensec_security *gensec_security, - uint32 feature) + uint32_t feature) { struct gensec_ntlmssp_state *gensec_ntlmssp_state = gensec_security->private_data; if (gensec_ntlmssp_state->have_features & feature) { diff --git a/source4/libcli/auth/ntlmssp.c b/source4/libcli/auth/ntlmssp.c index d5ddcfbfb6..572ce66bb2 100644 --- a/source4/libcli/auth/ntlmssp.c +++ b/source4/libcli/auth/ntlmssp.c @@ -24,6 +24,7 @@ #include "includes.h" #include "auth/auth.h" #include "lib/crypto/crypto.h" +#include "pstring.h" static NTSTATUS ntlmssp_client_initial(struct ntlmssp_state *ntlmssp_state, TALLOC_CTX *out_mem_ctx, diff --git a/source4/libcli/auth/ntlmssp_parse.c b/source4/libcli/auth/ntlmssp_parse.c index 543f3d9b61..42546cb130 100644 --- a/source4/libcli/auth/ntlmssp_parse.c +++ b/source4/libcli/auth/ntlmssp_parse.c @@ -21,6 +21,7 @@ */ #include "includes.h" +#include "pstring.h" /* this is a tiny msrpc packet generator. I am only using this to diff --git a/source4/libcli/auth/smbencrypt.c b/source4/libcli/auth/smbencrypt.c index 7e2890272c..00a28a1ad9 100644 --- a/source4/libcli/auth/smbencrypt.c +++ b/source4/libcli/auth/smbencrypt.c @@ -26,6 +26,7 @@ #include "system/time.h" #include "auth/auth.h" #include "lib/crypto/crypto.h" +#include "pstring.h" /* This implements the X/Open SMB password encryption diff --git a/source4/libcli/auth/spnego.c b/source4/libcli/auth/spnego.c index a61680c9d4..3980767165 100644 --- a/source4/libcli/auth/spnego.c +++ b/source4/libcli/auth/spnego.c @@ -844,7 +844,7 @@ static NTSTATUS gensec_spnego_update(struct gensec_security *gensec_security, TA } static BOOL gensec_spnego_have_feature(struct gensec_security *gensec_security, - uint32 feature) + uint32_t feature) { struct spnego_state *spnego_state = gensec_security->private_data; if (!spnego_state->sub_sec_security) { |