[SCM] Samba Shared Repository - branch v3-3-test updated -
release-3-2-0pre2-3032-g9e2ab30
Jeremy Allison
jra at samba.org
Fri Jun 27 02:47:21 GMT 2008
The branch, v3-3-test has been updated
via 9e2ab30d3cf6950fc79152b2169e7aeae8d6a366 (commit)
from 22bdee7fe0cdcd95e0bade70cacb095e0b348abf (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit 9e2ab30d3cf6950fc79152b2169e7aeae8d6a366
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jun 26 19:46:18 2008 -0700
Fix the non-LDAP, non-krb5 build, fix gcc -O3 warnings.
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
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(-)
Changeset truncated at 500 lines:
diff --git a/source/auth/auth_util.c b/source/auth/auth_util.c
index 998a81b..a7fce46 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 79e0a38..a2cb8c5 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 d10bfd5..bfb3a58 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 da81417..5e8bff3 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;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list