summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2006-01-14 07:27:01 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:51:08 -0500
commit243e07cfa2c9fc52867ebfa2b7d0f78247e0fecd (patch)
tree1b19fcc3d6ae093d559f591fd93deaf3480cbe8e
parent747b5cce535c51d78000bdf86d0ef8f35860624d (diff)
downloadsamba-243e07cfa2c9fc52867ebfa2b7d0f78247e0fecd.tar.gz
samba-243e07cfa2c9fc52867ebfa2b7d0f78247e0fecd.tar.bz2
samba-243e07cfa2c9fc52867ebfa2b7d0f78247e0fecd.zip
r12930: Fix ADS join: I wasn't filling in the flag 'realm' variable any more.
Andrew Bartlett (This used to be commit 5c5a2974c94ae6b929ada7aaa2cd12a15b7468b8)
-rw-r--r--source4/libnet/libnet_join.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c
index 0147679bcd..a467999023 100644
--- a/source4/libnet/libnet_join.c
+++ b/source4/libnet/libnet_join.c
@@ -593,8 +593,6 @@ NTSTATUS libnet_JoinDomain(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, stru
struct dom_sid *account_sid = NULL;
const char *password_str = NULL;
- const char *realm = NULL; /* Also flag for remote being AD */
-
r->out.error_string = NULL;
r2.samr_handle.out.error_string = NULL;
@@ -988,7 +986,7 @@ NTSTATUS libnet_JoinDomain(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, stru
/* Now, if it was AD, then we want to start looking changing a
* few more things. Otherwise, we are done. */
- if (realm) {
+ if (r->out.realm) {
status = libnet_JoinADSDomain(ctx, r);
return status;
}