From 9e2ab30d3cf6950fc79152b2169e7aeae8d6a366 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 26 Jun 2008 19:46:18 -0700 Subject: [PATCH] Fix the non-LDAP, non-krb5 build, fix gcc -O3 warnings. Jeremy. --- source/auth/auth_util.c | 2 +- source/include/smbldap.h | 7 +++++++ source/libnet/libnet_samsync_keytab.c | 2 +- source/rpc_client/cli_pipe.c | 4 ++-- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/source/auth/auth_util.c b/source/auth/auth_util.c index 998a81b61ad..a7fce469235 100644 --- a/source/auth/auth_util.c +++ b/source/auth/auth_util.c @@ -583,7 +583,7 @@ NTSTATUS make_server_info_sam(auth_serversupplied_info **server_info, * a PDC. JRA. */ - winbind_off(); + (void)winbind_off(); DEBUG(10, ("make_server_info_sam: our machine account %s " "setting supplementary group list empty and " diff --git a/source/include/smbldap.h b/source/include/smbldap.h index 79e0a38b0e8..a2cb8c5eea4 100644 --- a/source/include/smbldap.h +++ b/source/include/smbldap.h @@ -218,6 +218,13 @@ const char *smbldap_talloc_dn(TALLOC_CTX *mem_ctx, LDAP *ld, LDAPMessage *entry); +#else +#define LDAP void +#define LDAPMod void +#define LDAP_CONST const +#define LDAPControl void +struct berval; +struct ldapsam_privates; #endif /* HAVE_LDAP */ #define LDAP_DEFAULT_TIMEOUT 15 diff --git a/source/libnet/libnet_samsync_keytab.c b/source/libnet/libnet_samsync_keytab.c index d10bfd5e9d6..bfb3a58ce2a 100644 --- a/source/libnet/libnet_samsync_keytab.c +++ b/source/libnet/libnet_samsync_keytab.c @@ -179,7 +179,7 @@ NTSTATUS fetch_sam_entries_keytab(TALLOC_CTX *mem_ctx, NTSTATUS fetch_sam_entries_keytab(TALLOC_CTX *mem_ctx, enum netr_SamDatabaseID database_id, struct netr_DELTA_ENUM_ARRAY *r, - NTSTATUS result, + bool last_query, struct samsync_context *ctx) { return NT_STATUS_NOT_SUPPORTED; diff --git a/source/rpc_client/cli_pipe.c b/source/rpc_client/cli_pipe.c index da81417220d..5e8bff31162 100644 --- a/source/rpc_client/cli_pipe.c +++ b/source/rpc_client/cli_pipe.c @@ -507,8 +507,8 @@ static NTSTATUS cli_pipe_validate_rpc_response(struct rpc_pipe_client *cli, RPC_ return NT_STATUS_INVALID_PARAMETER; } - if (prhdr->auth_len + RPC_HDR_AUTH_LEN < prhdr->auth_len || - prhdr->auth_len + RPC_HDR_AUTH_LEN < RPC_HDR_AUTH_LEN) { + if (prhdr->auth_len + (unsigned int)RPC_HDR_AUTH_LEN < prhdr->auth_len || + prhdr->auth_len + (unsigned int)RPC_HDR_AUTH_LEN < (unsigned int)RPC_HDR_AUTH_LEN) { /* Integer wrap attempt. */ return NT_STATUS_INVALID_PARAMETER; }