chat/zephyr/patches/patch-ae

   1 $NetBSD$
   2
   3 --- server/kopt.c.orig  Mon Feb 26 23:48:01 2001
   4 +++ server/kopt.c
   5 @@ -161,7 +161,7 @@ void add_to_key_sched_cache(key, sched)
   6
   7  int
   8  krb_set_key(key,cvt)
   9 -    char *key;
  10 +    void *key;
  11      int cvt;
  12  {
  13  #ifdef NOENCRYPTION
  14 @@ -172,7 +172,7 @@ krb_set_key(key,cvt)
  15      int ret;
  16
  17      if (cvt)
  18 -       string_to_key(key,serv_key);
  19 +       string_to_key((char *)key,serv_key);
  20      else
  21         memcpy((char *)serv_key,key,8);
  22
  23 @@ -187,6 +187,14 @@ krb_set_key(key,cvt)
  24  #endif /* NOENCRYPTION */
  25  }
  26
  27 +static u_long
  28 +swap_u_long(u_long x)
  29 +{
  30 +       return ((x & 0xff000000) >> 24) |
  31 +           ((x & 0x00ff0000) >> 8) |
  32 +           ((x & 0x0000ff00) << 8) |
  33 +           ((x & 0x000000ff) << 24);
  34 +}
  35
  36  /*
  37   * krb_rd_req() takes an AUTH_MSG_APPL_REQUEST or
  38 @@ -234,7 +242,7 @@ krb_rd_req(authent,service,instance,from
  39      KTEXT authent;                     /* The received message */
  40      char *service;                     /* Service name */
  41      char *instance;                    /* Service instance */
  42 -    unsigned KRB_INT32 from_addr;      /* Net address of originating host */
  43 +    KRB_INT32 from_addr;               /* Net address of originating host */
  44      AUTH_DAT *ad;                      /* Structure to be filled in */
  45      char *fn;                          /* Filename to get keys from */
  46  {