s3: Remove some pointless uses of string_sid_talloc

[ira/wip.git] / source3 / registry / reg_backend_tcpip_params.c

diff --git a/source3/registry/reg_backend_tcpip_params.c b/source3/registry/reg_backend_tcpip_params.c
index db7df5dd8ffecb1cdf8ad79c5a6a48d7bf89bd16..fbad0436b61e030b43c816a9f1a53a1669ea967f 100644 (file)
--- a/source3/registry/reg_backend_tcpip_params.c
+++ b/source3/registry/reg_backend_tcpip_params.c
@@ -29,39 +29,24 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
 
-extern REGISTRY_OPS regdb_ops;
+extern struct registry_ops regdb_ops;
 
-static int tcpip_params_fetch_values(const char *key, REGVAL_CTR *regvals)
+static int tcpip_params_fetch_values(const char *key, struct regval_ctr *regvals)
 {
-       fstring value;
-       int value_length;
-       char *hname;
-       char *mydomainname = NULL;
+       regval_ctr_addvalue_sz(regvals, "Hostname", myhostname());
 
-       hname = myhostname();
-       value_length = push_ucs2(value, value, hname, sizeof(value),
-                                STR_TERMINATE|STR_NOALIGN);
-       regval_ctr_addvalue(regvals, "Hostname",REG_SZ, value, value_length);
-
-       mydomainname = get_mydnsdomname(talloc_tos());
-       if (!mydomainname) {
-               return -1;
-       }
-
-       value_length = push_ucs2(value, value, mydomainname, sizeof(value),
-                                STR_TERMINATE|STR_NOALIGN);
-       regval_ctr_addvalue(regvals, "Domain", REG_SZ, value, value_length);
+       regval_ctr_addvalue_sz(regvals, "Domain", get_mydnsdomname(talloc_tos()));
 
        return regval_ctr_numvals(regvals);
 }
 
 static int tcpip_params_fetch_subkeys(const char *key,
-                                        REGSUBKEY_CTR *subkey_ctr)
+                                     struct regsubkey_ctr *subkey_ctr)
 {
        return regdb_ops.fetch_subkeys(key, subkey_ctr);
 }
 
-REGISTRY_OPS tcpip_params_reg_ops = {
+struct registry_ops tcpip_params_reg_ops = {
        .fetch_values = tcpip_params_fetch_values,
        .fetch_subkeys = tcpip_params_fetch_subkeys,
 };