Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test

(This used to be commit f963d57096184dd9381fcc5f175150d27460ea7a)

3 files changed, 16 insertions, 77 deletions

diff --git a/source3/libnet/libnet.h b/source3/libnet/libnet.h
index d6238ca982..97e720f617 100644
--- a/source3/libnet/libnet.h
+++ b/source3/libnet/libnet.h
@@ -20,7 +20,7 @@
 #ifndef __LIBNET_H__
 #define __LIBNET_H__
 
-#include "libnet/libnet_join.h"
+#include "librpc/gen_ndr/libnet_join.h"
 #include "libnet/libnet_conf.h"
 #include "libnet/libnet_proto.h"
 
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index c60f4c9803..a189a38ea3 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -236,7 +236,6 @@ static ADS_STATUS libnet_join_find_machine_acct(TALLOC_CTX *mem_ctx,
 		goto done;
 	}
 
-	TALLOC_FREE(r->out.dn);
 	r->out.dn = talloc_strdup(mem_ctx, dn);
 	if (!r->out.dn) {
 		status = ADS_ERROR_LDAP(LDAP_NO_MEMORY);
@@ -1214,6 +1213,10 @@ WERROR libnet_Join(TALLOC_CTX *mem_ctx,
 {
 	WERROR werr;
 
+	if (r->in.debug) {
+		NDR_PRINT_IN_DEBUG(libnet_JoinCtx, r);
+	}
+
 	werr = libnet_join_pre_processing(mem_ctx, r);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -1231,6 +1234,9 @@ WERROR libnet_Join(TALLOC_CTX *mem_ctx,
 		goto done;
 	}
  done:
+	if (r->in.debug) {
+		NDR_PRINT_OUT_DEBUG(libnet_JoinCtx, r);
+	}
 	return werr;
 }
 
@@ -1321,6 +1327,10 @@ WERROR libnet_Unjoin(TALLOC_CTX *mem_ctx,
 {
 	WERROR werr;
 
+	if (r->in.debug) {
+		NDR_PRINT_IN_DEBUG(libnet_UnjoinCtx, r);
+	}
+
 	werr = libnet_unjoin_pre_processing(mem_ctx, r);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -1339,5 +1349,9 @@ WERROR libnet_Unjoin(TALLOC_CTX *mem_ctx,
 	}
 
  done:
+	if (r->in.debug) {
+		NDR_PRINT_OUT_DEBUG(libnet_UnjoinCtx, r);
+	}
+
 	return werr;
 }
diff --git a/source3/libnet/libnet_join.h b/source3/libnet/libnet_join.h
deleted file mode 100644
index c47e8d934c..0000000000
--- a/source3/libnet/libnet_join.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- *  Unix SMB/CIFS implementation.
- *  libnet Join Support
- *  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
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __LIBNET_JOIN_H__
-#define __LIBNET_JOIN_H__
-
-struct libnet_JoinCtx {
-	struct {
-		const char *dc_name;
-		const char *machine_name;
-		const char *domain_name;
-		const char *account_ou;
-		const char *admin_account;
-		const char *admin_password;
-		const char *machine_password;
-		uint32_t join_flags;
-		const char *os_version;
-		const char *os_name;
-		bool create_upn;
-		const char *upn;
-		bool modify_config;
-		struct ads_struct *ads;
-		bool debug;
-	} in;
-
-	struct {
-		char *account_name;
-		char *netbios_domain_name;
-		char *dns_domain_name;
-		char *dn;
-		struct dom_sid *domain_sid;
-		bool modified_config;
-		WERROR result;
-		char *error_string;
-		bool domain_is_ad;
-	} out;
-};
-
-struct libnet_UnjoinCtx {
-	struct {
-		const char *dc_name;
-		const char *machine_name;
-		const char *domain_name;
-		const char *admin_account;
-		const char *admin_password;
-		uint32_t unjoin_flags;
-		bool modify_config;
-		struct dom_sid *domain_sid;
-		struct ads_struct *ads;
-	} in;
-
-	struct {
-		bool modified_config;
-		WERROR result;
-		char *error_string;
-	} out;
-};
-
-#endif