diff options
| author | Volker Lendecke <vlendec@samba.org> | 2006-08-20 17:55:06 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:38:44 -0500 |
| commit | f852fdbe06ec9f19424d6870cba9b1872a0d5d7a (patch) | |
| tree | 8c222bbb5d9f076da71458ba1d43b2b33ce474a6 /source3/auth | |
| parent | f8825406fb43b514f9fb031a1ff5ec9280c67ada (diff) | |
| download | samba-f852fdbe06ec9f19424d6870cba9b1872a0d5d7a.tar.gz samba-f852fdbe06ec9f19424d6870cba9b1872a0d5d7a.tar.bz2 samba-f852fdbe06ec9f19424d6870cba9b1872a0d5d7a.zip | |
r17626: Some C++ Warnings
(This used to be commit 09e7c010f03ac3c621f7a7fad44685d278c1481a)
Diffstat (limited to 'source3/auth')
| -rw-r--r-- | source3/auth/auth_ntlmssp.c | 12 | ||||
| -rw-r--r-- | source3/auth/auth_winbind.c | 5 |
2 files changed, 11 insertions, 6 deletions
diff --git a/source3/auth/auth_ntlmssp.c b/source3/auth/auth_ntlmssp.c index 6cf987a48b..51b145a760 100644 --- a/source3/auth/auth_ntlmssp.c +++ b/source3/auth/auth_ntlmssp.c @@ -30,7 +30,8 @@ static const uint8 *auth_ntlmssp_get_challenge(const struct ntlmssp_state *ntlmssp_state) { - AUTH_NTLMSSP_STATE *auth_ntlmssp_state = ntlmssp_state->auth_context; + AUTH_NTLMSSP_STATE *auth_ntlmssp_state = + (AUTH_NTLMSSP_STATE *)ntlmssp_state->auth_context; return auth_ntlmssp_state->auth_context->get_ntlm_challenge(auth_ntlmssp_state->auth_context); } @@ -41,7 +42,8 @@ static const uint8 *auth_ntlmssp_get_challenge(const struct ntlmssp_state *ntlms */ static BOOL auth_ntlmssp_may_set_challenge(const struct ntlmssp_state *ntlmssp_state) { - AUTH_NTLMSSP_STATE *auth_ntlmssp_state = ntlmssp_state->auth_context; + AUTH_NTLMSSP_STATE *auth_ntlmssp_state = + (AUTH_NTLMSSP_STATE *)ntlmssp_state->auth_context; struct auth_context *auth_context = auth_ntlmssp_state->auth_context; return auth_context->challenge_may_be_modified; @@ -53,7 +55,8 @@ static BOOL auth_ntlmssp_may_set_challenge(const struct ntlmssp_state *ntlmssp_s */ static NTSTATUS auth_ntlmssp_set_challenge(struct ntlmssp_state *ntlmssp_state, DATA_BLOB *challenge) { - AUTH_NTLMSSP_STATE *auth_ntlmssp_state = ntlmssp_state->auth_context; + AUTH_NTLMSSP_STATE *auth_ntlmssp_state = + (AUTH_NTLMSSP_STATE *)ntlmssp_state->auth_context; struct auth_context *auth_context = auth_ntlmssp_state->auth_context; SMB_ASSERT(challenge->length == 8); @@ -77,7 +80,8 @@ static NTSTATUS auth_ntlmssp_set_challenge(struct ntlmssp_state *ntlmssp_state, static NTSTATUS auth_ntlmssp_check_password(struct ntlmssp_state *ntlmssp_state, DATA_BLOB *user_session_key, DATA_BLOB *lm_session_key) { - AUTH_NTLMSSP_STATE *auth_ntlmssp_state = ntlmssp_state->auth_context; + AUTH_NTLMSSP_STATE *auth_ntlmssp_state = + (AUTH_NTLMSSP_STATE *)ntlmssp_state->auth_context; auth_usersupplied_info *user_info = NULL; NTSTATUS nt_status; BOOL username_was_mapped; diff --git a/source3/auth/auth_winbind.c b/source3/auth/auth_winbind.c index d8ac348d04..835e0b4b25 100644 --- a/source3/auth/auth_winbind.c +++ b/source3/auth/auth_winbind.c @@ -32,7 +32,7 @@ static NTSTATUS get_info3_from_ndr(TALLOC_CTX *mem_ctx, struct winbindd_response size_t len = response->length - sizeof(struct winbindd_response); prs_struct ps; if (len > 0) { - info3_ndr = response->extra_data.data; + info3_ndr = (uint8 *)response->extra_data.data; if (!prs_init(&ps, len, mem_ctx, UNMARSHALL)) { return NT_STATUS_NO_MEMORY; } @@ -112,7 +112,8 @@ static NTSTATUS check_winbind_security(const struct auth_context *auth_context, unbecome_root(); if ( result == NSS_STATUS_UNAVAIL ) { - struct auth_methods *auth_method = my_private_data; + struct auth_methods *auth_method = + (struct auth_methods *)my_private_data; if ( auth_method ) return auth_method->auth(auth_context, auth_method->private_data, |