diff options
| -rw-r--r-- | source4/gtk/tools/gwcrontab.c | 2 | ||||
| -rw-r--r-- | source4/lib/tdb/tools/tdbtest.c | 1 | ||||
| -rw-r--r-- | source4/libcli/auth/gensec_gssapi.c | 2 | ||||
| -rw-r--r-- | source4/libcli/auth/gensec_krb5.c | 6 | ||||
| -rw-r--r-- | source4/libcli/auth/kerberos.c | 1 | ||||
| -rw-r--r-- | source4/libcli/auth/kerberos_verify.c | 1 | ||||
| -rw-r--r-- | source4/rpc_server/remote/dcesrv_remote.c | 2 | ||||
| -rw-r--r-- | source4/utils/ntlm_auth.c | 2 |
8 files changed, 10 insertions, 7 deletions
diff --git a/source4/gtk/tools/gwcrontab.c b/source4/gtk/tools/gwcrontab.c index 063469e334..580bbc2ae3 100644 --- a/source4/gtk/tools/gwcrontab.c +++ b/source4/gtk/tools/gwcrontab.c @@ -41,7 +41,7 @@ void update_joblist(void) struct atsvc_JobEnum r; struct atsvc_enum_ctr ctr; int i; - uint32 resume_handle = 0; + uint32_t resume_handle = 0; gtk_list_store_clear(store_jobs); diff --git a/source4/lib/tdb/tools/tdbtest.c b/source4/lib/tdb/tools/tdbtest.c index 0a2185d6b8..e55d08f840 100644 --- a/source4/lib/tdb/tools/tdbtest.c +++ b/source4/lib/tdb/tools/tdbtest.c @@ -16,6 +16,7 @@ #else #include "includes.h" +#include "system/filesys.h" #include "lib/tdb/include/tdb.h" #endif diff --git a/source4/libcli/auth/gensec_gssapi.c b/source4/libcli/auth/gensec_gssapi.c index 43113412f7..41f36b2703 100644 --- a/source4/libcli/auth/gensec_gssapi.c +++ b/source4/libcli/auth/gensec_gssapi.c @@ -316,7 +316,7 @@ static NTSTATUS gensec_gssapi_unwrap(struct gensec_security *gensec_security, } static BOOL gensec_gssapi_have_feature(struct gensec_security *gensec_security, - uint32 feature) + uint32_t feature) { struct gensec_gssapi_state *gensec_gssapi_state = gensec_security->private_data; if (feature & GENSEC_FEATURE_SIGN) { diff --git a/source4/libcli/auth/gensec_krb5.c b/source4/libcli/auth/gensec_krb5.c index e5bfd3865a..a0c2a77f4b 100644 --- a/source4/libcli/auth/gensec_krb5.c +++ b/source4/libcli/auth/gensec_krb5.c @@ -489,7 +489,7 @@ static NTSTATUS gensec_krb5_update(struct gensec_security *gensec_security, { krb5_data inbuf; krb5_ap_rep_enc_part *repl = NULL; - uint8 tok_id[2]; + uint8_t tok_id[2]; DATA_BLOB unwrapped_in; if (!gensec_gssapi_parse_krb5_wrap(out_mem_ctx, &in, &unwrapped_in, tok_id)) { @@ -525,7 +525,7 @@ static NTSTATUS gensec_krb5_update(struct gensec_security *gensec_security, char *principal; DATA_BLOB unwrapped_in; DATA_BLOB unwrapped_out = data_blob(NULL, 0); - uint8 tok_id[2]; + uint8_t tok_id[2]; if (!in.data) { *out = unwrapped_out; @@ -689,7 +689,7 @@ static NTSTATUS gensec_krb5_session_info(struct gensec_security *gensec_security } static BOOL gensec_krb5_have_feature(struct gensec_security *gensec_security, - uint32 feature) + uint32_t feature) { if (feature & GENSEC_FEATURE_SESSION_KEY) { return True; diff --git a/source4/libcli/auth/kerberos.c b/source4/libcli/auth/kerberos.c index a8d9d75a1e..4bf9e626ce 100644 --- a/source4/libcli/auth/kerberos.c +++ b/source4/libcli/auth/kerberos.c @@ -26,6 +26,7 @@ #include "libcli/auth/kerberos.h" #include "system/time.h" #include "secrets.h" +#include "pstring.h" #ifdef HAVE_KRB5 diff --git a/source4/libcli/auth/kerberos_verify.c b/source4/libcli/auth/kerberos_verify.c index b089d633ed..2aef38fcd9 100644 --- a/source4/libcli/auth/kerberos_verify.c +++ b/source4/libcli/auth/kerberos_verify.c @@ -28,6 +28,7 @@ #include "asn_1.h" #include "lib/ldb/include/ldb.h" #include "secrets.h" +#include "pstring.h" #ifdef HAVE_KRB5 diff --git a/source4/rpc_server/remote/dcesrv_remote.c b/source4/rpc_server/remote/dcesrv_remote.c index fc8c8a6706..ee526e1978 100644 --- a/source4/rpc_server/remote/dcesrv_remote.c +++ b/source4/rpc_server/remote/dcesrv_remote.c @@ -164,7 +164,7 @@ static NTSTATUS remote_register_one_iface(struct dcesrv_context *dce_ctx, const static NTSTATUS remote_op_init_server(struct dcesrv_context *dce_ctx, const struct dcesrv_endpoint_server *ep_server) { int i; - char **ifaces = str_list_make(dce_ctx, lp_parm_string(-1,"dcerpc_remote","interfaces"),NULL); + const char **ifaces = str_list_make(dce_ctx, lp_parm_string(-1,"dcerpc_remote","interfaces"),NULL); if (!ifaces) { DEBUG(3,("remote_op_init_server: no interfaces configured\n")); diff --git a/source4/utils/ntlm_auth.c b/source4/utils/ntlm_auth.c index 3c46b0ca70..b527504046 100644 --- a/source4/utils/ntlm_auth.c +++ b/source4/utils/ntlm_auth.c @@ -24,8 +24,8 @@ #include "includes.h" #include "dynconfig.h" -#include "system/passwd.h" #include "system/filesys.h" +#include "system/passwd.h" #include "lib/cmdline/popt_common.h" #include "auth/auth.h" #include "libcli/security/security.h" |