* ftpd.c (auth_data): Iterate over all krb4 services instead of

 	trying to examine the srvtab file for a particular key (which
 	failes when falling back on the v5 keytab for des3 services).

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

diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog
index 70f2112ce15b1d0f056183dab0f071eee5a3d628..3a4508cdd387de13b58add559e6e8f876aa0e6ff 100644 (file)
--- a/src/appl/gssftp/ftpd/ChangeLog
+++ b/src/appl/gssftp/ftpd/ChangeLog
@@ -1,3 +1,9 @@
+Tue Aug 22 11:37:35 2000  Ezra Peisach  <epeisach@mit.edu>
+
+       * ftpd.c (auth_data): Iterate over all krb4 services instead of
+       trying to examine the srvtab file for a particular key (which
+       failes when falling back on the v5 keytab for des3 services).
+
 2000-06-14  Tom Yu  <tlyu@mit.edu>
 
        * ftpcmd.y (nonguest): Return $1, not 1, if (!guest).

diff --git a/src/appl/gssftp/ftpd/ftpd.c b/src/appl/gssftp/ftpd/ftpd.c
index 047be3562dfc64406a0de4de71360eec130e9a76..17f6e009bf056d1d5de880cc28b799635f26ac96 100644 (file)
--- a/src/appl/gssftp/ftpd/ftpd.c
+++ b/src/appl/gssftp/ftpd/ftpd.c
@@ -2174,7 +2174,7 @@ char *data;
        int kerror, length;
 #ifdef KRB5_KRB4_COMPAT
        int i;
-       static char *service;
+       static char **service=NULL;
        char instance[INST_SZ];
        u_long cksum;
        char buf[FTP_BUFSIZ];
@@ -2200,23 +2200,22 @@ char *data;
                }
                (void) memcpy((char *)ticket.dat, (char *)out_buf, ticket.length = length);
                strcpy(instance, "*");
-               if (!service) {
-                       char realm[REALM_SZ];
-                       des_cblock key;
-                       
-                       service = "ftp";
-                       if (krb_get_lrealm(realm, 1) == KSUCCESS &&
-                           read_service_key(service, instance, realm, 0, keyfile, key))
-                               service = "rcmd";
-                       else
-                               (void) memset(key, 0, sizeof(key));
-               }
-               if (kerror = krb_rd_req(&ticket, service, instance,
-                                       his_addr.sin_addr.s_addr, &kdata, keyfile)) {
-                       secure_error("ADAT: Kerberos V4 krb_rd_req: %s",
-                                    krb_get_err_text(kerror));
-                       return(0);
+
+               kerror = 255;
+               for (service = krb4_services; *service; service++) {
+                 kerror = krb_rd_req(&ticket, *service, instance,
+                                     his_addr.sin_addr.s_addr, 
+                                     &kdata, keyfile);
+                 /* Success */
+                 if(!kerror) break;
+               } 
+               /* rd_req failed.... */
+               if(kerror) {
+                 secure_error("ADAT: Kerberos V4 krb_rd_req: %s",
+                              krb_get_err_text(kerror));
+                 return(0);
                }
+
                /* add one to the (formerly) sealed checksum, and re-seal it */
                cksum = kdata.checksum + 1;
                cksum = htonl(cksum);