summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2008-06-26 19:46:18 -0700
committerJeremy Allison <jra@samba.org>2008-06-26 19:46:18 -0700
commit799252f635a4cf1790a24f9ba8765dba9fb7df86 (patch)
tree03c4ed947e066c27bb56ecec2574806e0ad8ecc0
parent46dd2d77ecad82bcc296a0023f344a40b8a9992f (diff)
downloadsamba-799252f635a4cf1790a24f9ba8765dba9fb7df86.tar.gz
samba-799252f635a4cf1790a24f9ba8765dba9fb7df86.tar.bz2
samba-799252f635a4cf1790a24f9ba8765dba9fb7df86.zip
Fix the non-LDAP, non-krb5 build, fix gcc -O3 warnings.
Jeremy. (This used to be commit 9e2ab30d3cf6950fc79152b2169e7aeae8d6a366)
-rw-r--r--source3/auth/auth_util.c2
-rw-r--r--source3/include/smbldap.h7
-rw-r--r--source3/libnet/libnet_samsync_keytab.c2
-rw-r--r--source3/rpc_client/cli_pipe.c4
4 files changed, 11 insertions, 4 deletions
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 998a81b61a..a7fce46923 100644
--- 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 79e0a38b0e..a2cb8c5eea 100644
--- 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 d10bfd5e9d..bfb3a58ce2 100644
--- 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 da81417220..5e8bff3116 100644
--- 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;
}