summaryrefslogtreecommitdiff
path: root/security/ssh/files/patch-ag
blob: 71f3b7e168f845b06734cad843340ba25fd05bbd (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
*** auth-kerberos.c.orig	Tue Jan 11 20:33:46 2000
--- auth-kerberos.c	Tue Jan 11 20:33:38 2000
***************
*** 120,129 ****
--- 120,137 ----
        
        debug("Kerberos invalid service name (%.100s).", server);
        packet_send_debug("Kerberos invalid service name (%.100s).", server);
+ #ifdef krb5_xfree
        krb5_xfree(server);
+ #else
+       free(server);
+ #endif
        return 0;
      }
+ #ifdef krb5_xfree
    krb5_xfree(server);
+ #else
+   free(server);
+ #endif
    
    /* Extract the users name from the ticket client principal */
    problem = krb5_copy_principal(ssh_context, ticket->enc_part2->client,
***************
*** 159,165 ****
--- 167,177 ----
    packet_put_string((char *) reply.data, reply.length);
    packet_send();
    packet_write_wait();
+ #ifdef krb5_xfree
    krb5_xfree(reply.data);
+ #else
+   krb5_free_data_contents(ssh_context, &reply);
+ #endif
    return 1;
  }
  #endif /* KRB5 */
***************
*** 177,183 ****
    extern char *ticket;
    static krb5_principal rcache_server = 0;
    static krb5_rcache rcache;
!   struct sockaddr_in local, foreign;
    krb5_address *local_addr, *remote_addr;
    int s;
    
--- 189,195 ----
    extern char *ticket;
    static krb5_principal rcache_server = 0;
    static krb5_rcache rcache;
!   struct sockaddr_storage local, foreign;
    krb5_address *local_addr, *remote_addr;
    int s;