summaryrefslogtreecommitdiff
path: root/source3/libnet/libnet_join.c
diff options
context:
space:
mode:
authorGerald (Jerry) Carter <jerry@samba.org>2008-01-15 10:47:07 -0600
committerGerald (Jerry) Carter <jerry@samba.org>2008-01-15 10:47:07 -0600
commit43ddf12ef9ed400a3116c169700244ea137e593f (patch)
treeb1a128d74c7db4883f196ef8f1f79644a64cf43f /source3/libnet/libnet_join.c
parent64e5f2fd8033b14d84d468fde32ac220d82aedb8 (diff)
parentee8cf0ce40820b3e1ec025339f2b25c0001fda13 (diff)
downloadsamba-43ddf12ef9ed400a3116c169700244ea137e593f.tar.gz
samba-43ddf12ef9ed400a3116c169700244ea137e593f.tar.bz2
samba-43ddf12ef9ed400a3116c169700244ea137e593f.zip
Merge commit 'samba/v3-2-test' into v3-2-stable
(This used to be commit 5a527476a07ea43178dc5afeaf8ad78da8a4080c)
Diffstat (limited to 'source3/libnet/libnet_join.c')
-rw-r--r--source3/libnet/libnet_join.c16
1 files changed, 15 insertions, 1 deletions
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;
}