[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha8-39-g36a8abc
Günther Deschner
gd at samba.org
Mon Jun 22 20:40:20 GMT 2009
The branch, master has been updated
via 36a8abce4f737102b5a2acf3c0e221391079831d (commit)
from 4aade2768b40b805b50578ec6fa99fe57525b147 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 36a8abce4f737102b5a2acf3c0e221391079831d
Author: Günther Deschner <gd at samba.org>
Date: Mon Jun 22 22:35:58 2009 +0200
s3-libnet: fix libnet_unjoin_remove_machine_acct() when called without ads struct.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/libnet/libnet_join.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index a96fd8c..86d2a02 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -264,7 +264,13 @@ static ADS_STATUS libnet_unjoin_remove_machine_acct(TALLOC_CTX *mem_ctx,
ADS_STATUS status;
if (!r->in.ads) {
- return libnet_unjoin_connect_ads(mem_ctx, r);
+ status = libnet_unjoin_connect_ads(mem_ctx, r);
+ if (!ADS_ERR_OK(status)) {
+ libnet_unjoin_set_error_string(mem_ctx, r,
+ "failed to connect to AD: %s",
+ ads_errstr(status));
+ return status;
+ }
}
status = ads_leave_realm(r->in.ads, r->in.machine_name);
--
Samba Shared Repository
More information about the samba-cvs
mailing list