sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

s3-libnetapi: Correctly check for lp_realm.

Browse Source 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
This commit is contained in:
Andreas Schneider
2016-06-15 16:05:58 +02:00
committed by Günther Deschner
parent 4c408f6de5
commit 169e8aeda5
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source3/lib/netapi/joindomain.c
View File

@ -175,6 +175,7 @@ WERROR NetUnjoinDomain_l(struct libnetapi_ctx *mem_ctx,
const char *domain = NULL;
WERROR werr;
struct libnetapi_private_ctx *priv;
const char *realm = lp_realm();
priv = talloc_get_type_abort(mem_ctx->private_data,
struct libnetapi_private_ctx);
@ -186,8 +187,8 @@ WERROR NetUnjoinDomain_l(struct libnetapi_ctx *mem_ctx,
werr = libnet_init_UnjoinCtx(mem_ctx, &u);
W_ERROR_NOT_OK_RETURN(werr);
if (lp_realm()) {
domain = lp_realm();
if (realm[0] != '\0') {
domain = realm;
} else {
domain = lp_workgroup();
}
@ -352,8 +353,10 @@ WERROR NetGetJoinInformation_r(struct libnetapi_ctx *ctx,
WERROR NetGetJoinInformation_l(struct libnetapi_ctx *ctx,
struct NetGetJoinInformation *r)
{
if ((lp_security() == SEC_ADS) && lp_realm()) {
*r->out.name_buffer = talloc_strdup(ctx, lp_realm());
const char *realm = lp_realm();
if ((lp_security() == SEC_ADS) && realm[0] != '\0') {
*r->out.name_buffer = talloc_strdup(ctx, realm);
} else {
*r->out.name_buffer = talloc_strdup(ctx, lp_workgroup());
}