diff options
author | Andrew Tridgell <tridge@samba.org> | 2005-07-17 09:20:52 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:29:34 -0500 |
commit | e835621799647ee70630b389fb53d15b15d68355 (patch) | |
tree | 429a4ab67cf53f2853ba93f4628b63cd5aac2b02 /source4/auth | |
parent | ccc65fb995154451537879b57b900b8b4e340bd2 (diff) | |
download | samba-e835621799647ee70630b389fb53d15b15d68355.tar.gz samba-e835621799647ee70630b389fb53d15b15d68355.tar.bz2 samba-e835621799647ee70630b389fb53d15b15d68355.zip |
r8520: fixed a pile of warnings from the build farm gcc -Wall output on
S390. This is an attempt to avoid the panic we're seeing in the
automatic builds.
The main fixes are:
- assumptions that sizeof(size_t) == sizeof(int), mostly in printf formats
- use of NULL format statements to perform dn searches.
- assumption that sizeof() returns an int
(This used to be commit a58ea6b3854973b694d2b1e22323ed7eb00e3a3f)
Diffstat (limited to 'source4/auth')
-rw-r--r-- | source4/auth/auth.c | 4 | ||||
-rw-r--r-- | source4/auth/gensec/gensec_gssapi.c | 3 | ||||
-rw-r--r-- | source4/auth/gensec/gensec_krb5.c | 3 | ||||
-rw-r--r-- | source4/auth/ntlmssp/ntlmssp_server.c | 10 |
4 files changed, 12 insertions, 8 deletions
diff --git a/source4/auth/auth.c b/source4/auth/auth.c index dab1912d8e..d05aa54e50 100644 --- a/source4/auth/auth.c +++ b/source4/auth/auth.c @@ -74,7 +74,7 @@ NTSTATUS auth_get_challenge(struct auth_context *auth_ctx, const uint8_t **_chal if (challenge.length != 8) { DEBUG(0, ("auth_get_challenge: invalid challenge (length %u) by mothod [%s]\n", - challenge.length, method->ops->name)); + (unsigned)challenge.length, method->ops->name)); return NT_STATUS_INTERNAL_ERROR; } @@ -148,7 +148,7 @@ NTSTATUS auth_check_password(struct auth_context *auth_ctx, if (!NT_STATUS_IS_OK(nt_status)) { DEBUG(0, ("auth_check_password: Invalid challenge (length %u) stored for this auth context set_by %s - cannot continue: %s\n", - auth_ctx->challenge.data.length, auth_ctx->challenge.set_by, nt_errstr(nt_status))); + (unsigned)auth_ctx->challenge.data.length, auth_ctx->challenge.set_by, nt_errstr(nt_status))); return nt_status; } diff --git a/source4/auth/gensec/gensec_gssapi.c b/source4/auth/gensec/gensec_gssapi.c index e6049edc58..a080e75d5c 100644 --- a/source4/auth/gensec/gensec_gssapi.c +++ b/source4/auth/gensec/gensec_gssapi.c @@ -714,7 +714,8 @@ static NTSTATUS gensec_gssapi_session_key(struct gensec_security *gensec_securit &skey); if (maj_stat == 0) { - DEBUG(10, ("Got KRB5 session key of length %d\n", skey.length)); + DEBUG(10, ("Got KRB5 session key of length %d\n", + (int)skey.length)); gensec_gssapi_state->session_key = data_blob_talloc(gensec_gssapi_state, skey.value, skey.length); *session_key = gensec_gssapi_state->session_key; diff --git a/source4/auth/gensec/gensec_krb5.c b/source4/auth/gensec/gensec_krb5.c index a1a4886af9..76f9171713 100644 --- a/source4/auth/gensec/gensec_krb5.c +++ b/source4/auth/gensec/gensec_krb5.c @@ -407,7 +407,8 @@ static NTSTATUS gensec_krb5_session_key(struct gensec_security *gensec_security, break; } if (err == 0 && skey != NULL) { - DEBUG(10, ("Got KRB5 session key of length %d\n", KRB5_KEY_LENGTH(skey))); + DEBUG(10, ("Got KRB5 session key of length %d\n", + (int)KRB5_KEY_LENGTH(skey))); gensec_krb5_state->session_key = data_blob_talloc(gensec_krb5_state, KRB5_KEY_DATA(skey), KRB5_KEY_LENGTH(skey)); *session_key = gensec_krb5_state->session_key; diff --git a/source4/auth/ntlmssp/ntlmssp_server.c b/source4/auth/ntlmssp/ntlmssp_server.c index e50fe58305..5885db8dec 100644 --- a/source4/auth/ntlmssp/ntlmssp_server.c +++ b/source4/auth/ntlmssp/ntlmssp_server.c @@ -531,11 +531,11 @@ static NTSTATUS ntlmssp_server_postauth(struct gensec_security *gensec_security, || gensec_ntlmssp_state->encrypted_session_key.length != 16) { data_blob_free(&gensec_ntlmssp_state->encrypted_session_key); DEBUG(1, ("Client-supplied KEY_EXCH session key was of invalid length (%u)!\n", - gensec_ntlmssp_state->encrypted_session_key.length)); + (unsigned)gensec_ntlmssp_state->encrypted_session_key.length)); return NT_STATUS_INVALID_PARAMETER; } else if (!session_key.data || session_key.length != 16) { DEBUG(5, ("server session key is invalid (len == %u), cannot do KEY_EXCH!\n", - session_key.length)); + (unsigned)session_key.length)); gensec_ntlmssp_state->session_key = session_key; } else { dump_data_pw("KEY_EXCH session key (enc):\n", @@ -705,13 +705,15 @@ static NTSTATUS auth_ntlmssp_check_password(struct gensec_ntlmssp_state *gensec_ NT_STATUS_NOT_OK_RETURN(nt_status); if (gensec_ntlmssp_state->server_info->user_session_key.length) { - DEBUG(10, ("Got NT session key of length %u\n", gensec_ntlmssp_state->server_info->user_session_key.length)); + DEBUG(10, ("Got NT session key of length %u\n", + (unsigned)gensec_ntlmssp_state->server_info->user_session_key.length)); *user_session_key = data_blob_talloc(gensec_ntlmssp_state, gensec_ntlmssp_state->server_info->user_session_key.data, gensec_ntlmssp_state->server_info->user_session_key.length); } if (gensec_ntlmssp_state->server_info->lm_session_key.length) { - DEBUG(10, ("Got LM session key of length %u\n", gensec_ntlmssp_state->server_info->lm_session_key.length)); + DEBUG(10, ("Got LM session key of length %u\n", + (unsigned)gensec_ntlmssp_state->server_info->lm_session_key.length)); *lm_session_key = data_blob_talloc(gensec_ntlmssp_state, gensec_ntlmssp_state->server_info->lm_session_key.data, gensec_ntlmssp_state->server_info->lm_session_key.length); |