popped all patches

[ckermit.git] / ckuus7.c

diff --git a/ckuus7.c b/ckuus7.c
index 8801478..4268ef1 100644 (file)
--- a/ckuus7.c
+++ b/ckuus7.c
@@ -98,12 +98,6 @@ extern int g_matchdot, hints, xcmdsrc, rcdactive;
 
 extern char * k_info_dir;
 
-#ifdef CK_LOGIN
-#ifdef CK_PAM
-int gotemptypasswd = 0;   /* distinguish empty passwd from none given */
-#endif /* CK_PAM */
-#endif /* CK_LOGIN */
-
 #ifndef NOSPL
 extern int nmac;
 extern struct mtab *mactab;
@@ -14662,9 +14656,9 @@ ckxlogin(userid, passwd, acct, promptok)
 #ifdef CK_RECALL
     extern int on_recall;               /* around Password prompting */
 #endif /* CK_RECALL */
-#ifdef COMMENT
+#ifdef CK_PAM
     extern int guest;
-#endif /* COMMENT */
+#endif /* CK_PAM */
     int rprompt = 0;                    /* Restore prompt */
 #ifdef CKSYSLOG
     int savlog;
@@ -14780,9 +14774,9 @@ ckxlogin(userid, passwd, acct, promptok)
     debug(F111,"ckxlogin zvuser",userid,ok);
 
     if (!*passwd && promptok
-#ifdef COMMENT
+#ifdef CK_PAM
         && guest
-#endif /* COMMENT */
+#endif /* CK_PAM */
         ) {
         char prmpt[80];
 
@@ -14858,9 +14852,6 @@ ckxlogin(userid, passwd, acct, promptok)
         if (pflag) prompt(xxstring);    /* Issue prompt if at top level */
         cmres();                        /* Reset the parser */
         for (x = -1; x < 0;) {          /* Prompt till they answer */
-#ifdef CK_PAM
-           gotemptypasswd=0;
-#endif /* CK_PAM */
             x = cmtxt("","",&s,NULL);   /* Get a literal line of text */
             if (x == -4 || x == -10) {
                 printf("\r\n%sLogin cancelled\n",
@@ -14870,10 +14861,6 @@ ckxlogin(userid, passwd, acct, promptok)
 #endif /* CKSYSLOG */
                 doexit(GOOD_EXIT,0);
             }
-#ifdef CK_PAM
-           if(!*s)
-               gotemptypasswd=1;
-#endif /* CK_PAM */
             if (sstate)                 /* In case of a Kermit packet */
               goto XCKXLOG;
             cmres();                    /* Reset the parser again */
@@ -14908,12 +14895,6 @@ ckxlogin(userid, passwd, acct, promptok)
     if (ok) {
         ok = zvpass((char *)passwd);    /* Check password */
         debug(F101,"ckxlogin zvpass","",ok);
-#ifdef CK_PAM
-    } else {
-       /* Fake pam password failure for nonexistent users */
-       sleep(1);
-       printf("Authentication failure\n");
-#endif
     }
 
     if (ok > 0 && isguest) {