krb4-fixes for the moved user+password fields within the structs

diff --git a/lib/ftp.c b/lib/ftp.c
index 2f395eff085120867ba40dfbad550d03c0630775..c57b42d119e676e554e4f6724c8a51397d74c4a5 100644 (file)
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -512,7 +512,7 @@ CURLcode Curl_ftp_connect(struct connectdata *conn)
     /* we may need to issue a KAUTH here to have access to the files
      * do it if user supplied a password
      */
-    if(data->state.passwd && *data->state.passwd) {
+    if(conn->passwd && *conn->passwd) {
       result = Curl_krb_kauth(conn);
       if(result)
         return result;

diff --git a/lib/krb4.c b/lib/krb4.c
index b80ea390e2fd2c9c7f41b41aaedfbcba0fc79856..71fdea131545145e8d5cf1755b5716a3ce48c271 100644 (file)
--- a/lib/krb4.c
+++ b/lib/krb4.c
@@ -363,7 +363,7 @@ CURLcode Curl_krb_kauth(struct connectdata *conn)
   for(; *p && *p != ' ' && *p != '\r' && *p != '\n'; p++);
   *p = 0;
 
-  des_string_to_key (conn->data->state.passwd, &key);
+  des_string_to_key (conn->passwd, &key);
   des_key_sched(&key, schedule);
     
   des_pcbc_encrypt((void *)tkt.dat, (void *)tktcopy.dat,