upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 08:43:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

resolve conflicts.

Browse source
This commit is contained in:
Mark Murray 2000-01-09 08:53:35 +00:00
parent a1ed3f2c23
commit 0f2b69ce58
5 changed files with 573 additions and 335 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crypto/kerberosIV/appl/bsd/bsd_locl.h
View file

@ -14,12 +14,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the Kungliga Tekniska
* Högskolan and its contributors.
*
* 4. Neither the name of the Institute nor the names of its contributors
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@ -36,7 +31,7 @@
* SUCH DAMAGE.
*/
/* $Id: bsd_locl.h,v 1.109.2.1 1999/07/22 03:13:49 assar Exp $ */
/* $Id: bsd_locl.h,v 1.111 1999/12/02 16:58:28 joda Exp $ */
/* $FreeBSD$ */
#define LOGALL

871
crypto/kerberosIV/appl/ftp/ftpd/ftpd.c
View file

File diff suppressed because it is too large Load diff

11
crypto/kerberosIV/doc/kth-krb.texi
View file

@ -1,6 +1,6 @@
\input texinfo @c -*- texinfo -*-
@c %**start of header
@c $Id: kth-krb.texi,v 1.77.2.1 1999/08/18 21:11:25 joda Exp $
@c $Id: kth-krb.texi,v 1.80 1999/12/02 16:58:35 joda Exp $
@c $FreeBSD$
@setfilename kth-krb.info
@settitle KTH-KRB
@ -30,7 +30,7 @@
@subtitle 1999
@author Johan Danielsson
@author Assar Westerlund
@author last updated $Date: 1999/08/18 21:11:25 $
@author last updated $Date: 1999/12/02 16:58:35 $
@def@copynext{@vskip 20pt plus 1fil@penalty-1000}
@def@copyrightstart{}
@ -52,12 +52,7 @@ are met:
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. All advertising materials mentioning features or use of this software
must display the following acknowledgement:
This product includes software developed by the Kungliga Tekniska
Högskolan and its contributors.
4. Neither the name of the Institute nor the names of its contributors
3. Neither the name of the Institute nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.

9
crypto/kerberosIV/lib/kafs/kafs.h
View file

@ -14,12 +14,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the Kungliga Tekniska
* Högskolan and its contributors.
*
* 4. Neither the name of the Institute nor the names of its contributors
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@ -36,7 +31,7 @@
* SUCH DAMAGE.
*/
/* $Id: kafs.h,v 1.31 1999/07/07 12:30:40 assar Exp $ */
/* $Id: kafs.h,v 1.32 1999/12/02 16:58:40 joda Exp $ */
/* $FreeBSD$ */
#ifndef __KAFS_H

8
crypto/kerberosIV/lib/krb/krb.h
View file

@ -1,5 +1,5 @@
/*
* $Id: krb.h,v 1.97 1999/06/29 21:18:06 bg Exp $
* $Id: krb.h,v 1.99 1999/11/16 14:02:47 bg Exp $
* $FreeBSD$
*
* Copyright 1987, 1988 by the Massachusetts Institute of Technology.
@ -166,7 +166,7 @@ typedef struct ktext KTEXT_ST;
#define CLOCK_SKEW 5*60
/* Filename for readservkey */
#ifndef KEYFILE
#define KEYFILE "/etc/kerberosIV/srvtab"
#define KEYFILE (krb_get_default_keyfile())
#endif
/* Structure definition for rd_ap_req */
@ -226,7 +226,9 @@ struct krb_host {
/* Location of ticket file for save_cred and get_cred */
#define TKT_FILE tkt_string()
#define TKT_ROOT "/tmp/tkt"
#ifndef TKT_ROOT
#define TKT_ROOT (krb_get_default_tkt_root())
#endif
/* Error codes returned from the KDC */
#define KDC_OK 0 /* Request OK */