diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2004-08-22 05:33:07 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:58:15 -0500 |
| commit | dcd43a4cbef3bee948bdbd65212361b6043aa4bd (patch) | |
| tree | 82627a8ab414d6fe86e77e4d4ff589bb00fc5e4d | |
| parent | ca885cb2d1b0165a6e8c819b82ad9d13de9643ec (diff) | |
| download | samba-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)
| -rw-r--r-- | source4/gtk/common/gtk-smb.c | 4 | ||||
| -rw-r--r-- | source4/lib/registry/reg_backend_ldb/reg_backend_ldb.c | 4 | ||||
| -rw-r--r-- | source4/libcli/util/asn1.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source4/gtk/common/gtk-smb.c b/source4/gtk/common/gtk-smb.c index 7d15469c34..310b7a1b92 100644 --- a/source4/gtk/common/gtk-smb.c +++ b/source4/gtk/common/gtk-smb.c @@ -300,11 +300,11 @@ const char *gtk_rpc_binding_dialog_get_binding(GtkRpcBindingDialog *d, char *pip } 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) { diff --git a/source4/lib/registry/reg_backend_ldb/reg_backend_ldb.c b/source4/lib/registry/reg_backend_ldb/reg_backend_ldb.c index fa7e22d010..6945ebdb55 100644 --- a/source4/lib/registry/reg_backend_ldb/reg_backend_ldb.c +++ b/source4/lib/registry/reg_backend_ldb/reg_backend_ldb.c @@ -28,7 +28,7 @@ static char *reg_path_to_ldb(TALLOC_CTX *mem_ctx, const char *path, const char * 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 @@ static char *reg_path_to_ldb(TALLOC_CTX *mem_ctx, const char *path, const char * 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'; 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); |