diff options
| author | Jeremy Allison <jra@samba.org> | 2009-10-17 10:36:33 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-10-17 10:36:33 -0700 |
| commit | 7c51fa6d699a653cafa90df8e44911b576118ebd (patch) | |
| tree | 543bf9ca698e03eff81104898b33e77f1abed319 /source3/registry/reg_backend_tcpip_params.c | |
| parent | cc3a6770c77ec8fe1cd63bf4c682853c56201f0c (diff) | |
| parent | 3e3214fd91471bca5b6c4d3782e922d252d588fb (diff) | |
| download | samba-7c51fa6d699a653cafa90df8e44911b576118ebd.tar.gz samba-7c51fa6d699a653cafa90df8e44911b576118ebd.tar.bz2 samba-7c51fa6d699a653cafa90df8e44911b576118ebd.zip | |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
Diffstat (limited to 'source3/registry/reg_backend_tcpip_params.c')
| -rw-r--r-- | source3/registry/reg_backend_tcpip_params.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/source3/registry/reg_backend_tcpip_params.c b/source3/registry/reg_backend_tcpip_params.c index 30f7f71938..fbad0436b6 100644 --- a/source3/registry/reg_backend_tcpip_params.c +++ b/source3/registry/reg_backend_tcpip_params.c @@ -33,24 +33,9 @@ extern struct registry_ops regdb_ops; 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); } |