summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-01-04 17:01:52 +0100
committerGünther Deschner <gd@samba.org>2008-01-04 17:43:02 +0100
commit0399df22f0f0999338e48d7b9598a7b2f7b9aab5 (patch)
treecdf4f3bfd9fd61851eb4997298d207bc55774f85 /source3/lib
parent1c183874abaad10188c9f9bf1db2863cbd4d1cef (diff)
downloadsamba-0399df22f0f0999338e48d7b9598a7b2f7b9aab5.tar.gz
samba-0399df22f0f0999338e48d7b9598a7b2f7b9aab5.tar.bz2
samba-0399df22f0f0999338e48d7b9598a7b2f7b9aab5.zip
In libnet_join finally separate the admin from the machine pwd entirely.
Guenther (This used to be commit d88bb94f0ef00ddbb48498797bd11448e0d74645)
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/netapi/joindomain.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index d200c9b7b0..921f816cbe 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -1,7 +1,7 @@
/*
* Unix SMB/CIFS implementation.
* NetApi Join Support
- * Copyright (C) Guenther Deschner 2007
+ * Copyright (C) Guenther Deschner 2007-2008
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -69,8 +69,8 @@ static WERROR NetJoinDomainLocal(struct libnetapi_ctx *mem_ctx,
}
if (password) {
- r->in.password = talloc_strdup(mem_ctx, password);
- W_ERROR_HAVE_NO_MEMORY(r->in.password);
+ r->in.admin_password = talloc_strdup(mem_ctx, password);
+ W_ERROR_HAVE_NO_MEMORY(r->in.admin_password);
}
r->in.join_flags = join_flags;
@@ -254,8 +254,8 @@ static WERROR NetUnjoinDomainLocal(struct libnetapi_ctx *mem_ctx,
}
if (password) {
- r->in.password = talloc_strdup(mem_ctx, password);
- W_ERROR_HAVE_NO_MEMORY(r->in.password);
+ r->in.admin_password = talloc_strdup(mem_ctx, password);
+ W_ERROR_HAVE_NO_MEMORY(r->in.admin_password);
}
r->in.unjoin_flags = unjoin_flags;