svn commit: samba r9565 - in branches/SOC/SAMBA_4_0: . source/libnet
brad at samba.org
brad at samba.org
Wed Aug 24 04:09:46 GMT 2005
Author: brad
Date: 2005-08-24 04:09:46 +0000 (Wed, 24 Aug 2005)
New Revision: 9565
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9565
Log:
r5616 at buttercup: j0j0 | 2005-08-23 22:17:12 -0600
Small fix, if r->out.error_string and r2->samr_handle.out.error_string weren't set to NULL, torture_join_domain() would segfault on the second join.
Modified:
branches/SOC/SAMBA_4_0/
branches/SOC/SAMBA_4_0/source/libnet/libnet_join.c
Changeset:
Property changes on: branches/SOC/SAMBA_4_0
___________________________________________________________________
Name: svk:merge
- 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:9550
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5614
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5609
+ 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:9550
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5616
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5609
Modified: branches/SOC/SAMBA_4_0/source/libnet/libnet_join.c
===================================================================
--- branches/SOC/SAMBA_4_0/source/libnet/libnet_join.c 2005-08-24 03:43:11 UTC (rev 9564)
+++ branches/SOC/SAMBA_4_0/source/libnet/libnet_join.c 2005-08-24 04:09:46 UTC (rev 9565)
@@ -82,6 +82,8 @@
const char *domain_name = NULL;
const char *realm = NULL; /* Also flag for remote being AD */
+ r->out.error_string = NULL;
+
tmp_ctx = talloc_named(mem_ctx, 0, "libnet_Join temp context");
if (!tmp_ctx) {
r->out.error_string = NULL;
@@ -91,7 +93,7 @@
u_handle = talloc(tmp_ctx, struct policy_handle);
r2 = talloc(tmp_ctx, union libnet_SetPassword);
-
+ r2->samr_handle.out.error_string = NULL;
/* prepare connect to the LSA pipe of PDC */
c.level = LIBNET_RPC_CONNECT_PDC;
c.in.domain_name = r->in.domain_name;
@@ -422,11 +424,7 @@
r->out.samr_pipe = talloc_steal(r, samr_pipe);
r->out.samr_binding = talloc_steal(r, samr_binding);
r->out.user_handle = talloc_steal(r, u_handle);
- r->out.error_string = NULL;
- /* r->out.error_string = talloc_steal(r, r2->samr_handle.out.error_string); */
- /* Uncommenting the line above segfaults torture_join_domain() on the second join.
- have not yet investigated why.
- */
+ r->out.error_string = talloc_steal(r, r2->samr_handle.out.error_string);
/* Now, if it was AD, then we want to start looking changing a
* few more things. Otherwise, we are done. */
More information about the samba-cvs
mailing list