The branch, v3-5-test has been updated
via 73d4135... s3-selftest: enable RPC-WINREG against s3.
via b541fb1... s3-winreg_nt: Fixed QueryValue with data=NULL to get the
length. (cherry picked from commit 4567bf9df53e62c0f30279235d56d13cb38de190)
via 5d9f173... s3-winreg: change notify call has no meaning when called
remotely.
via 4f527cf... s3-winreg: make QueryValue pass RPC-WINREG test again.
from 4c5a1b6... Fix bug #7448 - smbd crash when sambaLMPassword and
sambaNTPassword entries missing from ldap.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -----------------------------------------------------------------
commit 73d413524e62796fdcfa4ac06a6499ecd6b9978f
Author: Günther Deschner <[email protected]>
Date: Tue May 25 14:13:20 2010 +0200
s3-selftest: enable RPC-WINREG against s3.
Guenther
The last 4 patches address bug #7453 (winreg: QueryValue crashes on NULL
pointer
dereference).
commit b541fb1500aad87aee46ef48036f3b4a05b119cd
Author: Andreas Schneider <[email protected]>
Date: Fri Apr 16 11:04:27 2010 +0200
s3-winreg_nt: Fixed QueryValue with data=NULL to get the length. (cherry
picked from commit 4567bf9df53e62c0f30279235d56d13cb38de190)
commit 5d9f173d28fab6ea1afc36978c88f881bb7da52e
Author: Günther Deschner <[email protected]>
Date: Tue Mar 16 15:29:14 2010 +0100
s3-winreg: change notify call has no meaning when called remotely.
Just return not supported to make smbtorture happy.
Guenther
(cherry picked from commit e46d3d9475c59af8ba6810aeb1403c1aa9e37d9d)
commit 4f527cf96a2c208c32f97073b6453386b4a1825c
Author: Günther Deschner <[email protected]>
Date: Thu Mar 11 20:48:24 2010 +0100
s3-winreg: make QueryValue pass RPC-WINREG test again.
Guenther
(cherry picked from commit 24a7f8f2dbae73e862b9b3d4c6f0692054c354b3)
-----------------------------------------------------------------------
Summary of changes:
source3/rpc_server/srv_winreg_nt.c | 12 +++++++-----
source3/script/tests/test_posix_s3.sh | 2 +-
2 files changed, 8 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/srv_winreg_nt.c
b/source3/rpc_server/srv_winreg_nt.c
index 5912322..04c9c8c 100644
--- a/source3/rpc_server/srv_winreg_nt.c
+++ b/source3/rpc_server/srv_winreg_nt.c
@@ -230,6 +230,10 @@ WERROR _winreg_QueryValue(pipes_struct *p, struct
winreg_QueryValue *r)
if ( !regkey )
return WERR_BADFID;
+ if (r->in.value_name->name == NULL) {
+ return WERR_INVALID_PARAM;
+ }
+
if ((r->out.data_length == NULL) || (r->out.type == NULL) ||
(r->out.data_size == NULL)) {
return WERR_INVALID_PARAM;
}
@@ -316,7 +320,9 @@ WERROR _winreg_QueryValue(pipes_struct *p, struct
winreg_QueryValue *r)
} else {
*r->out.data_length = outbuf_size;
*r->out.data_size = outbuf_size;
- memcpy(r->out.data, outbuf, outbuf_size);
+ if (r->out.data) {
+ memcpy(r->out.data, outbuf, outbuf_size);
+ }
status = WERR_OK;
}
@@ -952,10 +958,6 @@ WERROR _winreg_LoadKey(pipes_struct *p, struct
winreg_LoadKey *r)
WERROR _winreg_NotifyChangeKeyValue(pipes_struct *p, struct
winreg_NotifyChangeKeyValue *r)
{
- /* fill in your code here if you think this call should
- do anything */
-
- p->rng_fault_state = True;
return WERR_NOT_SUPPORTED;
}
diff --git a/source3/script/tests/test_posix_s3.sh
b/source3/script/tests/test_posix_s3.sh
index 79cb3f6..7fc8da8 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -40,7 +40,7 @@ raw="$raw RAW-SAMBA3ROOTDIRFID"
rpc="RPC-AUTHCONTEXT RPC-SAMBA3-BIND RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC"
rpc="$rpc RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC RPC-SAMBA3-WINREG"
rpc="$rpc RPC-SAMBA3-NETLOGON RPC-SAMBA3-SESSIONKEY RPC-SAMBA3-GETUSERNAME"
-rpc="$rpc RPC-SVCCTL RPC-SPOOLSS RPC-SPOOLSS-WIN RPC-NTSVCS"
+rpc="$rpc RPC-SVCCTL RPC-SPOOLSS RPC-SPOOLSS-WIN RPC-NTSVCS RPC-WINREG"
rpc="$rpc RPC-LSA-GETUSER RPC-LSA-LOOKUPSIDS RPC-LSA-LOOKUPNAMES"
rpc="$rpc RPC-LSA-PRIVILEGES "
rpc="$rpc RPC-SAMR RPC-SAMR-USERS RPC-SAMR-USERS-PRIVILEGES RPC-SAMR-PASSWORDS"
--
Samba Shared Repository
