summaryrefslogtreecommitdiff
path: root/source4/libcli/util
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2004-08-22 05:33:07 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:58:15 -0500
commitdcd43a4cbef3bee948bdbd65212361b6043aa4bd (patch)
tree82627a8ab414d6fe86e77e4d4ff589bb00fc5e4d /source4/libcli/util
parentca885cb2d1b0165a6e8c819b82ad9d13de9643ec (diff)
downloadsamba-dcd43a4cbef3bee948bdbd65212361b6043aa4bd.tar.gz
samba-dcd43a4cbef3bee948bdbd65212361b6043aa4bd.tar.bz2
samba-dcd43a4cbef3bee948bdbd65212361b6043aa4bd.zip
r1990: 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 (This used to be commit 4294be44057124568fe1d176702056bb62ad3214)
Diffstat (limited to 'source4/libcli/util')
-rw-r--r--source4/libcli/util/asn1.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/libcli/util/asn1.c b/source4/libcli/util/asn1.c
index 1f04e1fe46..293213a2d0 100644
--- a/source4/libcli/util/asn1.c
+++ b/source4/libcli/util/asn1.c
@@ -454,7 +454,7 @@ BOOL asn1_read_OID(ASN1_DATA *data, char **OID)
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 @@ BOOL asn1_read_OID(ASN1_DATA *data, char **OID)
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);