copy_addrs.c fwd_tgt.c mk_cred.c sendauth.c: Added FAR declarations

[krb5.git] / src / lib / krb5 / krb / mk_cred.c

diff --git a/src/lib/krb5/krb/mk_cred.c b/src/lib/krb5/krb/mk_cred.c
index ceb8678ad51897e6f9b3ce7fdd17592477a46de7..23545fb612b224c26417906d1841b35e9c991d9a 100644 (file)
--- a/src/lib/krb5/krb/mk_cred.c
+++ b/src/lib/krb5/krb/mk_cred.c
@@ -109,33 +109,37 @@ clean_scratch:
 static krb5_error_code
 krb5_mk_ncred_basic(context, ppcreds, nppcreds, keyblock,                 
                    replaydata, local_addr, remote_addr, pcred)
-    krb5_context         context;
-    krb5_creds                ** ppcreds;
-    krb5_int32                   nppcreds;
-    krb5_keyblock      * keyblock;
-    krb5_replay_data    * replaydata;
-    krb5_address       * local_addr;
-    krb5_address       * remote_addr;
-    krb5_cred          * pcred;
+    krb5_context       context;
+    krb5_creds                 FAR * FAR * ppcreds;
+    krb5_int32                 nppcreds;
+    krb5_keyblock      FAR * keyblock;
+    krb5_replay_data    FAR * replaydata;
+    krb5_address       FAR * local_addr;
+    krb5_address       FAR * remote_addr;
+    krb5_cred          FAR * pcred;
 {
     krb5_cred_enc_part           credenc;
     krb5_error_code      retval;
+    size_t               size;
     int                          i;
 
     credenc.magic = KV5M_CRED_ENC_PART;
 
-    credenc.s_address = local_addr;
-    credenc.r_address = remote_addr;
+    credenc.s_address = 0;
+    credenc.r_address = 0;
+    if (local_addr) krb5_copy_addr(context, local_addr, &credenc.s_address);
+    if (remote_addr) krb5_copy_addr(context, remote_addr, &credenc.r_address);
+
     credenc.nonce = replaydata->seq;
     credenc.usec = replaydata->usec;
     credenc.timestamp = replaydata->timestamp;
 
     /* Get memory for creds and initialize it */
-    if ((credenc.ticket_info = (krb5_cred_info **)
-               malloc((size_t) (sizeof(krb5_cred_info *) * (nppcreds + 1)))) == NULL) {
-        return ENOMEM;
-    }
-    memset(credenc.ticket_info, 0, sizeof(krb5_cred_info *) * (nppcreds + 1));
+    size = sizeof(krb5_cred_info FAR *) * (nppcreds + 1);
+    credenc.ticket_info = (krb5_cred_info FAR * FAR *) malloc(size);
+    if (credenc.ticket_info == NULL)
+       return ENOMEM;
+    memset(credenc.ticket_info, 0, size);
     
     /*
      * For each credential in the list, initialize a cred info
@@ -194,24 +198,24 @@ cleanup:
  * This functions takes as input an array of krb5_credentials, and
  * outputs an encoded KRB_CRED message suitable for krb5_rd_cred
  */
-krb5_error_code INTERFACE
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_mk_ncred(context, auth_context, ppcreds, ppdata, outdata)
 
     krb5_context         context;
     krb5_auth_context    auth_context;
-    krb5_creds                ** ppcreds;
-    krb5_data         ** ppdata;
-    krb5_replay_data   * outdata;
+    krb5_creds                FAR * FAR * ppcreds;
+    krb5_data         FAR * FAR * ppdata;
+    krb5_replay_data   FAR * outdata;
 {
-    krb5_address * premote_fulladdr = NULL;
-    krb5_address * plocal_fulladdr = NULL;
+    krb5_address FAR * premote_fulladdr = NULL;
+    krb5_address FAR * plocal_fulladdr = NULL;
     krb5_address remote_fulladdr;
     krb5_address local_fulladdr;
-    krb5_error_code      retval;
-    krb5_keyblock      * keyblock;
-    krb5_replay_data      replaydata;
-    krb5_cred          * pcred;
-    int                          ncred;
+    krb5_error_code    retval;
+    krb5_keyblock      FAR * keyblock;
+    krb5_replay_data    replaydata;
+    krb5_cred          FAR * pcred;
+    krb5_int32         ncred;
 
     local_fulladdr.contents = 0;
     remote_fulladdr.contents = 0;
@@ -231,11 +235,11 @@ krb5_mk_ncred(context, auth_context, ppcreds, ppdata, outdata)
     memset(pcred, 0, sizeof(krb5_cred));
 
     if ((pcred->tickets 
-      = (krb5_ticket **)malloc(sizeof(krb5_ticket *) * (ncred + 1))) == NULL) {
+      = (krb5_ticket FAR * FAR *)malloc(sizeof(krb5_ticket FAR *) * (ncred + 1))) == NULL) {
        retval = ENOMEM;
        free(pcred);
     }
-    memset(pcred->tickets, 0, sizeof(krb5_ticket *) * (ncred +1));
+    memset(pcred->tickets, 0, sizeof(krb5_ticket FAR *) * (ncred +1));
 
     /* Get keyblock */
     if ((keyblock = auth_context->local_subkey) == NULL) 
@@ -342,18 +346,18 @@ error:
 /*
  * A convenience function that calls krb5_mk_ncred.
  */
-krb5_error_code INTERFACE
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_mk_1cred(context, auth_context, pcreds, ppdata, outdata)
     krb5_context         context;
     krb5_auth_context    auth_context;
-    krb5_creds                 * pcreds;
-    krb5_data         ** ppdata;
-    krb5_replay_data   * outdata;
+    krb5_creds                 FAR * pcreds;
+    krb5_data         FAR * FAR * ppdata;
+    krb5_replay_data   FAR * outdata;
 {
     krb5_error_code retval;
-    krb5_creds **ppcreds;
+    krb5_creds FAR * FAR *ppcreds;
 
-    if ((ppcreds = (krb5_creds **)malloc(sizeof(*ppcreds) * 2)) == NULL) {
+    if ((ppcreds = (krb5_creds FAR * FAR *)malloc(sizeof(*ppcreds) * 2)) == NULL) {
        return ENOMEM;
     }