The branch, v3-6-test has been updated
via ca1c338 s3-net: add missing breaks in switch statement in
get_share_info().
via 699b06a s3-drsuapi: fix error handling after converting to
dcerpc_drsuapi_X functions.
via ed79d15 s3-libnetapi: add missing error check after switchting to
dcerpc_wkssvc_X functions.
via 9a534be s3-waf: finally enable large file support.
from 4fc077c s3-waf: add check for SO_PEERCRED.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit ca1c338bc6868bf57bad8156100a938948388156
Author: Günther Deschner <g...@samba.org>
Date: Wed Jan 12 13:10:28 2011 +0100
s3-net: add missing breaks in switch statement in get_share_info().
Guenther
Autobuild-User: Günther Deschner <g...@samba.org>
Autobuild-Date: Wed Jan 12 14:31:05 CET 2011 on sn-devel-104
(cherry picked from commit 9bad1507050046de553c842e2ca0112437b705c1)
commit 699b06ac81bf483c8d330482e3ef470546f141c1
Author: Günther Deschner <g...@samba.org>
Date: Wed Jan 12 13:41:16 2011 +0100
s3-drsuapi: fix error handling after converting to dcerpc_drsuapi_X
functions.
Guenther
(cherry picked from commit 1cd7f6c0e1c52ad09f3c66d89809bae859285880)
commit ed79d15ae0d18e76560e408ccb6db5b6ad37675f
Author: Günther Deschner <g...@samba.org>
Date: Wed Jan 12 13:32:10 2011 +0100
s3-libnetapi: add missing error check after switchting to dcerpc_wkssvc_X
functions.
Guenther
(cherry picked from commit 415a390ba87f2227eee5312eb3838beb9a7abc30)
commit 9a534beea904648b47c6a3b68b74390b089913c5
Author: Günther Deschner <g...@samba.org>
Date: Wed Jan 12 10:34:45 2011 +0100
s3-waf: finally enable large file support.
Guenther
Autobuild-User: Günther Deschner <g...@samba.org>
Autobuild-Date: Wed Jan 12 11:59:22 CET 2011 on sn-devel-104
(cherry picked from commit fa5fdb1a4e1033944f3fdb5584e950b7ed9ee632)
-----------------------------------------------------------------------
Summary of changes:
source3/lib/netapi/joindomain.c | 4 ++++
source3/libnet/libnet_dssync.c | 7 +++++--
source3/rpcclient/cmd_drsuapi.c | 11 ++++++++---
source3/utils/net_rpc.c | 6 ++++++
source3/wscript | 13 +++++++++++++
5 files changed, 36 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index d17d2d8..e5d2873 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -314,6 +314,10 @@ WERROR NetGetJoinInformation_r(struct libnetapi_ctx *ctx,
goto done;
}
+ if (!W_ERROR_IS_OK(werr)) {
+ goto done;
+ }
+
*r->out.name_buffer = talloc_strdup(ctx, buffer);
W_ERROR_HAVE_NO_MEMORY(*r->out.name_buffer);
diff --git a/source3/libnet/libnet_dssync.c b/source3/libnet/libnet_dssync.c
index e239162..3aed8b6 100644
--- a/source3/libnet/libnet_dssync.c
+++ b/source3/libnet/libnet_dssync.c
@@ -251,11 +251,14 @@ static NTSTATUS libnet_dssync_lookup_nc(TALLOC_CTX
*mem_ctx,
if (!NT_STATUS_IS_OK(status)) {
ctx->error_message = talloc_asprintf(ctx,
"Failed to lookup DN for domain name: %s",
- get_friendly_werror_msg(werr));
+ get_friendly_nt_error_msg(status));
return status;
}
if (!W_ERROR_IS_OK(werr)) {
+ ctx->error_message = talloc_asprintf(ctx,
+ "Failed to lookup DN for domain name: %s",
+ get_friendly_werror_msg(werr));
return werror_to_ntstatus(werr);
}
@@ -469,7 +472,7 @@ static NTSTATUS libnet_dssync_getncchanges(TALLOC_CTX
*mem_ctx,
if (!NT_STATUS_IS_OK(status)) {
ctx->error_message = talloc_asprintf(ctx,
"Failed to get NC Changes: %s",
- get_friendly_werror_msg(werr));
+ get_friendly_nt_error_msg(status));
goto out;
}
diff --git a/source3/rpcclient/cmd_drsuapi.c b/source3/rpcclient/cmd_drsuapi.c
index b7ea226..3f1ecab 100644
--- a/source3/rpcclient/cmd_drsuapi.c
+++ b/source3/rpcclient/cmd_drsuapi.c
@@ -131,7 +131,8 @@ static WERROR cmd_drsuapi_cracknames(struct rpc_pipe_client
*cli,
out:
if (is_valid_policy_hnd(&bind_handle)) {
- dcerpc_drsuapi_DsUnbind(b, mem_ctx, &bind_handle, &werr);
+ WERROR _werr;
+ dcerpc_drsuapi_DsUnbind(b, mem_ctx, &bind_handle, &_werr);
}
return werr;
@@ -296,7 +297,8 @@ static WERROR cmd_drsuapi_getdcinfo(struct rpc_pipe_client
*cli,
display_domain_controller_info(level_out, &ctr);
out:
if (is_valid_policy_hnd(&bind_handle)) {
- dcerpc_drsuapi_DsUnbind(b, mem_ctx, &bind_handle, &werr);
+ WERROR _werr;
+ dcerpc_drsuapi_DsUnbind(b, mem_ctx, &bind_handle, &_werr);
}
return werr;
@@ -495,12 +497,15 @@ static WERROR cmd_drsuapi_getncchanges(struct
rpc_pipe_client *cli,
&ctr,
&werr);
if (!NT_STATUS_IS_OK(status)) {
+ werr = ntstatus_to_werror(status);
printf("Failed to get NC Changes: %s",
- get_friendly_werror_msg(werr));
+ get_friendly_nt_error_msg(status));
goto out;
}
if (!W_ERROR_IS_OK(werr)) {
+ printf("Failed to get NC Changes: %s",
+ get_friendly_werror_msg(werr));
goto out;
}
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 416c6bb..30d73df 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -3090,6 +3090,8 @@ static WERROR get_share_info(struct net_context *c,
ctr1->array = info.info1;
info_ctr->ctr.ctr1 = ctr1;
+
+ break;
}
case 2:
{
@@ -3102,6 +3104,8 @@ static WERROR get_share_info(struct net_context *c,
ctr2->array = info.info2;
info_ctr->ctr.ctr2 = ctr2;
+
+ break;
}
case 502:
{
@@ -3114,6 +3118,8 @@ static WERROR get_share_info(struct net_context *c,
ctr502->array = info.info502;
info_ctr->ctr.ctr502 = ctr502;
+
+ break;
}
} /* switch */
done:
diff --git a/source3/wscript b/source3/wscript
index 3a31169..fc1cc1d 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -116,6 +116,9 @@ def configure(conf):
conf.CHECK_DECLS('fdatasync', reverse=True)
conf.CHECK_DECLS('readahead', reverse=True, headers='fcntl.h')
+ if conf.CONFIG_SET('HAVE_LONG_LONG'):
+ conf.DEFINE('HAVE_LONGLONG', 1)
+
if conf.CHECK_CODE('''
#if defined(HAVE_UNISTD_H)
#include <unistd.h>
@@ -383,6 +386,16 @@ return acl_get_perm_np(permset_d, perm);
'HAVE_PEERCRED',
msg="Checking whether we can use SO_PEERCRED to get socket
credentials")
+ conf.CHECK_CODE('''
+ #if defined(HAVE_LONGLONG) && (defined(HAVE_OFF64_T) ||
(defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8)))
+ #include <sys/types.h>
+ #else
+ __COMPILE_ERROR_
+ #endif
+ int i;''',
+ 'HAVE_EXPLICIT_LARGEFILE_SUPPORT',
+ msg="Checking whether large file support can be enabled")
+
default_static_modules=TO_LIST('''pdb_smbpasswd pdb_tdbsam pdb_wbc_sam
pdb_ldap
auth_sam auth_unix auth_winbind auth_wbc
auth_server
auth_domain auth_builtin auth_netlogond
vfs_default
--
Samba Shared Repository
