5 files changed, 16 insertions, 12 deletions
diff --git a/source3/registry/reg_db.c b/source3/registry/reg_db.c
index 19f7e64479..7efa032e39 100644
--- a/source3/registry/reg_db.c
+++ b/source3/registry/reg_db.c
@@ -347,7 +347,8 @@ REGISTRY_OPS regdb_ops = {
 	regdb_fetch_reg_keys,
 	regdb_fetch_reg_values,
 	regdb_store_reg_keys,
-	regdb_store_reg_values
+	regdb_store_reg_values,
+	NULL
 };
 
 
diff --git a/source3/registry/reg_eventlog.c b/source3/registry/reg_eventlog.c
index 50e4995b9e..4c3f144980 100644
--- a/source3/registry/reg_eventlog.c
+++ b/source3/registry/reg_eventlog.c
@@ -302,5 +302,6 @@ REGISTRY_OPS eventlog_ops = {
 	eventlog_subkey_info,
 	eventlog_value_info,
 	eventlog_store_subkey,
-	eventlog_store_value
+	eventlog_store_value,
+	NULL
 };
diff --git a/source3/registry/reg_frontend.c b/source3/registry/reg_frontend.c
index 8333bcd31f..196007d3cb 100644
--- a/source3/registry/reg_frontend.c
+++ b/source3/registry/reg_frontend.c
@@ -79,8 +79,8 @@ BOOL init_registry( void )
  
 BOOL store_reg_keys( REGISTRY_KEY *key, REGSUBKEY_CTR *subkeys )
 {
-	if ( key->hook && key->hook->ops && key->hook->ops->store_subkeys_fn )
-		return key->hook->ops->store_subkeys_fn( key->name, subkeys );
+	if ( key->hook && key->hook->ops && key->hook->ops->store_subkeys )
+		return key->hook->ops->store_subkeys( key->name, subkeys );
 	else
 		return False;
 
@@ -92,8 +92,8 @@ BOOL store_reg_keys( REGISTRY_KEY *key, REGSUBKEY_CTR *subkeys )
  
 BOOL store_reg_values( REGISTRY_KEY *key, REGVAL_CTR *val )
 {
-	if ( key->hook && key->hook->ops && key->hook->ops->store_values_fn )
-		return key->hook->ops->store_values_fn( key->name, val );
+	if ( key->hook && key->hook->ops && key->hook->ops->store_values )
+		return key->hook->ops->store_values( key->name, val );
 	else
 		return False;
 }
@@ -108,8 +108,8 @@ int fetch_reg_keys( REGISTRY_KEY *key, REGSUBKEY_CTR *subkey_ctr )
 {
 	int result = -1;
 	
-	if ( key->hook && key->hook->ops && key->hook->ops->subkey_fn )
-		result = key->hook->ops->subkey_fn( key->name, subkey_ctr );
+	if ( key->hook && key->hook->ops && key->hook->ops->fetch_subkeys )
+		result = key->hook->ops->fetch_subkeys( key->name, subkey_ctr );
 
 	return result;
 }
@@ -176,8 +176,8 @@ int fetch_reg_values( REGISTRY_KEY *key, REGVAL_CTR *val )
 {
 	int result = -1;
 	
-	if ( key->hook && key->hook->ops && key->hook->ops->value_fn )
-		result = key->hook->ops->value_fn( key->name, val );
+	if ( key->hook && key->hook->ops && key->hook->ops->fetch_values )
+		result = key->hook->ops->fetch_values( key->name, val );
 
 	return result;
 }
diff --git a/source3/registry/reg_printing.c b/source3/registry/reg_printing.c
index 8e1e8ae40b..b0fb4ab9d9 100644
--- a/source3/registry/reg_printing.c
+++ b/source3/registry/reg_printing.c
@@ -928,7 +928,8 @@ REGISTRY_OPS printing_ops = {
 	printing_subkey_info,
 	printing_value_info,
 	printing_store_subkey,
-	printing_store_value
+	printing_store_value,
+	NULL
 };
 
 
diff --git a/source3/registry/reg_shares.c b/source3/registry/reg_shares.c
index 7538db7623..4531327d94 100644
--- a/source3/registry/reg_shares.c
+++ b/source3/registry/reg_shares.c
@@ -158,7 +158,8 @@ REGISTRY_OPS shares_reg_ops = {
 	shares_subkey_info,
 	shares_value_info,
 	shares_store_subkey,
-	shares_store_value
+	shares_store_value,
+	NULL
 };