[2464] in Release_Engineering
7.2 Kerberos stuff; differences between rel-eng and locker kerberos
daemon@ATHENA.MIT.EDU (John T Kohl)
Fri Oct 12 11:51:56 1990
Date: Fri, 12 Oct 90 11:51:31 EDT
From: John T Kohl <jtkohl@ATHENA.MIT.EDU>
To: rel-eng@ATHENA.MIT.EDU
Cc: salemme@ATHENA.MIT.EDU
This message has 3 parts, delimited by
">>> =================================" marks
>>> =================================
The following are diffs reflecting changes rel-eng made that should be
copied to and reflected in the Kerberos reference sources:
>>> =================================
--------------------------------------------------------------------------
Only in /source/athena/athena.lib/kerberos/man: tf_util.point
diff -r /source/athena/athena.lib/kerberos/appl/erlogin/fifo.h /mit/kerberos/src/appl/erlogin/fifo.h
11c11
< #else /* DBG */
---
> #else DBG
16c16
< #endif /* DBG */
---
> #endif DBG
--------------------------------------------------------------------------
diff -r /source/athena/athena.lib/kerberos/include/des.h /mit/kerberos/src/include/des.h
48c48
< #endif /* DES_DEFS */
---
> #endif DES_DEFS
--------------------------------------------------------------------------
diff -r /source/athena/athena.lib/kerberos/include/kadm.h /mit/kerberos/src/include/kadm.h
141c141
< #endif /* KADM_DEFS */
---
> #endif KADM_DEFS
--------------------------------------------------------------------------
diff -r /source/athena/athena.lib/kerberos/include/krb.h /mit/kerberos/src/include/krb.h
117c117
< #endif /* PC */
---
> #endif PC
179c179
< #endif /* PC */
---
> #endif PC
340c340
< #endif /* PC */
---
> #endif PC
362c362
< #endif /* OLDNAMES */
---
> #endif OLDNAMES
378c378
< #endif /* ATHENA_COMPAT */
---
> #endif ATHENA_COMPAT
380c380
< #endif /* KRB_DEFS */
---
> #endif KRB_DEFS
--------------------------------------------------------------------------
diff -r /source/athena/athena.lib/kerberos/include/krb_conf.h /mit/kerberos/src/include/krb_conf.h
33c33
< #endif /* KRB_CONF_DEFS */
---
> #endif KRB_CONF_DEFS
--------------------------------------------------------------------------
diff -r /source/athena/athena.lib/kerberos/kadmin/kadm_server.h /mit/kerberos/src/kadmin/kadm_server.h
52c52
< #endif /* KADM_SERVER_DEFS */
---
> #endif KADM_SERVER_DEFS
--------------------------------------------------------------------------
diff -r /source/athena/athena.lib/kerberos/lib/des/des_internal.h /mit/kerberos/src/lib/des/des_internal.h
59c59
< #else /* BITS32 */
---
> #else BITS32
91c91
< #endif /* BITS32 */
---
> #endif BITS32
94c94
< #endif /* DES_INTERNAL_DEFS */
---
> #endif DES_INTERNAL_DEFS
--------------------------------------------------------------------------
diff -r /source/athena/athena.lib/kerberos/man/Imakefile /mit/kerberos/src/man/Imakefile
1,3c1,3
21c21
< tftpd.8 tcom.8 tftp.1 tf_util.3 tf_util.point
---
> tftpd.8 tcom.8 tftp.1
34d33
< manpage(3,tf_util.3)
40d38
< manpage(8,ext_srvtab.8)
42,47d39
< manpage(8,kdb_destroy.8)
< manpage(8,kdb_edit.8)
< manpage(8,kdb_init.8)
< manpage(8,kdb_util.8)
< manpage(8,kstash.8)
<
52,53d43
< manpage(3,acl_check.3)
<
59d48
< manpage(3,kuserok.3)
66,67c55,56
< des_string_to_key \
< des_random_key \
---
> string_to_key \
> random_key \
69,72c58,61
< des_ecb_encrypt \
< des_cbc_encrypt \
< des_pcbc_encrypt \
< des_cbc_cksum \
---
> ecb_encrypt \
> cbc_encrypt \
> pcbc_encrypt \
> cbc_cksum \
100,111d88
< TF = \
< tf_init \
< tf_get_pname \
< tf_get_pinst \
< tf_get_cred \
< tf_close
<
< install:: tf_util.point
< for i in ${TF} ; do \
< ${INSTALLFILE} tf_util.point ${DESTDIR}${MANDIR}/man3/$$i.3; \
< done
<
--------------------------------------------------------------------------
diff -r /source/athena/athena.lib/kerberos/util/imake/ccflags.c /mit/kerberos/src/util/imake/ccflags.c
3a4,6
> #ifdef _AIX
> #define ccflags "-D_BSD -D_BSD_INCLUDES -O"
> #else
4a8
> #endif
--------------------------------------------------------------------------
diff -r /source/athena/athena.lib/kerberos/util/makedepend/def.h /mit/kerberos/src/util/makedepend/def.h
47c47
< #else /* DEBUG */
---
> #else DEBUG
55c55
< #endif /* DEBUG */
---
> #endif DEBUG
--------------------------------------------------------------------------
diff -r /source/athena/athena.lib/kerberos/util/ss/help.c /mit/kerberos/src/util/ss/help.c
59c59
< if ((fd = open(&buffer[0], O_RDONLY, 0)) >= 0) goto got_it;
---
> if ((fd = open(&buffer[0], O_RDONLY)) >= 0) goto got_it;
61c61
< if ((fd = open(&buffer[0], O_RDONLY, 0)) < 0) {
---
> if ((fd = open(&buffer[0], O_RDONLY)) < 0) {
--------------------------------------------------------------------------
diff -r /source/athena/athena.lib/kerberos/util/ss/ss_internal.h /mit/kerberos/src/util/ss/ss_internal.h
51c51
< #endif /* _SS_INTERNAL */
---
> #endif _SS_INTERNAL
>>> =================================
This is a rel-eng change which might want to be noted, but probably doesn't
belong in the reference sources:
>>> =================================
--------------------------------------------------------------------------
diff -r /source/athena/athena.lib/kerberos/util/imake.includes/config.Imakefile /mit/kerberos/src/util/imake.includes/config.Imakefile
236c236
< INSTALLPROG= install -c -s -m 555
---
> INSTALLPROG= install -c -m 555
240c240
< INSTALLSUID= install -c -s -m 4555 -o root
---
> INSTALLSUID= install -c -m 4555 -o root
>>> =================================
These are the changes which have been made to the locker sources which
should be incorporated into release 7.2:
>>> =================================
--------------------------------------------------------------------------
diff -r /source/athena/athena.lib/kerberos/lib/krb/krb_get_in_tkt.c /mit/kerberos/src/lib/krb/krb_get_in_tkt.c
14c14
< "$Id: krb_get_in_tkt.c,v 4.20 90/05/02 15:25:55 jon Exp $";
---
> "$Id: krb_get_in_tkt.c,v 4.21 90/10/10 23:35:28 raeburn Exp $";
168d167
< instance[INST_SZ-1] = '\0';
--------------------------------------------------------------------------
diff -r /source/athena/athena.lib/kerberos/prototypes/etc.krb.conf /mit/kerberos/src/prototypes/etc.krb.conf
6c6
< LCS.MIT.EDU kerberos.lcs.mit.edu
---
> LCS.MIT.EDU kerberos.lcs.mit.edu admin server
7a8
> LS.MIT.EDU ls.mit.edu admin server
11a13
> SOUP.MIT.EDU soup.mit.edu admin server
14a17
> CATS.UCSC.EDU mehitabel.ucsc.edu admin server
16c19
< CATS.UCSC.EDU ucsco.ucsc.edu
---
> WATCH.MIT.EDU kerberos.watch.mit.edu admin server
--------------------------------------------------------------------------
diff -r /source/athena/athena.lib/kerberos/prototypes/etc.krb.realms /mit/kerberos/src/prototypes/etc.krb.realms
4c4,6
< DODO.MIT.EDU SMS_TEST.EDU
---
> DODO.MIT.EDU SMS_TEST.MIT.EDU
> .UCSC.EDU CATS.UCSC.EDU
> .UCSC.EDU. CATS.UCSC.EDU
