From owner-ssh@clinet.fi Wed Aug 23 14:16:10 2000
X-Mailer: XFMail 1.3 [p0] on Linux
Date: Wed, 23 Aug 2000 08:17:27 -0400 (EDT)
Organization: AppliedTheory Corp.
From: "Carl J. Nobile" <cnobile@appliedtheory.com>
To: Anne Carasik <anne@ssh.fi>, ssh@clinet.fi
Subject: krb-1.1.1_ssh-1.2.30.patch

Hi all,

I submitted a patch some months ago for the new Kerberos version
krd-1.1.1, so it would work with ssh-1.2.27, but the versions of SSH1
have changed fast and furiously so here is the patch for ssh-1.2.30.
I've had it running for about a month now with no problems.

Anne, I did this while we were working on ssh-2.2.0, but forgot to send
it to you.

Carl
------------------------------------------------------------------------
E-Mail: Carl J. Nobile <cnobile@appliedtheory.com>
Date: 23-Aug-00                             Phone: 315-453-2912 Ex. 5336
Time: 08:06:35                                Fax: 315-479-0859

Software Engineering Group -- AppliedTheory Corp.
224 Harrison Street, 6th Floor, Syracuse, NY  13202
------------------------------------------------------------------------


*** auth-kerberos.c.orig	Fri Jul 28 20:37:22 2000
--- auth-kerberos.c	Fri Jul 28 20:40:49 2000
***************
*** 120,130 ****
        
        debug("Kerberos invalid service name (%.100s).", server);
        packet_send_debug("Kerberos invalid service name (%.100s).", server);
!       krb5_xfree(server);
        return 0;
      }
!   krb5_xfree(server);
!   
    /* Extract the users name from the ticket client principal */
    problem = krb5_copy_principal(ssh_context, ticket->enc_part2->client,
                                  &tkt_client);
--- 120,130 ----
        
        debug("Kerberos invalid service name (%.100s).", server);
        packet_send_debug("Kerberos invalid service name (%.100s).", server);
!       free((char FAR *) server);
        return 0;
      }
!   free((char FAR *) server); 
!  
    /* Extract the users name from the ticket client principal */
    problem = krb5_copy_principal(ssh_context, ticket->enc_part2->client,
                                  &tkt_client);
***************
*** 159,165 ****
    packet_put_string((char *) reply.data, reply.length);
    packet_send();
    packet_write_wait();
!   krb5_xfree(reply.data);
    return 1;
  }
  #endif /* KRB5 */
--- 159,165 ----
    packet_put_string((char *) reply.data, reply.length);
    packet_send();
    packet_write_wait();
!   free((char FAR *) reply.data);
    return 1;
  }
  #endif /* KRB5 */
*** configure.orig	Fri Jul 28 20:42:50 2000
--- configure	Fri Jul 28 20:43:38 2000
***************
*** 6807,6813 ****
  
    KERBEROS_ROOT="$with_kerberos5"
    KERBEROS_INCS="-I${KERBEROS_ROOT}/include"
!   KERBEROS_LIBS="-L${KERBEROS_ROOT}/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err"
    echo $ac_n "checking for dbm_open in -lndbm""... $ac_c" 1>&6
  echo "configure:6813: checking for dbm_open in -lndbm" >&5
  ac_lib_var=`echo ndbm'_'dbm_open | sed 'y%./+-%__p_%'`
--- 6807,6813 ----
  
    KERBEROS_ROOT="$with_kerberos5"
    KERBEROS_INCS="-I${KERBEROS_ROOT}/include"
!   KERBEROS_LIBS="-L${KERBEROS_ROOT}/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
    echo $ac_n "checking for dbm_open in -lndbm""... $ac_c" 1>&6
  echo "configure:6813: checking for dbm_open in -lndbm" >&5
  ac_lib_var=`echo ndbm'_'dbm_open | sed 'y%./+-%__p_%'`
*** configure.in.orig	Fri Jul 28 20:43:49 2000
--- configure.in	Fri Jul 28 20:44:18 2000
***************
*** 933,939 ****
    AC_DEFINE(KRB5)
    KERBEROS_ROOT="$with_kerberos5"
    KERBEROS_INCS="-I${KERBEROS_ROOT}/include"
!   KERBEROS_LIBS="-L${KERBEROS_ROOT}/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err"
    AC_CHECK_LIB(ndbm, dbm_open, KERBEROS_LIBS="$KERBEROS_LIBS -lndbm")
    KERBEROS_OBJS="auth-kerberos.o"
    ;;
--- 933,939 ----
    AC_DEFINE(KRB5)
    KERBEROS_ROOT="$with_kerberos5"
    KERBEROS_INCS="-I${KERBEROS_ROOT}/include"
!   KERBEROS_LIBS="-L${KERBEROS_ROOT}/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
    AC_CHECK_LIB(ndbm, dbm_open, KERBEROS_LIBS="$KERBEROS_LIBS -lndbm")
    KERBEROS_OBJS="auth-kerberos.o"
    ;;