diff options
| author | Ezra Peisach <epeisach@mit.edu> | 1995-09-11 23:52:35 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 1995-09-11 23:52:35 +0000 |
| commit | 687635bc6786d4c6df368aa09c77e7903dcda8a6 (patch) | |
| tree | a8e34229802805d16b7bcc18a9def5008432c50c /src/include/krb5/stock | |
| parent | f071d300320f74be4c6f25f4978f8e2c35fa6396 (diff) | |
Reintegrate Macintosh changes while keeping Proven's changes
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6753 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include/krb5/stock')
| -rw-r--r-- | src/include/krb5/stock/ChangeLog | 8 | ||||
| -rw-r--r-- | src/include/krb5/stock/osconf.h | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/include/krb5/stock/ChangeLog b/src/include/krb5/stock/ChangeLog index f64192f4c..d95657385 100644 --- a/src/include/krb5/stock/ChangeLog +++ b/src/include/krb5/stock/ChangeLog @@ -2,6 +2,14 @@ Mon Jul 17 15:05:42 EDT 1995 Paul Park (pjpark@mit.edu) * osconf.h - Add DEFAULT_KEYFILE_STUB which puts the stashfile in the kdc directory instead of the root. Also, change the +Wed Sep 06 14:20:57 1995 Chris Provenzano (proven@mit.edu) + + * osconf.h : s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g + +Tue Sep 05 22:10:34 1995 Chris Provenzano (proven@mit.edu) + + * osconf.h : Remove krb5_enctype references, and replace with + krb5_keytype where appropriate. default ETYPE to DES_CBC_MD5 now that it works. diff --git a/src/include/krb5/stock/osconf.h b/src/include/krb5/stock/osconf.h index 5271101d7..0c1353885 100644 --- a/src/include/krb5/stock/osconf.h +++ b/src/include/krb5/stock/osconf.h @@ -55,8 +55,7 @@ #define DEFAULT_KDC_PROFILE "@PREFIX/lib/krb5kdc/kdc.prof" #define KDC_PROFILE_ENV "KRB5_KDC_PROFILE" -#define DEFAULT_KDC_ETYPE ETYPE_DES_CBC_MD5 -#define DEFAULT_KDC_KEYTYPE KEYTYPE_DES +#define DEFAULT_KDC_ENCTYPE ENCTYPE_DES_CBC_CRC #define KDCRCACHE "dfl:krb5kdc_rcache" #define KDC_PORTNAME "kerberos" /* for /etc/services or equiv. */ |