summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2007-12-19 10:52:45 +0100
committerGünther Deschner <gd@samba.org>2007-12-21 15:29:11 +0100
commit14652eab180fa9555607a413e5d1b429d1e1673c (patch)
tree834fa1af44bb2302ec27f16de626f1e3eb51a9c4 /source3/lib
parentd1548d035f3c296d5044b9aa47fc350cb62e4e2d (diff)
downloadsamba-14652eab180fa9555607a413e5d1b429d1e1673c.tar.gz
samba-14652eab180fa9555607a413e5d1b429d1e1673c.tar.bz2
samba-14652eab180fa9555607a413e5d1b429d1e1673c.zip
Fix NetJoinDomainLocal.
Guenther (This used to be commit 24605c9175fb313c9c888783817da755cd8ce594)
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/netapi/joindomain.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index c6bf3d687a..180210f707 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -43,10 +43,7 @@ static WERROR NetJoinDomainLocal(struct libnetapi_ctx *mem_ctx,
r->in.domain_name = talloc_strdup(mem_ctx, domain_name);
W_ERROR_HAVE_NO_MEMORY(r->in.domain_name);
- if (server_name) {
- r->in.server_name = talloc_strdup(mem_ctx, server_name);
- W_ERROR_HAVE_NO_MEMORY(r->in.server_name);
- } else if (join_flags & WKSSVC_JOIN_FLAGS_JOIN_TYPE) {
+ if (join_flags & WKSSVC_JOIN_FLAGS_JOIN_TYPE) {
NTSTATUS status;
struct DS_DOMAIN_CONTROLLER_INFO *info = NULL;
uint32_t flags = DS_DIRECTORY_SERVICE_REQUIRED |