From 6274929b1e1ddf89f4c5e93414121eaf06b6ab14 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 17 Mar 2008 18:01:33 +0100 Subject: libsmbconf: rename all occurrences of libnet_conf_ to smbconf_ . Michael (This used to be commit 097af0309d7c3e9342058ba5266667293b23c80d) --- source3/libnet/libnet_join.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'source3/libnet/libnet_join.c') diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c index 9bed346b5e..2e634a16f1 100644 --- a/source3/libnet/libnet_join.c +++ b/source3/libnet/libnet_join.c @@ -1199,41 +1199,41 @@ done: static WERROR do_join_modify_vals_config(struct libnet_JoinCtx *r) { WERROR werr; - struct libnet_conf_ctx *ctx; + struct smbconf_ctx *ctx; - werr = libnet_conf_open(r, &ctx); + werr = smbconf_open(r, &ctx); if (!W_ERROR_IS_OK(werr)) { goto done; } if (!(r->in.join_flags & WKSSVC_JOIN_FLAGS_JOIN_TYPE)) { - werr = libnet_conf_set_global_parameter(ctx, "security", "user"); + werr = smbconf_set_global_parameter(ctx, "security", "user"); W_ERROR_NOT_OK_GOTO_DONE(werr); - werr = libnet_conf_set_global_parameter(ctx, "workgroup", - r->in.domain_name); + werr = smbconf_set_global_parameter(ctx, "workgroup", + r->in.domain_name); goto done; } - werr = libnet_conf_set_global_parameter(ctx, "security", "domain"); + werr = smbconf_set_global_parameter(ctx, "security", "domain"); W_ERROR_NOT_OK_GOTO_DONE(werr); - werr = libnet_conf_set_global_parameter(ctx, "workgroup", - r->out.netbios_domain_name); + werr = smbconf_set_global_parameter(ctx, "workgroup", + r->out.netbios_domain_name); W_ERROR_NOT_OK_GOTO_DONE(werr); if (r->out.domain_is_ad) { - werr = libnet_conf_set_global_parameter(ctx, "security", "ads"); + werr = smbconf_set_global_parameter(ctx, "security", "ads"); W_ERROR_NOT_OK_GOTO_DONE(werr); - werr = libnet_conf_set_global_parameter(ctx, "realm", - r->out.dns_domain_name); + werr = smbconf_set_global_parameter(ctx, "realm", + r->out.dns_domain_name); W_ERROR_NOT_OK_GOTO_DONE(werr); } done: - libnet_conf_close(ctx); + smbconf_close(ctx); return werr; } @@ -1243,22 +1243,22 @@ static WERROR do_join_modify_vals_config(struct libnet_JoinCtx *r) static WERROR do_unjoin_modify_vals_config(struct libnet_UnjoinCtx *r) { WERROR werr = WERR_OK; - struct libnet_conf_ctx *ctx; + struct smbconf_ctx *ctx; - werr = libnet_conf_open(r, &ctx); + werr = smbconf_open(r, &ctx); if (!W_ERROR_IS_OK(werr)) { goto done; } if (r->in.unjoin_flags & WKSSVC_JOIN_FLAGS_JOIN_TYPE) { - werr = libnet_conf_set_global_parameter(ctx, "security", "user"); + werr = smbconf_set_global_parameter(ctx, "security", "user"); W_ERROR_NOT_OK_GOTO_DONE(werr); - libnet_conf_delete_global_parameter(ctx, "realm"); + smbconf_delete_global_parameter(ctx, "realm"); } done: - libnet_conf_close(ctx); + smbconf_close(ctx); return werr; } -- cgit