The branch, master has been updated
via 10eaad2 libcli/security: remove unused variable.
via 545d3a0 s4-smbtorture: pass down driverosversion to
test_DriverInfo_winreg.
from 4f4ac64 s4-smbtorture: skip level 8 checks in
test_GetDriverInfo_winreg for w2k3.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 10eaad29777589e8bd797e3f0bad3a3a9fbf8577
Author: Günther Deschner <g...@samba.org>
Date: Fri Dec 17 12:47:13 2010 +0100
libcli/security: remove unused variable.
Guenther
Autobuild-User: Günther Deschner <g...@samba.org>
Autobuild-Date: Fri Dec 17 13:56:27 CET 2010 on sn-devel-104
commit 545d3a013cc9965e167ffc3d12951df0b27060bd
Author: Günther Deschner <g...@samba.org>
Date: Thu Dec 16 15:59:19 2010 +0100
s4-smbtorture: pass down driverosversion to test_DriverInfo_winreg.
Guenther
-----------------------------------------------------------------------
Summary of changes:
libcli/security/util_sid.c | 1 -
source4/torture/rpc/spoolss.c | 16 +++++++++-------
2 files changed, 9 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/security/util_sid.c b/libcli/security/util_sid.c
index 18b9951..52d48ce 100644
--- a/libcli/security/util_sid.c
+++ b/libcli/security/util_sid.c
@@ -253,7 +253,6 @@ bool sid_blob_parse(DATA_BLOB in, struct dom_sid *sid)
bool sid_parse(const char *inbuf, size_t len, struct dom_sid *sid)
{
- enum ndr_err_code ndr_err;
DATA_BLOB in = data_blob_const(inbuf, len);
return sid_blob_parse(in, sid);
}
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index bc40aea..e16a856 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -4592,6 +4592,7 @@ static bool test_GetDriverInfo_winreg(struct
torture_context *tctx,
const char *printer_name,
const char *driver_name,
const char *environment,
+ enum spoolss_DriverOSVersion version,
struct dcerpc_binding_handle
*winreg_handle,
struct policy_handle *hive_handle)
{
@@ -4617,7 +4618,7 @@ static bool test_GetDriverInfo_winreg(struct
torture_context *tctx,
driver_key = talloc_asprintf(tctx, "%s\\%s\\Drivers\\Version-%d\\%s",
TOP_LEVEL_CONTROL_ENVIRONMENTS_KEY,
environment,
- 3,
+ version,
driver_name);
torture_assert(tctx,
@@ -4633,7 +4634,7 @@ static bool test_GetDriverInfo_winreg(struct
torture_context *tctx,
}
torture_assert(tctx,
- test_GetPrinterDriver2_level(tctx, b, handle, driver_name,
environment, 8, 3, 0, &info, &result),
+ test_GetPrinterDriver2_level(tctx, b, handle, driver_name,
environment, 8, version, 0, &info, &result),
"failed to get driver info level 8");
if (W_ERROR_EQUAL(result, WERR_INVALID_LEVEL)) {
@@ -4681,7 +4682,7 @@ static bool test_GetDriverInfo_winreg(struct
torture_context *tctx,
try_level6:
torture_assert(tctx,
- test_GetPrinterDriver2_level(tctx, b, handle, driver_name,
environment, 6, 3, 0, &info, &result),
+ test_GetPrinterDriver2_level(tctx, b, handle, driver_name,
environment, 6, version, 0, &info, &result),
"failed to get driver info level 6");
driver_path = strip_path(info.info6.driver_path);
@@ -4715,7 +4716,7 @@ static bool test_GetDriverInfo_winreg(struct
torture_context *tctx,
try_level3:
torture_assert(tctx,
- test_GetPrinterDriver2_level(tctx, b, handle, driver_name,
environment, 3, 3, 0, &info, &result),
+ test_GetPrinterDriver2_level(tctx, b, handle, driver_name,
environment, 3, version, 0, &info, &result),
"failed to get driver info level 3");
driver_path = strip_path(info.info3.driver_path);
@@ -5270,7 +5271,8 @@ static bool test_DriverInfo_winreg(struct torture_context
*tctx,
struct policy_handle *handle,
const char *printer_name,
const char *driver_name,
- const char *environment)
+ const char *environment,
+ enum spoolss_DriverOSVersion version)
{
struct dcerpc_binding_handle *b = p->binding_handle;
struct dcerpc_pipe *p2;
@@ -5285,7 +5287,7 @@ static bool test_DriverInfo_winreg(struct torture_context
*tctx,
torture_assert(tctx, test_winreg_OpenHKLM(tctx, b2, &hive_handle), "");
- ret = test_GetDriverInfo_winreg(tctx, b, handle, printer_name,
driver_name, environment, b2, &hive_handle);
+ ret = test_GetDriverInfo_winreg(tctx, b, handle, printer_name,
driver_name, environment, version, b2, &hive_handle);
test_winreg_CloseKey(tctx, b2, &hive_handle);
@@ -7804,7 +7806,7 @@ static bool test_driver_info_winreg(struct
torture_context *tctx,
}
torture_assert(tctx,
- test_DriverInfo_winreg(tctx, p, &t->handle,
t->info2.printername, driver_name, t->driver.remote.environment),
+ test_DriverInfo_winreg(tctx, p, &t->handle,
t->info2.printername, driver_name, t->driver.remote.environment, 3),
"failed to test driver info winreg");
return true;
--
Samba Shared Repository
