Author: abartlet Date: 2004-08-22 05:33:07 +0000 (Sun, 22 Aug 2004) New Revision: 1990
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source&rev=1990&nolog=1 Log: Fix breakage caused by the recent talloc changes. (Failure to process an SPNEGO login from WinXP at least). talloc_asprintf_append() lost an argument, but because TALLOC_CTX is now a void*, this was not picked up by the compiler. I've tested the login (asn1), but not the registry/gtk changes. Andrew Bartlett Modified: branches/SAMBA_4_0/source/gtk/common/gtk-smb.c branches/SAMBA_4_0/source/lib/registry/reg_backend_ldb/reg_backend_ldb.c branches/SAMBA_4_0/source/libcli/util/asn1.c Changeset: Modified: branches/SAMBA_4_0/source/gtk/common/gtk-smb.c =================================================================== --- branches/SAMBA_4_0/source/gtk/common/gtk-smb.c 2004-08-21 18:15:07 UTC (rev 1989) +++ branches/SAMBA_4_0/source/gtk/common/gtk-smb.c 2004-08-22 05:33:07 UTC (rev 1990) @@ -300,11 +300,11 @@ } if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(d->chk_seal))) { - options = talloc_asprintf_append(d->mem_ctx, options, ",seal"); + options = talloc_asprintf_append(options, ",seal"); } if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(d->chk_sign))) { - options = talloc_asprintf_append(d->mem_ctx, options, ",sign"); + options = talloc_asprintf_append(options, ",sign"); } if(options) { Modified: branches/SAMBA_4_0/source/lib/registry/reg_backend_ldb/reg_backend_ldb.c =================================================================== --- branches/SAMBA_4_0/source/lib/registry/reg_backend_ldb/reg_backend_ldb.c 2004-08-21 18:15:07 UTC (rev 1989) +++ branches/SAMBA_4_0/source/lib/registry/reg_backend_ldb/reg_backend_ldb.c 2004-08-22 05:33:07 UTC (rev 1990) @@ -28,7 +28,7 @@ char *end = mypath, *begin; if(add) - ret = talloc_asprintf_append(mem_ctx, ret, "%s", add); + ret = talloc_asprintf_append(ret, "%s", add); while(end) { char *keyname; @@ -38,7 +38,7 @@ else keyname = mypath; if(strlen(keyname)) - ret = talloc_asprintf_append(mem_ctx, ret, "key=%s,", keyname); + ret = talloc_asprintf_append(ret, "key=%s,", keyname); if(begin) { begin[0] = '\0'; Modified: branches/SAMBA_4_0/source/libcli/util/asn1.c =================================================================== --- branches/SAMBA_4_0/source/libcli/util/asn1.c 2004-08-21 18:15:07 UTC (rev 1989) +++ branches/SAMBA_4_0/source/libcli/util/asn1.c 2004-08-22 05:33:07 UTC (rev 1990) @@ -454,7 +454,7 @@ asn1_read_uint8(data, &b); tmp_oid = talloc_asprintf(mem_ctx, "%u", b/40); - tmp_oid = talloc_asprintf_append(mem_ctx, tmp_oid, " %u", b%40); + tmp_oid = talloc_asprintf_append(tmp_oid, " %u", b%40); while (!data->has_error && asn1_tag_remaining(data) > 0) { uint_t v = 0; @@ -462,7 +462,7 @@ asn1_read_uint8(data, &b); v = (v<<7) | (b&0x7f); } while (!data->has_error && b & 0x80); - tmp_oid = talloc_asprintf_append(mem_ctx, tmp_oid, " %u", v); + tmp_oid = talloc_asprintf_append(tmp_oid, " %u", v); } asn1_end_tag(data);
