Revise some error messages so they are less confusing. Sunil Shetye.

[~andy/fetchmail] / kerberos.c

diff --git a/kerberos.c b/kerberos.c
index 3254873de853113839cd66db9eba97cd4aa6431f..b329b12ff7e53818462990e6f65ab9c0dcf272b5 100644 (file)
--- a/kerberos.c
+++ b/kerberos.c
@@ -96,8 +96,8 @@ int do_rfc1731(int sock, char *command, char *truename)
     strncpy(srvinst, truename, (sizeof srvinst)-1);
     srvinst[(sizeof srvinst)-1] = '\0';
     for (p = srvinst; *p; p++) {
-      if (isupper(*p)) {
-       *p = tolower(*p);
+      if (isupper((unsigned char)*p)) {
+       *p = tolower((unsigned char)*p);
       }
     }
 
@@ -121,7 +121,7 @@ int do_rfc1731(int sock, char *command, char *truename)
 
     memcpy(session, credentials.session, sizeof session);
     memset(&credentials, 0, sizeof credentials);
-    des_key_sched(session, schedule);
+    des_key_sched(&session, schedule);
 
     result = krb_get_tf_fullname(TKT_FILE, tktuser, tktinst, tktrealm);
     if (result) {
@@ -146,13 +146,13 @@ int do_rfc1731(int sock, char *command, char *truename)
        report(stderr, 
               GT_("non-null instance (%s) might cause strange behavior\n"),
                tktinst);
-       strcat(tktuser, ".");
-       strcat(tktuser, tktinst);
+       strlcat(tktuser, ".", sizeof(tktuser));
+       strlcat(tktuser, tktinst, sizeof(tktuser));
     }
 
     if (strcmp(tktrealm, srvrealm) != 0) {
-       strcat(tktuser, "@");
-       strcat(tktuser, tktrealm);
+       strlcat(tktuser, "@", sizeof(tktuser));
+       strlcat(tktuser, tktrealm, sizeof(tktuser));
     }
 
     result = krb_mk_req(&authenticator, "imap", srvinst, srvrealm,