Initial update to KFW related source to build with K5 1.9 on Windows

From: Alexey Melnikov <alexey.melnikov@isode.com>

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25245 dc483132-0cff-0310-8789-dd5450dbe970

1 files changed, 5 insertions, 124 deletions

diff --git a/src/windows/leashdll/winerr.c b/src/windows/leashdll/winerr.c
index 10806d8b8..2d487b449 100644
--- a/src/windows/leashdll/winerr.c
+++ b/src/windows/leashdll/winerr.c
@@ -15,7 +15,6 @@
 
 // Private Include files
 #include "leashdll.h"
-#include <krb.h>
 #include <leashwin.h>
 
 // Global Variables.
@@ -54,135 +53,17 @@ LPSTR err_describe(LPSTR buf, long code)
     table_num = code - offset;
     com_err_msg = Lerror_message(code);
 
-    switch(table_num)
-    {
-#ifndef NO_KRB4
-    case krb_err_base:
-    case kadm_err_base:
-	break;
-#endif
-    default:
-	lstrcpy(buf, com_err_msg);
-	return buf;
-    }
+    lstrcpy(buf, com_err_msg);
+    return buf;
 
+
+////Is this needed at all after the return above?
     cp = buf;
-#ifndef NO_KRB4
-    if (table_num == krb_err_base)
-        switch(offset)
-        {
-        case KDC_NAME_EXP:           /* 001 Principal expired */
-        case KDC_SERVICE_EXP:        /* 002 Service expired */
-        case KDC_AUTH_EXP:           /* 003 Auth expired */
-        case KDC_PKT_VER:            /* 004 Protocol version unknown */
-        case KDC_P_MKEY_VER:         /* 005 Wrong master key version */
-        case KDC_S_MKEY_VER:         /* 006 Wrong master key version */
-        case KDC_BYTE_ORDER:         /* 007 Byte order unknown */
-        case KDC_PR_N_UNIQUE:        /* 009 Principal not unique */
-        case KDC_NULL_KEY:           /* 010 Principal has null key */
-        case KDC_GEN_ERR:            /* 011 Generic error from KDC */
-        case INTK_W_NOTALL   :       /* 061 Not ALL tickets returned */
-        case INTK_PROT       :       /* 063 Protocol Error */
-        case INTK_ERR        :       /* 070 Other error */
-            com_err_msg = "Something weird happened... try again, and if Leash"
-                " continues to fail, contact Network Services as listed in the "
-                "About box.";
-            break;
-        case KDC_PR_UNKNOWN:         /* 008 Principal unknown */
-            com_err_msg = "You have entered an unknown username/instance/realm"
-                " combination.";
-            break;
-        case GC_TKFIL                :       /* 021 Can't read ticket file */
-        case GC_NOTKT                :       /* 022 Can't find ticket or TGT */
-            com_err_msg = "Something is wrong with the memory where your "
-                "tickets are stored. Try exiting Windows and restarting your "
-                "computer.";
-            break;
-        case MK_AP_TGTEXP    :       /* 026 TGT Expired */
-            /* no extra error msg */
-            break;
-        case RD_AP_TIME              :       /* 037 delta_t too big */
-            com_err_msg = "Your computer's clock is out of sync with the "
-                "Kerberos server.  Please see the help file about correcting "
-                "your clock.";
-            break;
-
-        case RD_AP_UNDEC             :       /* 031 Can't decode authenticator */
-        case RD_AP_EXP               :       /* 032 Ticket expired */
-        case RD_AP_NYV               :       /* 033 Ticket not yet valid */
-        case RD_AP_REPEAT    :       /* 034 Repeated request */
-        case RD_AP_NOT_US    :       /* 035 The ticket isn't for us */
-        case RD_AP_INCON             :       /* 036 Request is inconsistent */
-        case RD_AP_BADD              :       /* 038 Incorrect net address */
-        case RD_AP_VERSION   :       /* 039 protocol version mismatch */
-        case RD_AP_MSG_TYPE  :       /* 040 invalid msg type */
-        case RD_AP_MODIFIED  :       /* 041 message stream modified */
-        case RD_AP_ORDER             :       /* 042 message out of order */
-        case RD_AP_UNAUTHOR  :       /* 043 unauthorized request */
-            /* no extra error msg */
-            break;
-        case GT_PW_NULL:     /* 51    Current PW is null */
-        case GT_PW_BADPW:    /* 52    Incorrect current password */
-        case GT_PW_PROT:     /* 53    Protocol Error */
-        case GT_PW_KDCERR:   /* 54    Error returned by KDC */
-        case GT_PW_NULLTKT:  /* 55    Null tkt returned by KDC */
-            /* no error msg yet */
-            break;
-
-            /* Values returned by send_to_kdc */
-        case SKDC_RETRY   :  /* 56    Retry count exceeded */
-        case SKDC_CANT    :  /* 57    Can't send request */
-            com_err_msg = "Cannot contact the kerberos server for the selected realm.";
-            break;
-            /* no error message on purpose: */
-        case INTK_BADPW      :       /* 062 Incorrect password */
-            break;
-        default:
-            /* no extra error msg */
-            break;
-        }
-    else
-        switch(code)
-        {
-        case KADM_INSECURE_PW:
-            /* if( kadm_info != NULL ){
-             * wsprintf(buf, "%s\n%s", com_err_msg, kadm_info);
-             * } else {
-             * wsprintf(buf, "%s\nPlease see the help file for information "
-             * "about secure passwords.", com_err_msg);
-             * }
-             * com_err_msg = buf;
-             */
-
-            /* The above code would be preferred since it allows site specific
-             * information to be delivered from the Kerberos server. However the
-             * message box is too small for VGA screens.
-             * It does work well if we only have to support 1024x768
-             */
-
-            com_err_msg = "You have entered an insecure or weak password.";
-        default:
-            /* no extra error msg */
-            break;
-        }
-#endif /* NO_KRB4 */
     if(com_err_msg != buf)
         lstrcpy(buf, com_err_msg);
     cp = buf + lstrlen(buf);
     *cp++ = '\n';
-    switch(table_num) {
-#ifndef NO_KRB4
-    case krb_err_base:
-        etype = "Kerberos";
-        break;
-    case kadm_err_base:
-        etype = "Kerberos supplemental";
-        break;
-#endif
-    default:
-        etype = Lerror_table_name(table_num);
-        break;
-    }
+    etype = Lerror_table_name(table_num);
     wsprintf((LPSTR) cp, (LPSTR) "(%s error %d"
 #ifdef DEBUG_COM_ERR
              " (absolute error %ld)"