From b239612fcf199cfeba5c93535f70d3cdd880a5bf Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 15 Jan 2008 15:28:39 +0100 Subject: Use autogenerated libnet_join header. Guenther (This used to be commit d94bd3a03b574b3fdddd62add25b0c04673500a3) --- source3/libnet/libnet.h | 2 +- source3/libnet/libnet_join.h | 75 -------------------------------------------- 2 files changed, 1 insertion(+), 76 deletions(-) delete mode 100644 source3/libnet/libnet_join.h (limited to 'source3/libnet') 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.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 . - */ - -#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 -- cgit From 40222cc8e211c9d82a75d57b802ced11172937e5 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 15 Jan 2008 15:48:48 +0100 Subject: Remove unrequired TALLOC_FREE. Guenther (This used to be commit 15d0e574386e39a4d2fa61cd268b48dfa5c84dcb) --- source3/libnet/libnet_join.c | 1 - 1 file changed, 1 deletion(-) (limited to 'source3/libnet') diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c index c60f4c9803..ce3a5969a4 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); -- cgit From fe165e4a9f9d203d66aef15075a7ca89098a720c Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 15 Jan 2008 17:00:14 +0100 Subject: Use autogenerated debugging functions in libnetjoin when requested. Guenther (This used to be commit 08c1720509dffa2886ed057e2d14907699122f3c) --- source3/libnet/libnet_join.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'source3/libnet') diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c index ce3a5969a4..a189a38ea3 100644 --- a/source3/libnet/libnet_join.c +++ b/source3/libnet/libnet_join.c @@ -1213,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; @@ -1230,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; } @@ -1320,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; @@ -1338,5 +1349,9 @@ WERROR libnet_Unjoin(TALLOC_CTX *mem_ctx, } done: + if (r->in.debug) { + NDR_PRINT_OUT_DEBUG(libnet_UnjoinCtx, r); + } + return werr; } -- cgit