Author: brad Date: 2005-08-18 03:15:48 +0000 (Thu, 18 Aug 2005) New Revision: 9376
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9376 Log: [EMAIL PROTECTED]: j0j0 | 2005-08-17 21:24:33 -0600 Proof that I shouldn't code when i'm tired (silly bugfixes). Modified: branches/SOC/SAMBA_4_0/ branches/SOC/SAMBA_4_0/source/libnet/libnet_join.c branches/SOC/SAMBA_4_0/source/torture/nbt/dgram.c branches/SOC/SAMBA_4_0/source/torture/rpc/netlogon.c branches/SOC/SAMBA_4_0/source/torture/rpc/testjoin.c Changeset: Property changes on: branches/SOC/SAMBA_4_0 ___________________________________________________________________ Name: svk:merge - 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:9374 d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5474 d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5472 + 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:9374 d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5476 d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5472 Modified: branches/SOC/SAMBA_4_0/source/libnet/libnet_join.c =================================================================== --- branches/SOC/SAMBA_4_0/source/libnet/libnet_join.c 2005-08-18 03:04:50 UTC (rev 9375) +++ branches/SOC/SAMBA_4_0/source/libnet/libnet_join.c 2005-08-18 03:15:48 UTC (rev 9376) @@ -672,7 +672,7 @@ } r2.in.domain_name = r->in.domain_name; - if ((r2.in.netbios_name != NULL) && (r2.in.level != LIBNET_JOIN_AUTOMATIC)) { + if ((r->in.netbios_name != NULL) && (r->in.level != LIBNET_JOIN_AUTOMATIC)) { r2.in.netbios_name = r->in.netbios_name; } else { r2.in.netbios_name = talloc_asprintf(mem_ctx, "%s", lp_netbios_name()); Modified: branches/SOC/SAMBA_4_0/source/torture/nbt/dgram.c =================================================================== --- branches/SOC/SAMBA_4_0/source/torture/nbt/dgram.c 2005-08-18 03:04:50 UTC (rev 9375) +++ branches/SOC/SAMBA_4_0/source/torture/nbt/dgram.c 2005-08-18 03:15:48 UTC (rev 9376) @@ -217,7 +217,7 @@ const char *password; const char *dom_sid; - join_ctx = torture_join_domain(TEST_NAME, lp_workgroup(), + join_ctx = torture_join_domain(mem_ctx, TEST_NAME, lp_workgroup(), ACB_WSTRUST, &password); if (join_ctx == NULL) { printf("Failed to join domain %s as %s\n", lp_workgroup(), TEST_NAME); Modified: branches/SOC/SAMBA_4_0/source/torture/rpc/netlogon.c =================================================================== --- branches/SOC/SAMBA_4_0/source/torture/rpc/netlogon.c 2005-08-18 03:04:50 UTC (rev 9375) +++ branches/SOC/SAMBA_4_0/source/torture/rpc/netlogon.c 2005-08-18 03:15:48 UTC (rev 9376) @@ -1361,7 +1361,7 @@ mem_ctx = talloc_init("torture_rpc_netlogon"); - join_ctx = torture_join_domain(TEST_MACHINE_NAME, lp_workgroup(), ACB_SVRTRUST, + join_ctx = torture_join_domain(mem_ctx, TEST_MACHINE_NAME, lp_workgroup(), ACB_SVRTRUST, &machine_password); if (!join_ctx) { talloc_free(mem_ctx); Modified: branches/SOC/SAMBA_4_0/source/torture/rpc/testjoin.c =================================================================== --- branches/SOC/SAMBA_4_0/source/torture/rpc/testjoin.c 2005-08-18 03:04:50 UTC (rev 9375) +++ branches/SOC/SAMBA_4_0/source/torture/rpc/testjoin.c 2005-08-18 03:15:48 UTC (rev 9376) @@ -292,7 +292,6 @@ libnet_ctx = libnet_context_init(NULL); if (libnet_ctx == NULL) { - talloc_free(mem_ctx); return NULL; } libnet_ctx->cred = cmdline_credentials; @@ -308,9 +307,9 @@ status = libnet_Join(libnet_ctx, mem_ctx, &libnet_r); if (!NT_STATUS_IS_OK(status)) { - talloc_free(mem_ctx); return NULL; } + tj = talloc(mem_ctx, struct test_join); tj->p = libnet_r.out.samr_pipe; tj->user_handle = libnet_r.out.user_handle; tj->dom_sid = dom_sid_string(mem_ctx, libnet_r.out.domain_sid);
