modified to use the renamed kerberos functions with Curl_ prefix

diff --git a/lib/ftp.c b/lib/ftp.c
index 2fdf7d5..75ddbe9 100644 (file)
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -289,13 +289,13 @@ int Curl_GetFTPResponse(int sockfd,
   /* FIXME: some errorchecking perhaps... ***/
   switch(code) {
   case 631:
-    sec_read_msg(conn, buf, prot_safe);
+    Curl_sec_read_msg(conn, buf, prot_safe);
     break;
   case 632:
-    sec_read_msg(conn, buf, prot_private);
+    Curl_sec_read_msg(conn, buf, prot_private);
     break;
   case 633:
-    sec_read_msg(conn, buf, prot_confidential);
+    Curl_sec_read_msg(conn, buf, prot_confidential);
     break;
   default:
     /* normal ftp stuff we pass through! */
@@ -392,13 +392,13 @@ CURLcode Curl_ftp_connect(struct connectdata *conn)
   if(data->bits.krb4) {
 
     /* request data protection level (default is 'clear') */
-    sec_request_prot(conn, "private");
+    Curl_sec_request_prot(conn, "private");
 
     /* We set private first as default, in case the line below fails to
        set a valid level */
-    sec_request_prot(conn, data->krb4_level);
+    Curl_sec_request_prot(conn, data->krb4_level);
 
-    if(sec_login(conn) != 0)
+    if(Curl_sec_login(conn) != 0)
       infof(data, "Logging in with password in cleartext!\n");
     else
       infof(data, "Authentication successful\n");
@@ -453,13 +453,13 @@ CURLcode Curl_ftp_connect(struct connectdata *conn)
         * now set the requested protection level
         */
     if(conn->sec_complete)
-      sec_set_protection_level(conn);
+      Curl_sec_set_protection_level(conn);
 
     /* we may need to issue a KAUTH here to have access to the files
      * do it if user supplied a password
      */
     if(conn->data->passwd && *conn->data->passwd)
-      krb_kauth(conn);
+      Curl_krb_kauth(conn);
 #endif
   }
   else {
@@ -554,7 +554,7 @@ CURLcode Curl_ftp_done(struct connectdata *conn)
   }
 
 #ifdef KRB4
-  sec_fflush_fd(conn, conn->secondarysocket);
+  Curl_sec_fflush_fd(conn, conn->secondarysocket);
 #endif
   /* shut down the socket to inform the server we're done */
   sclose(conn->secondarysocket);

diff --git a/lib/http.c b/lib/http.c
index ba96856..5dd1e49 100644 (file)
--- a/lib/http.c
+++ b/lib/http.c
@@ -770,7 +770,7 @@ CURLcode Curl_http(struct connectdata *conn)
            * actually send. Let's make a NULL pointer equal "" here. Good/bad
            * ?
            */
-          data->postfields = "";
+          data->postfields = (char *)"";
           data->postfieldsize = 0; /* it might been set to something illegal,
                                       anything > 0 would be! */
         }

diff --git a/lib/security.h b/lib/security.h
index 8241587..b2543ab 100644 (file)
--- a/lib/security.h
+++ b/lib/security.h
@@ -45,7 +45,7 @@ struct Curl_sec_client_mech {
 #define AUTH_CONTINUE  1
 #define AUTH_ERROR     2
 
-extern struct Curl_sec_client_mech krb4_client_mech, gss_client_mech;
+extern struct Curl_sec_client_mech Curl_krb4_client_mech;
 
 int Curl_sec_fflush_fd(struct connectdata *conn, int fd);
 int Curl_sec_fprintf (struct connectdata *, FILE *, const char *, ...);
@@ -66,7 +66,7 @@ int Curl_sec_request_prot (struct connectdata *conn, const char *level);
 void Curl_sec_set_protection_level(struct connectdata *conn);
 void Curl_sec_status (void);
 
-enum protection_level set_command_prot(struct connectdata *,
-                                       enum protection_level);
+enum protection_level Curl_set_command_prot(struct connectdata *,
+                                            enum protection_level);
 
 #endif

diff --git a/lib/sendf.c b/lib/sendf.c
index 3e49657..6097919 100644 (file)
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -201,7 +201,7 @@ CURLcode Curl_write(struct connectdata *conn, int sockfd,
 #endif
 #ifdef KRB4
     if(conn->sec_complete) {
-      bytes_written = sec_write(conn, sockfd, mem, len);
+      bytes_written = Curl_sec_write(conn, sockfd, mem, len);
     }
     else
 #endif /* KRB4 */
@@ -280,7 +280,7 @@ CURLcode Curl_read(struct connectdata *conn, int sockfd,
 #endif
 #ifdef KRB4
     if(conn->sec_complete)
-      nread = sec_read(conn, sockfd, buf, buffersize);
+      nread = Curl_sec_read(conn, sockfd, buf, buffersize);
     else
 #endif
       nread = sread (sockfd, buf, buffersize);