From 0c12b712c8723e5e7d8994fac50c43babadaad5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Deschner?= Date: Thu, 11 Mar 2010 20:48:24 +0100 Subject: [PATCH 1/4] s3-winreg: make QueryValue pass RPC-WINREG test again. Guenther (cherry picked from commit 24a7f8f2dbae73e862b9b3d4c6f0692054c354b3) --- source3/rpc_server/srv_winreg_nt.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/source3/rpc_server/srv_winreg_nt.c b/source3/rpc_server/srv_winreg_nt.c index 5912322..701c2bc 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; } -- 1.6.6.1 From 926b0d62c43c9a0cb990eac33b9b9508749a0541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Deschner?= Date: Tue, 16 Mar 2010 15:29:14 +0100 Subject: [PATCH 2/4] 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) --- source3/rpc_server/srv_winreg_nt.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/source3/rpc_server/srv_winreg_nt.c b/source3/rpc_server/srv_winreg_nt.c index 701c2bc..840acba 100644 --- a/source3/rpc_server/srv_winreg_nt.c +++ b/source3/rpc_server/srv_winreg_nt.c @@ -956,10 +956,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; } -- 1.6.6.1 From 80fd963071113ee239de4a4bb33e67c2c500013d Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Fri, 16 Apr 2010 11:04:27 +0200 Subject: [PATCH 3/4] s3-winreg_nt: Fixed QueryValue with data=NULL to get the length. (cherry picked from commit 4567bf9df53e62c0f30279235d56d13cb38de190) --- source3/rpc_server/srv_winreg_nt.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/source3/rpc_server/srv_winreg_nt.c b/source3/rpc_server/srv_winreg_nt.c index 840acba..04c9c8c 100644 --- a/source3/rpc_server/srv_winreg_nt.c +++ b/source3/rpc_server/srv_winreg_nt.c @@ -320,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; } -- 1.6.6.1 From 147ce9b4f42762df32c3fad9f031e1e7fa14334d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Deschner?= Date: Tue, 25 May 2010 14:13:20 +0200 Subject: [PATCH 4/4] s3-selftest: enable RPC-WINREG against s3. Guenther --- source3/script/tests/test_posix_s3.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 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" -- 1.6.6.1