s3-registry: only include registry headers when really needed.

[sfrench/samba-autobuild/.git] / source3 / registry / reg_backend_prod_options.c

diff --git a/source3/registry/reg_backend_prod_options.c b/source3/registry/reg_backend_prod_options.c
index 3e9d32cd9791b327e19d9fceccdb2015f4a8c8d3..764d98f6d63f3c54b5941740a05d67d0426cfa04 100644 (file)
--- a/source3/registry/reg_backend_prod_options.c
+++ b/source3/registry/reg_backend_prod_options.c
@@ -25,17 +25,16 @@
  */
 
 #include "includes.h"
+#include "registry.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
 
-extern REGISTRY_OPS regdb_ops;
+extern struct registry_ops regdb_ops;
 
-static int prod_options_fetch_values(const char *key, REGVAL_CTR *regvals)
+static int prod_options_fetch_values(const char *key, struct regval_ctr *regvals)
 {
        const char *value_ascii = "";
-       fstring value;
-       int value_length;
 
        switch (lp_server_role()) {
                case ROLE_DOMAIN_PDC:
@@ -50,10 +49,7 @@ static int prod_options_fetch_values(const char *key, REGVAL_CTR *regvals)
                        break;
        }
 
-       value_length = push_ucs2(value, value, value_ascii, sizeof(value),
-                                STR_TERMINATE|STR_NOALIGN );
-       regval_ctr_addvalue(regvals, "ProductType", REG_SZ, value,
-                           value_length);
+       regval_ctr_addvalue_sz(regvals, "ProductType", value_ascii);
 
        return regval_ctr_numvals( regvals );
 }
@@ -64,7 +60,7 @@ static int prod_options_fetch_subkeys(const char *key,
        return regdb_ops.fetch_subkeys(key, subkey_ctr);
 }
 
-REGISTRY_OPS prod_options_reg_ops = {
+struct registry_ops prod_options_reg_ops = {
        .fetch_values = prod_options_fetch_values,
        .fetch_subkeys = prod_options_fetch_subkeys,
 };