sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

Use W_ERROR_NOT_OK_GOTO_DONE macro in libnetjoin.

Browse Source 
Guenther
This commit is contained in:
Günther Deschner 2008-02-28 11:00:50 +01:00
parent 0d8081499f
commit fec230b28f
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
source/libnet/libnet_join.c
View File

@ -50,6 +50,12 @@
#define LIBNET_UNJOIN_OUT_DUMP_CTX(ctx, r) \
LIBNET_UNJOIN_DUMP_CTX(ctx, r, NDR_OUT)
#define W_ERROR_NOT_OK_GOTO_DONE(x) do { \
if (!W_ERROR_IS_OK(x)) {\
goto done;\
}\
} while (0)
/****************************************************************
****************************************************************/
@ -942,9 +948,7 @@ static WERROR do_join_modify_vals_config(struct libnet_JoinCtx *r)
if (!(r->in.join_flags & WKSSVC_JOIN_FLAGS_JOIN_TYPE)) {
werr = libnet_conf_set_global_parameter(ctx, "security", "user");
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
W_ERROR_NOT_OK_GOTO_DONE(werr);
werr = libnet_conf_set_global_parameter(ctx, "workgroup",
r->in.domain_name);
@ -952,27 +956,22 @@ static WERROR do_join_modify_vals_config(struct libnet_JoinCtx *r)
}
werr = libnet_conf_set_global_parameter(ctx, "security", "domain");
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
W_ERROR_NOT_OK_GOTO_DONE(werr);
werr = libnet_conf_set_global_parameter(ctx, "workgroup",
r->out.netbios_domain_name);
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
W_ERROR_NOT_OK_GOTO_DONE(werr);
if (r->out.domain_is_ad) {
werr = libnet_conf_set_global_parameter(ctx, "security", "ads");
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
W_ERROR_NOT_OK_GOTO_DONE(werr);
werr = libnet_conf_set_global_parameter(ctx, "realm",
r->out.dns_domain_name);
W_ERROR_NOT_OK_GOTO_DONE(werr);
}
done:
done:
libnet_conf_close(ctx);
return werr;
}
@ -993,14 +992,11 @@ static WERROR do_unjoin_modify_vals_config(struct libnet_UnjoinCtx *r)
if (r->in.unjoin_flags & WKSSVC_JOIN_FLAGS_JOIN_TYPE) {
werr = libnet_conf_set_global_parameter(ctx, "security", "user");
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
W_ERROR_NOT_OK_GOTO_DONE(werr);
libnet_conf_delete_global_parameter(ctx, "realm");
}
libnet_conf_delete_global_parameter(ctx, "realm");
done:
done:
libnet_conf_close(ctx);
return werr;
}