The branch, master has been updated
via ae43867 s4-torture: trying to make clusapi resource online/offline
testing a bit more robust
via 6ef2d28 s3-rpcclient: protect against empty witness async notify
messages.
via 08e260e librpc: properly quote uuids so that wireshark dissectors
can be built from them.
via 4827d49 clusapi: remove security.idl dependency from IDL.
via 71a168e build:wafsamba: Set the default installation prefix for Waf
1.8
from 875beef samba-tool: add command to dump dosinfo xattr from a file
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ae438675ddabbec7438ec90565d93a7e9ee86f82
Author: Günther Deschner <g...@samba.org>
Date: Mon Sep 21 19:17:59 2015 +0200
s4-torture: trying to make clusapi resource online/offline testing a bit
more robust
Guenther
Signed-off-by: Günther Deschner <g...@samba.org>
Reviewed-by: Michael Adam <ob...@samba.org>
Autobuild-User(master): Michael Adam <ob...@samba.org>
Autobuild-Date(master): Tue Sep 29 15:00:47 CEST 2015 on sn-devel-104
commit 6ef2d288a7327f356ab4694eca9b554796066257
Author: Günther Deschner <g...@samba.org>
Date: Mon Sep 14 17:12:58 2015 +0200
s3-rpcclient: protect against empty witness async notify messages.
Guenther
Signed-off-by: Günther Deschner <g...@samba.org>
Reviewed-by: Michael Adam <ob...@samba.org>
commit 08e260e3e3e6b0c1266fcd5285e666d089e4e9e0
Author: Günther Deschner <g...@samba.org>
Date: Mon Sep 28 19:08:58 2015 +0200
librpc: properly quote uuids so that wireshark dissectors can be built from
them.
Guenther
Signed-off-by: Günther Deschner <g...@samba.org>
Reviewed-by: Michael Adam <ob...@samba.org>
commit 4827d49bd2a6a174f6c80c32ebc7b322da3a64c5
Author: Günther Deschner <g...@samba.org>
Date: Mon Sep 28 00:47:17 2015 +0200
clusapi: remove security.idl dependency from IDL.
Guenther
Signed-off-by: Günther Deschner <g...@samba.org>
Reviewed-by: Michael Adam <ob...@samba.org>
commit 71a168eb2bc9df448bab73ae55e2cd8b514b03cd
Author: Thomas Nagy <tn...@waf.io>
Date: Mon Sep 28 21:47:16 2015 +0200
build:wafsamba: Set the default installation prefix for Waf 1.8
These changes enable the default installation prefix settings to
take effect in both Waf 1.5 and 1.8 with no additional code changes.
Signed-off-by: Thomas Nagy <tn...@waf.io>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Michael Adam <ob...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
ctdb/wscript | 2 +-
librpc/idl/clusapi.idl | 4 ++--
librpc/idl/dcom.idl | 2 +-
librpc/idl/wmi.idl | 8 ++++----
source3/rpcclient/cmd_witness.c | 5 +++++
source3/wscript | 2 +-
source4/torture/rpc/clusapi.c | 20 ++++++++++++++------
wscript | 2 +-
8 files changed, 29 insertions(+), 16 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/wscript b/ctdb/wscript
index e04891b..eea25e9 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -26,7 +26,7 @@ else:
version = samba_version.samba_version_file('%s/VERSION' % vdir, vdir, env)
VERSION = version.STRING.replace('-', '.')
-Options.default_prefix = '/usr/local'
+default_prefix = Options.default_prefix = '/usr/local'
samba_dist.DIST_DIRS('''ctdb:. lib/replace:lib/replace lib/talloc:lib/talloc
lib/tevent:lib/tevent lib/tdb:lib/tdb
diff --git a/librpc/idl/clusapi.idl b/librpc/idl/clusapi.idl
index 42a9ecb..3440047 100644
--- a/librpc/idl/clusapi.idl
+++ b/librpc/idl/clusapi.idl
@@ -1,9 +1,9 @@
-import "security.idl", "winreg.idl", "misc.idl";
+import "winreg.idl", "misc.idl";
#include "idl_types.h"
[
- uuid(b97db8b2-4c63-11cf-bff6-08002be23f2f),
+ uuid("b97db8b2-4c63-11cf-bff6-08002be23f2f"),
version(3.0),
pointer_default(unique),
endpoint("ncacn_ip_tcp:"),
diff --git a/librpc/idl/dcom.idl b/librpc/idl/dcom.idl
index ff44722..e53d7b8 100644
--- a/librpc/idl/dcom.idl
+++ b/librpc/idl/dcom.idl
@@ -265,7 +265,7 @@ interface IRemUnknown2 : IRemUnknown
}
[
- uuid(DA23F6DB-6F45-466C-9EED-0B65286F2D78),
+ uuid("DA23F6DB-6F45-466C-9EED-0B65286F2D78"),
helpstring("ICoffeeMachine Interface"),
pointer_default(unique),
object
diff --git a/librpc/idl/wmi.idl b/librpc/idl/wmi.idl
index 4d428a8..43b7408 100644
--- a/librpc/idl/wmi.idl
+++ b/librpc/idl/wmi.idl
@@ -35,7 +35,7 @@ interface IWbemClassObject : IUnknown
};
[
- uuid(9A653086-174F-11d2-B5F9-00104B703EFD)
+ uuid("9A653086-174F-11d2-B5F9-00104B703EFD")
]
coclass WbemClassObject
{
@@ -486,7 +486,7 @@ coclass WbemClassObject
[
object,
- uuid(027947e1-d731-11ce-a357-000000000001),
+ uuid("027947e1-d731-11ce-a357-000000000001"),
pointer_default(unique)
] interface IEnumWbemClassObject : IUnknown
{
@@ -669,7 +669,7 @@ coclass WbemClassObject
[
object,
/* restricted, */
- uuid(44aca675-e8fc-11d0-a07c-00c04fb68820)
+ uuid("44aca675-e8fc-11d0-a07c-00c04fb68820")
] interface IWbemCallResult : IUnknown
{
WERROR GetResultObject(
@@ -697,7 +697,7 @@ coclass WbemClassObject
[
object,
restricted,
- uuid(7c857801-7381-11cf-884d-00aa004b2e24)
+ uuid("7c857801-7381-11cf-884d-00aa004b2e24")
]
interface IWbemObjectSink : IUnknown
{
diff --git a/source3/rpcclient/cmd_witness.c b/source3/rpcclient/cmd_witness.c
index bd0372f..5d07dde 100644
--- a/source3/rpcclient/cmd_witness.c
+++ b/source3/rpcclient/cmd_witness.c
@@ -406,6 +406,11 @@ static WERROR cmd_witness_AsyncNotify(struct
rpc_pipe_client *cli,
goto done;
}
+ if (response == NULL) {
+ d_printf("Got an empty response\n");
+ goto done;
+ }
+
switch(response->type) {
case WITNESS_NOTIFY_RESOURCE_CHANGE:
d_printf("Resource change");
diff --git a/source3/wscript b/source3/wscript
index 2687620..9ff9c20 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -11,7 +11,7 @@ import build.charset
import samba_utils, samba_version
import samba3
-Options.default_prefix = '/usr/local/samba'
+default_prefix = Options.default_prefix = '/usr/local/samba'
def set_options(opt):
diff --git a/source4/torture/rpc/clusapi.c b/source4/torture/rpc/clusapi.c
index e3fff82..d59f24f 100644
--- a/source4/torture/rpc/clusapi.c
+++ b/source4/torture/rpc/clusapi.c
@@ -946,9 +946,13 @@ bool test_OnlineResource_int(struct torture_context *tctx,
torture_assert_ntstatus_ok(tctx,
dcerpc_clusapi_OnlineResource_r(b, tctx, &r),
"OnlineResource failed");
- torture_assert_werr_ok(tctx,
- r.out.result,
- "OnlineResource failed");
+ if (!W_ERROR_IS_OK(r.out.result) &&
+ !W_ERROR_EQUAL(r.out.result, WERR_IO_PENDING)) {
+ torture_result(tctx, TORTURE_FAIL,
+ "OnlineResource failed with %s",
+ win_errstr(r.out.result));
+ return false;
+ }
return true;
}
@@ -986,9 +990,13 @@ bool test_OfflineResource_int(struct torture_context *tctx,
torture_assert_ntstatus_ok(tctx,
dcerpc_clusapi_OfflineResource_r(b, tctx, &r),
"OfflineResource failed");
- torture_assert_werr_ok(tctx,
- r.out.result,
- "OfflineResource failed");
+ if (!W_ERROR_IS_OK(r.out.result) &&
+ !W_ERROR_EQUAL(r.out.result, WERR_IO_PENDING)) {
+ torture_result(tctx, TORTURE_FAIL,
+ "OfflineResource failed with %s",
+ win_errstr(r.out.result));
+ return false;
+ }
return true;
}
diff --git a/wscript b/wscript
index 9431e11..c11e0c0 100644
--- a/wscript
+++ b/wscript
@@ -15,7 +15,7 @@ samba_dist.DIST_DIRS('.')
samba_dist.DIST_BLACKLIST('.gitignore .bzrignore source4/selftest/provisions')
# install in /usr/local/samba by default
-Options.default_prefix = '/usr/local/samba'
+default_prefix = Options.default_prefix = '/usr/local/samba'
# This callback optionally takes a list of paths as arguments:
# --with-system_mitkrb5 /path/to/krb5 /another/path
--
Samba Shared Repository
