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

diff --git a/source/gtk/common/gtk-smb.c b/source/gtk/common/gtk-smb.c
index 7d15469c347163fb46f9b02dc402b7abcd3e80a5..310b7a1b92631e6f40e2c9a8bf3c1d35418234d7 100644 (file)
--- a/source/gtk/common/gtk-smb.c
+++ b/source/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/source/lib/registry/reg_backend_ldb/reg_backend_ldb.c b/source/lib/registry/reg_backend_ldb/reg_backend_ldb.c
index fa7e22d010dabbaac43c8b5928c8ff660035edaa..6945ebdb55e50adcd0d55eb32baa5f7c7f65b164 100644 (file)
--- a/source/lib/registry/reg_backend_ldb/reg_backend_ldb.c
+++ b/source/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/source/libcli/util/asn1.c b/source/libcli/util/asn1.c
index 1f04e1fe46221a891abfd4a170239fc09b16a597..293213a2d0a2cf4288ae29db440755130ea379aa 100644 (file)
--- a/source/libcli/util/asn1.c
+++ b/source/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);