ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/src/vendor-crypto/heimdal/dist/appl/ftp/ftpd/ftpd_locl.h
(Generate patch)

Comparing vendor-crypto/heimdal/dist/appl/ftp/ftpd/ftpd_locl.h (file contents):
Revision 7129 by laffer1, Wed Jul 22 14:55:56 2015 UTC vs.
Revision 7130 by laffer1, Fri Jul 24 20:10:10 2015 UTC

# Line 1 | Line 1
1   /*
2 < * Copyright (c) 1998 - 2000 Kungliga Tekniska Högskolan
3 < * (Royal Institute of Technology, Stockholm, Sweden).
4 < * All rights reserved.
2 > * Copyright (c) 1998 - 2000 Kungliga Tekniska Högskolan
3 > * (Royal Institute of Technology, Stockholm, Sweden).
4 > * All rights reserved.
5   *
6 < * Redistribution and use in source and binary forms, with or without
7 < * modification, are permitted provided that the following conditions
8 < * are met:
6 > * Redistribution and use in source and binary forms, with or without
7 > * modification, are permitted provided that the following conditions
8 > * are met:
9   *
10 < * 1. Redistributions of source code must retain the above copyright
11 < *    notice, this list of conditions and the following disclaimer.
10 > * 1. Redistributions of source code must retain the above copyright
11 > *    notice, this list of conditions and the following disclaimer.
12   *
13 < * 2. Redistributions in binary form must reproduce the above copyright
14 < *    notice, this list of conditions and the following disclaimer in the
15 < *    documentation and/or other materials provided with the distribution.
13 > * 2. Redistributions in binary form must reproduce the above copyright
14 > *    notice, this list of conditions and the following disclaimer in the
15 > *    documentation and/or other materials provided with the distribution.
16   *
17 < * 3. Neither the name of the Institute nor the names of its contributors
18 < *    may be used to endorse or promote products derived from this software
19 < *    without specific prior written permission.
17 > * 3. Neither the name of the Institute nor the names of its contributors
18 > *    may be used to endorse or promote products derived from this software
19 > *    without specific prior written permission.
20   *
21 < * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
22 < * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
23 < * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
24 < * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
25 < * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26 < * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 < * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 < * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 < * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 < * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 < * SUCH DAMAGE.
21 > * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
22 > * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
23 > * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
24 > * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
25 > * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26 > * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 > * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 > * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 > * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 > * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 > * SUCH DAMAGE.
32   */
33  
34 < /* $Id: ftpd_locl.h,v 1.1.1.3 2012-07-21 15:09:08 laffer1 Exp $ */
34 > /* $Id$ */
35  
36   #ifndef __ftpd_locl_h__
37   #define __ftpd_locl_h__
# Line 145 | Line 145
145   #include <krb5.h>
146   #endif /* KRB5 */
147  
148 < #ifdef KRB4
149 < #include <krb.h>
150 < #endif
151 <
152 < #if defined(KRB4) || defined(KRB5)
148 > #if defined(KRB5)
149   #include <kafs.h>
150   #endif
151 <
151 >
152   #ifdef OTP
153   #include <otp.h>
154   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines