[SCM] Samba Shared Repository - branch v3-2-test updated -
release-3-2-0pre2-619-g0058ab3
Günther Deschner
gd at samba.org
Wed Apr 2 09:17:35 GMT 2008
The branch, v3-2-test has been updated
via 0058ab30de943f134792e3d66051206086987110 (commit)
from 0970369ca0cb9ae465cff40e5c75739824daf1d0 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 0058ab30de943f134792e3d66051206086987110
Author: Günther Deschner <gd at samba.org>
Date: Wed Apr 2 11:14:15 2008 +0200
Make sure to hand down the domain name in libnetapi NetUnjoinDomain.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source/lib/netapi/joindomain.c | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/netapi/joindomain.c b/source/lib/netapi/joindomain.c
index 9c0e8aa..ed8327e 100644
--- a/source/lib/netapi/joindomain.c
+++ b/source/lib/netapi/joindomain.c
@@ -238,6 +238,7 @@ static WERROR NetUnjoinDomainLocal(struct libnetapi_ctx *mem_ctx,
{
struct libnet_UnjoinCtx *r = NULL;
struct dom_sid domain_sid;
+ const char *domain = NULL;
WERROR werr;
if (!secrets_fetch_domain_sid(lp_workgroup(), &domain_sid)) {
@@ -247,26 +248,28 @@ static WERROR NetUnjoinDomainLocal(struct libnetapi_ctx *mem_ctx,
werr = libnet_init_UnjoinCtx(mem_ctx, &r);
W_ERROR_NOT_OK_RETURN(werr);
+ if (lp_realm()) {
+ domain = lp_realm();
+ } else {
+ domain = lp_workgroup();
+ }
+
if (server_name) {
r->in.dc_name = talloc_strdup(mem_ctx, server_name);
W_ERROR_HAVE_NO_MEMORY(r->in.dc_name);
} else {
NTSTATUS status;
- const char *domain = NULL;
struct netr_DsRGetDCNameInfo *info = NULL;
uint32_t flags = DS_DIRECTORY_SERVICE_REQUIRED |
DS_WRITABLE_REQUIRED |
DS_RETURN_DNS_NAME;
- if (lp_realm()) {
- domain = lp_realm();
- } else {
- domain = lp_workgroup();
- }
status = dsgetdcname(mem_ctx, domain,
NULL, NULL, flags, &info);
if (!NT_STATUS_IS_OK(status)) {
libnetapi_set_error_string(mem_ctx,
- "%s", get_friendly_nt_error_msg(status));
+ "failed to find DC for domain %s: %s",
+ domain,
+ get_friendly_nt_error_msg(status));
return ntstatus_to_werror(status);
}
r->in.dc_name = talloc_strdup(mem_ctx,
@@ -284,6 +287,7 @@ static WERROR NetUnjoinDomainLocal(struct libnetapi_ctx *mem_ctx,
W_ERROR_HAVE_NO_MEMORY(r->in.admin_password);
}
+ r->in.domain_name = domain;
r->in.unjoin_flags = unjoin_flags;
r->in.modify_config = true;
r->in.debug = true;
--
Samba Shared Repository
More information about the samba-cvs
mailing list