[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-test-1548-g24f13fb
Michael Adam
obnox at samba.org
Sun Jan 20 01:05:34 GMT 2008
The branch, v3-2-test has been updated
via 24f13fb72e4cbaba48235fa840b2a93bf1c5d9c3 (commit)
via 54e7c8098565495a833500d4b2a8d5240ed55c82 (commit)
via 9261b2c4bf48e133eecda9ec0095bd8edf20326c (commit)
via 7d1e986f3a5ab316a8501ddaca1ba1f0867b4531 (commit)
via daf37c954572bbf652506daae9ff0c9c365b2a9e (commit)
via a73b8d16aa0f7a3bb7417e9839e04380e6a68629 (commit)
from 2c4dfd7aaa3c3b384b547451f914a86f59157928 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 24f13fb72e4cbaba48235fa840b2a93bf1c5d9c3
Author: Michael Adam <obnox at samba.org>
Date: Sun Jan 20 01:30:38 2008 +0100
Some reformatting in netlogon_params_fetch_values().
Michael
commit 54e7c8098565495a833500d4b2a8d5240ed55c82
Author: Michael Adam <obnox at samba.org>
Date: Sat Jan 19 22:42:30 2008 +0100
Rename netlogon_params_fetch_reg_values() to netlogon_params_fetch_values().
Michael
commit 9261b2c4bf48e133eecda9ec0095bd8edf20326c
Author: Michael Adam <obnox at samba.org>
Date: Sat Jan 19 22:39:33 2008 +0100
In reg_backend_netlogon_params, delegate fetch_subkeys() to regdb.
In order to be able to open the netlogon_params key (the new backend replacing
the former dynamic overlay), certain methods need to be provided. Delegate these
to the regdb backend (like e.g. the smbconf backend does).
Michael
commit 7d1e986f3a5ab316a8501ddaca1ba1f0867b4531
Author: Michael Adam <obnox at samba.org>
Date: Fri Jan 18 17:51:57 2008 +0100
Fix registering Registry backends in reghook_cache_add().
This was broken in 331c0d6216e1a1607a49ed7eb4078e10138ec16a
(pstring removal).
Michael
commit daf37c954572bbf652506daae9ff0c9c365b2a9e
Author: Michael Adam <obnox at samba.org>
Date: Fri Jan 18 16:13:01 2008 +0100
Use constant KEY_NETLOGON_PARAMS instead of literal key.
Michael
commit a73b8d16aa0f7a3bb7417e9839e04380e6a68629
Author: Michael Adam <obnox at samba.org>
Date: Fri Jan 18 12:13:37 2008 +0100
Volker is right: why keep commented out migrated dynamic reg overlays around?...
Michael
-----------------------------------------------------------------------
Summary of changes:
source/registry/reg_backend_netlogon_params.c | 25 ++++++++++++++++---------
source/registry/reg_cachehook.c | 2 +-
source/registry/reg_db.c | 2 +-
source/registry/reg_dynamic.c | 21 ---------------------
4 files changed, 18 insertions(+), 32 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/registry/reg_backend_netlogon_params.c b/source/registry/reg_backend_netlogon_params.c
index 507d2c5..71f8814 100644
--- a/source/registry/reg_backend_netlogon_params.c
+++ b/source/registry/reg_backend_netlogon_params.c
@@ -29,22 +29,29 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_REGISTRY
+extern REGISTRY_OPS regdb_ops;
-static int netlogon_params_fetch_reg_values(const char *key,
- REGVAL_CTR *regvals)
+static int netlogon_params_fetch_values(const char *key, REGVAL_CTR *regvals)
{
uint32 dwValue;
-
- if ( !pdb_get_account_policy(AP_REFUSE_MACHINE_PW_CHANGE, &dwValue) )
+
+ if (!pdb_get_account_policy(AP_REFUSE_MACHINE_PW_CHANGE, &dwValue)) {
dwValue = 0;
-
- regval_ctr_addvalue( regvals, "RefusePasswordChange", REG_DWORD,
- (char*)&dwValue, sizeof(dwValue) );
+ }
+
+ regval_ctr_addvalue(regvals, "RefusePasswordChange", REG_DWORD,
+ (char*)&dwValue, sizeof(dwValue));
- return regval_ctr_numvals( regvals );
+ return regval_ctr_numvals(regvals);
}
+static int netlogon_params_fetch_subkeys(const char *key,
+ REGSUBKEY_CTR *subkey_ctr)
+{
+ return regdb_ops.fetch_subkeys(key, subkey_ctr);
+}
REGISTRY_OPS netlogon_params_reg_ops = {
- .fetch_values = netlogon_params_fetch_reg_values,
+ .fetch_values = netlogon_params_fetch_values,
+ .fetch_subkeys = netlogon_params_fetch_subkeys,
};
diff --git a/source/registry/reg_cachehook.c b/source/registry/reg_cachehook.c
index 74670aa..22352c6 100644
--- a/source/registry/reg_cachehook.c
+++ b/source/registry/reg_cachehook.c
@@ -56,7 +56,7 @@ bool reghook_cache_add( REGISTRY_HOOK *hook )
return false;
}
- key = talloc_asprintf(ctx, "//%s", hook->keyname);
+ key = talloc_asprintf(ctx, "\\%s", hook->keyname);
if (!key) {
return false;
}
diff --git a/source/registry/reg_db.c b/source/registry/reg_db.c
index c4bfc2b..1b95c25 100644
--- a/source/registry/reg_db.c
+++ b/source/registry/reg_db.c
@@ -50,7 +50,7 @@ static const char *builtin_registry_paths[] = {
"HKLM\\SYSTEM\\CurrentControlSet\\Control\\ProductOptions",
"HKLM\\SYSTEM\\CurrentControlSet\\Control\\Terminal Server\\DefaultUserConfiguration",
"HKLM\\SYSTEM\\CurrentControlSet\\Services\\TcpIp\\Parameters",
- "HKLM\\SYSTEM\\CurrentControlSet\\Services\\Netlogon\\Parameters",
+ KEY_NETLOGON_PARAMS,
"HKU",
"HKCR",
"HKPD",
diff --git a/source/registry/reg_dynamic.c b/source/registry/reg_dynamic.c
index 07c9673..037bdab 100644
--- a/source/registry/reg_dynamic.c
+++ b/source/registry/reg_dynamic.c
@@ -29,24 +29,6 @@ struct reg_dyn_values {
int (*fetch_values) ( REGVAL_CTR *val );
};
-#if 0
-/***********************************************************************
-***********************************************************************/
-
-static int netlogon_params( REGVAL_CTR *regvals )
-{
- uint32 dwValue;
-
- if ( !pdb_get_account_policy(AP_REFUSE_MACHINE_PW_CHANGE, &dwValue) )
- dwValue = 0;
-
- regval_ctr_addvalue( regvals, "RefusePasswordChange", REG_DWORD,
- (char*)&dwValue, sizeof(dwValue) );
-
- return regval_ctr_numvals( regvals );
-}
-#endif
-
/***********************************************************************
***********************************************************************/
@@ -202,9 +184,6 @@ static int current_version( REGVAL_CTR *values )
***********************************************************************/
static struct reg_dyn_values dynamic_values[] = {
-#if 0
- { "HKLM/SYSTEM/CURRENTCONTROLSET/SERVICES/NETLOGON/PARAMETERS", &netlogon_params },
-#endif
{ "HKLM/SYSTEM/CURRENTCONTROLSET/CONTROL/PRODUCTOPTIONS", &prod_options },
{ "HKLM/SYSTEM/CURRENTCONTROLSET/SERVICES/TCPIP/PARAMETERS", &tcpip_params },
{ "HKLM/SOFTWARE/MICROSOFT/WINDOWS NT/CURRENTVERSION/PERFLIB", &perflib_params },
--
Samba Shared Repository
More information about the samba-cvs
mailing list