Fix the non-LDAP, non-krb5 build, fix gcc -O3 warnings.

Jeremy.
(This used to be commit 9e2ab30d3cf6950fc79152b2169e7aeae8d6a366)

diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 998a81b61ad47cf3b72a2bfd27faa490bd1c84ad..a7fce4692358655e83ff51a52c4dfd9b1e5848c3 100644 (file)
--- a/source3/auth/auth_util.c
+++ b/source3/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/source3/include/smbldap.h b/source3/include/smbldap.h
index 79e0a38b0e85b7e62d59f634b80712c864964b81..a2cb8c5eea4ac0f58f2d87ea3acb0e0181b571f9 100644 (file)
--- a/source3/include/smbldap.h
+++ b/source3/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/source3/libnet/libnet_samsync_keytab.c b/source3/libnet/libnet_samsync_keytab.c
index d10bfd5e9d6617432184d6943ed65176c9549c6e..bfb3a58ce2a5afdc16f4a5f7ba13ace739449d6b 100644 (file)
--- a/source3/libnet/libnet_samsync_keytab.c
+++ b/source3/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/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index da81417220d9c44da9a13023c559add29465f7c0..5e8bff311629fb3a297aae7c654f62f70051becd 100644 (file)
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/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;
                }