diff options
| author | Andreas Schneider <asn@samba.org> | 2021-11-18 11:38:42 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2021-12-08 09:59:18 +0000 |
| commit | 1b5b96d5a2453a7ffc374c3d10ef4ed890cc68ba (patch) | |
| tree | adb94a530732ddaab97938fa92907e408dda5b7d | |
| parent | 0801cae3df8492c9576b46b67572961e07d3241c (diff) | |
| download | samba-1b5b96d5a2453a7ffc374c3d10ef4ed890cc68ba.tar.gz | |
s3:libnet: Remove tailing whitespaces in libnet_join.c
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14767
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit 34c57ebee04bb770174fab31edd9bfe2f88a84eb)
| -rw-r--r-- | source3/libnet/libnet_join.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c index 263420a2159..025190cb860 100644 --- a/source3/libnet/libnet_join.c +++ b/source3/libnet/libnet_join.c @@ -3045,7 +3045,7 @@ static WERROR libnet_DomainUnjoin(TALLOC_CTX *mem_ctx, W_ERROR_HAVE_NO_MEMORY(r->in.domain_sid); } - if (!(r->in.unjoin_flags & WKSSVC_JOIN_FLAGS_ACCOUNT_DELETE) && + if (!(r->in.unjoin_flags & WKSSVC_JOIN_FLAGS_ACCOUNT_DELETE) && !r->in.delete_machine_account) { libnet_join_unjoindomain_remove_secrets(mem_ctx, r); return WERR_OK; @@ -3077,8 +3077,8 @@ static WERROR libnet_DomainUnjoin(TALLOC_CTX *mem_ctx, } #ifdef HAVE_ADS - /* for net ads leave, try to delete the account. If it works, - no sense in disabling. If it fails, we can still try to + /* for net ads leave, try to delete the account. If it works, + no sense in disabling. If it fails, we can still try to disable it. jmcd */ if (r->in.delete_machine_account) { @@ -3086,10 +3086,10 @@ static WERROR libnet_DomainUnjoin(TALLOC_CTX *mem_ctx, ads_status = libnet_unjoin_connect_ads(mem_ctx, r); if (ADS_ERR_OK(ads_status)) { /* dirty hack */ - r->out.dns_domain_name = + r->out.dns_domain_name = talloc_strdup(mem_ctx, r->in.ads->server.realm); - ads_status = + ads_status = libnet_unjoin_remove_machine_acct(mem_ctx, r); } if (!ADS_ERR_OK(ads_status)) { @@ -3105,7 +3105,7 @@ static WERROR libnet_DomainUnjoin(TALLOC_CTX *mem_ctx, } #endif /* HAVE_ADS */ - /* The WKSSVC_JOIN_FLAGS_ACCOUNT_DELETE flag really means + /* The WKSSVC_JOIN_FLAGS_ACCOUNT_DELETE flag really means "disable". */ if (r->in.unjoin_flags & WKSSVC_JOIN_FLAGS_ACCOUNT_DELETE) { status = libnet_join_unjoindomain_rpc(mem_ctx, r); @@ -3124,7 +3124,7 @@ static WERROR libnet_DomainUnjoin(TALLOC_CTX *mem_ctx, r->out.disabled_machine_account = true; } - /* If disable succeeded or was not requested at all, we + /* If disable succeeded or was not requested at all, we should be getting rid of our end of things */ libnet_join_unjoindomain_remove_secrets(mem_ctx, r); |