← Back to branch summary

~ari-tczew/ubuntu/dapper/fetchmail/fix-CVE-2008-2711

« back to all changes in this revision

Viewing changes to kerberos.h

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2006-02-07 12:12:13 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20060207121213-onurwfrzdlzlzxnt
Tags: 6.3.2-2ubuntu1
* Resynchronise with Debian. This brings the new upstream version to dapper
  since upstream support for 6.2 was dropped.
* Drop debian/patches/CVE-2005-4348.dpatch, upstream now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
kerberos.h
15
15
#endif
16
16
 
17
17
#ifdef KERBEROS_V4
18
 
#  if defined (__bsdi__) 
19
 
#    include <des.h> /* order of includes matters */
20
 
#    define krb_get_err_text(e) (krb_err_txt[e])
21
 
#  endif
22
 
#  include <krb.h>
23
 
#  if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__linux__)
24
 
#    define krb_get_err_text(e) (krb_err_txt[e])
25
 
#    include <des.h>
 
18
#  ifdef KERBEROS_V4_V5
 
19
#    include <kerberosIV/krb.h>
 
20
#    include <kerberosIV/des.h>
 
21
#  else
 
22
#    if defined (__bsdi__) 
 
23
#      include <des.h> /* order of includes matters */
 
24
#      define krb_get_err_text(e) (krb_err_txt[e])
 
25
#    endif
 
26
#    include <krb.h>
 
27
#    if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__linux__)
 
28
#      define krb_get_err_text(e) (krb_err_txt[e])
 
29
#      include <des.h>
 
30
#    endif
26
31
#  endif
27
32
#endif
28
33