r24614: Merge with current lorikeet-heimdal. This brings us one step closer

[jelmer/samba4-debian.git] / source / heimdal / lib / krb5 / changepw.c

diff --git a/source/heimdal/lib/krb5/changepw.c b/source/heimdal/lib/krb5/changepw.c
index 3ceb6df89cabb60b825003ad04e563178274738f..703cf43eb6fb99b6c9a5821f7d57c82a160e580b 100644 (file)
--- a/source/heimdal/lib/krb5/changepw.c
+++ b/source/heimdal/lib/krb5/changepw.c
@@ -33,7 +33,7 @@
 
 #include <krb5_locl.h>
 
-RCSID("$Id: changepw.c 17442 2006-05-05 09:31:15Z lha $");
+RCSID("$Id: changepw.c 21505 2007-07-12 12:28:38Z lha $");
 
 static void
 str2data (krb5_data *d,
@@ -46,10 +46,12 @@ str2data (krb5_data *d,
          ...)
 {
     va_list args;
+    char *str;
 
     va_start(args, fmt);
-    d->length = vasprintf ((char **)&d->data, fmt, args);
+    d->length = vasprintf (&str, fmt, args);
     va_end(args);
+    d->data = str;
 }
 
 /*