Set correct icon resource ID and added new MIT Kerberos.r, with CCI(TM) and 2.0

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11403 dc483132-0cff-0310-8789-dd5450dbe970

3 files changed, 29 insertions, 8 deletions

diff --git a/src/mac/Icons.rsrc b/src/mac/Icons.rsrc
index c517356bb..a8ec470fc 100644
--- a/src/mac/Icons.rsrc
+++ b/src/mac/Icons.rsrc
@@ -1 +1 @@
-(This file must be converted with BinHex 4.0)
:#NPMEfjc,R*cFQ-!8P053d4[G@F"!*!(#S-I8`#3"!%!!!!*f!!!#0J!!!#V!")
!!!!$!!!!-!!!!"-!!!!$!!!!0!!!!"3!!!!$!!!!1!!!!"8!!!!$!!!!2!!!!"B
!!!!$!!!!3!!!!"F!!!!#!!!!4!!!!"J!!!!$!!!!5!!!!"N!!!!$!!!!6!!!rj!
%!!(rrrrq!!,rrrrj!!!!'`!!!"!!"!!!!!8!!!!$!*!((!!!!!-!!!!%!!!!(3!
!!!-!!!!)!!!!(J!!!'J!!!!-!!$rrrrk!!(rrrrj!!(rrrri!!!!#!!!!!%!!!!
'!!(rrrrh!!!!#!!!!!%!!!!'!(3ZDfGIE@&VC9pcCA&IER9Y!!2R,J!!!J!2rj!
0!!$`!*!-$2!!m-c2rj!'c*!%cI!!m-c2r`#3"Irrc-c0m!$`c-rr)*!(rmc0m!$
`c-rr!J)#)[rr)Jr-cI!!m-c2rb!J)[r2%Irpc-h`!2$FcrmL!Lr-ca%4rmc0m!$
`rFrrmL$mc2%Im4r-cI!!r`m-c-mLr-ca%4rrc-h`m2!2$-c-mLr2%Im4r-c0r`m
!$`c-c-mLrar2rrc-cI$I!!m-c-c-m[%Ic*!'h`!2$-c-c-rar-b3"Ym!$`c-c-c
2%Ic-N!EI!!m-c-crm4r-N!II!!m-c-m4%4(mc*!'h`!2$-c2(rrar2c-N!AI!!m
-c-mIc2(r$mb3"Gm!$`c-car2mImJr-c-c0cI!!m-c-mIra(r)#r-c-hphr!2$-r
r%4%Ic2)#r-c0rprr$`c2)[rrr-c2)#r-cI#3"!c-mJ,rrrrb!J,rrI!!m!$-c-r
`)#!J!#!Jrrh`!2$-N!62mL)#N!6rrI!!m-b3"Frb)*!%rrh`!2$-N!E2mL)L)[r
prZ$`c*!(crq3"2hql[$-N!I0hGhGrrhql[cGN!hqi!rrN!hZ!!!!"!!!rj!E!*!
%r`#3'[Er!!!!r`$fp[EpN!hfN!Rjr`!!!2m!p[EfrIhp#!'3#If3"2D3"IRr!!!
!r`$fp[EprId)N!lprIEfp[Rr!!!!r`$fp[EprId)N!Bc-rf3"$-c#2hfp[Ejr`!
!!2m!p[EfrIhp#*!&-rhpp[m,#rrrrIVfp[Ejr`!!!2m!qIEfrIhp-`J)#$2rp[E
fr`Z3"2rrp[EfqIm!!!$r!2rjp[f3"$-)#2rfp[Er#`[rr`X,rrEfp[Rr!!!!rrm
!r`$fN!6p-`Mpp[Efr`Z3"2rrrrEfp[Rr!2m!r`!!r`$fN!Ap-`Mpp[m,#rrr#`[
rpT!%qIrr!2m!!!$r!2D3"[dc#2hr#rrfrj!%pT!%qIm!qIm!!!$r!2D3"rdcr3X
,rrD3$2Rr!!!!r`$fN!Mpr`[rpT!0qIm!!!$r!2D3#2m,#rrfN!hjr`!!!2m!pT!
&rrrr#`[rpT!1qIm!!!$r!2D3"2m,N!ErpT!0qIm!!!$r!2D3"2m,rj!%#rrfrID
3#rRr!!!!r`$fN!6r#rrfp[m,rrd"rID3#[Rr!!!!r`$fN!6r#rrfrrm,rrd)!Ih
fN!Ijp[Rr!!!!r`$fN!6r#rrrr`X,rrmc#!MppT!&qIrjqIrr!!$r!2EfrIhr#j!
&rrEfrc-)#2hfN!6jrrrjrrrr!2m!p[Ep#$2rN!AfN!6r#!J)rIEfp[Rr!2m!r`$
r!!$fp[Ep#!JcrIhrN!8)!3J)#2hprIRr!!!!r`!!!2D3"Ihp#*!'!3%"#*!%rIh
pqIm!!!$r!2D3#Ihp-c-)N!RprIhjr`!!!2m!pT!,rIdc#*!)rIhpqIm!!!$r!2D
3$Ihp-j!(rIhpqIrmr!$r!2D3$rf3#[Rrr2cmr`$fN!rkN!IprIhjrrcmr2rfqC!
Drrcm!!$rN"[mr!#3"!%!Irrrm)!!!!L(rm!)K`!m#)F!!`L(!2%)K`02#)F%3`L
RL*N)d%L(#T!!*6)0%"0H#4!+3!%3"S!"%!5!!4!j!!%33)!"%&kJ!4"5d!%39XJ
"%&c%#C(")Jh42K%+S)rJk)"J!1L!'!$SJ!B!k)!"J1k!!(r[J!"rli!!!!jrrrr
mIrrrm2rrrrMrrrrirrrrq2rrrrMrrrrirrrrq2rrrrMrrrrihrrrqTrrrrmIrrr
r(rrrrarrrrmIrrrr(rrrrarrrrmIrrrr(rrrrarrrrmIrrrrRrrrrprrrrVrrrr
irrrrq2rrrrMrrrrirrrrr[q3#rjrrrrm!!!!32rqJ!+I`TiLh(2%bd'K3`&H!9)
"dL2H1i"kJrU!![rqrrlrr[rqrrlrN!4rrhrrIrprrj!'r[rqrrlrrJ!!!)$rN!I
`r-b3"[$mcr)L)Xc-m2c2mLc-r-c`rmrbc-rrc2rrc-,-rmcmr`r-c-rmr-c2$mc
-rmc-c-m2crrmc-c-c`r2c2c-c-c2rmr-r-`Xc2rrcrrmc#rmrrc-c-c#,rc`r-c
-)L)[r2$mc*!'m2q3"r!!!!%!rj!2!2rfN!hr!2rfp[rr&T!&pT!%r`$rp[ErraB
@p[EfrrEfp[m!rrrfrrm@p[Efrrrrp[ErN!6fp[B@p[ErrrEfrrErr`$rpT!&rrr
frrD3"2m!rrD3"2rrpT!(r`$rp[q3"2D3#2m!rrErp[ErpT!)rrrrp[rfp[rfp[B
@p[Efrj!%p[q3"2EfpKErrrErrrrfN!J@&[rrp[m!rrD3"4D3"Irrp[m!rrD3$Im
!rj!2!!!!!3!!!!RB!!!)f!!!!+X+#4emEF`!!!!F!*B!"@PME$3!!!!bD@0X1!!
!!$j*3diM!!!!5QPMFb-!!!"@D@0c0!!!!'*TBh-i!!!!EJ#'rrm!N!Q'rrm!!!)
%!*!&KJ#3"!B)!*!&K[rr!!!($!#3"BErr`!!"e!!N!@'rrm!!!I8!*!%&%e*9#"
,CA*LCA*[Fb"-D@*bBA*j0,J:
\ No newline at end of file
+(This file must be converted with BinHex 4.0)
:#NPMEfjc,R*cFQ-!8P053d4[G@F"!*!(#S-I8`#3"!%!!!!*f!!!#0J!!!#V!")
!!!!$!!!!-!!!!"-!!!!$!!!!0!!!!"3!!!!$!!!!1!!!!"8!!!!$!!!!2!!!!"B
!!!!$!!!!3!!!!"F!!!!#!!!!4!!!!"J!!!!$!!!!5!!!!"N!!!!$!!!!6!!!rj!
%!!(rrrrq!!,rrrrj!!!!'`!!!"!!"!!!!!8!!!!$!*!((!!!!!-!!!!%!!!!(3!
!!!-!!!!)!!!!(J!!!'J!!!!-!!$rrrrk!!(rrrrj!!(rrrri!!!!#!!!!!%!!!!
'!!(rrrrh!!!!#!!!!!%!!!!'!(3ZDfGIE@&VC9pcCA&IER9Y!!2R,J!!!J!2rj!
0!!$`!*!-$2!!m-c2rj!'c*!%cI!!m-c2r`#3"Irrc-c0m!$`c-rr)*!(rmc0m!$
`c-rr!J)#)[rr)Jr-cI!!m-c2rb!J)[r2%Irpc-h`!2$FcrmL!Lr-ca%4rmc0m!$
`rFrrmL$mc2%Im4r-cI!!r`m-c-mLr-ca%4rrc-h`m2!2$-c-mLr2%Im4r-c0r`m
!$`c-c-mLrar2rrc-cI$I!!m-c-c-m[%Ic*!'h`!2$-c-c-rar-b3"Ym!$`c-c-c
2%Ic-N!EI!!m-c-crm4r-N!II!!m-c-m4%4(mc*!'h`!2$-c2(rrar2c-N!AI!!m
-c-mIc2(r$mb3"Gm!$`c-car2mImJr-c-c0cI!!m-c-mIra(r)#r-c-hphr!2$-r
r%4%Ic2)#r-c0rprr$`c2)[rrr-c2)#r-cI#3"!c-mJ,rrrrb!J,rrI!!m!$-c-r
`)#!J!#!Jrrh`!2$-N!62mL)#N!6rrI!!m-b3"Frb)*!%rrh`!2$-N!E2mL)L)[r
prZ$`c*!(crq3"2hql[$-N!I0hGhGrrhql[cGN!hqi!rrN!hZ!!!!"!!!rj!E!*!
%r`#3'[Er!!!!r`$fp[EpN!hfN!Rjr`!!!2m!p[EfrIhp#!'3#If3"2D3"IRr!!!
!r`$fp[EprId)N!lprIEfp[Rr!!!!r`$fp[EprId)N!Bc-rf3"$-c#2hfp[Ejr`!
!!2m!p[EfrIhp#*!&-rhpp[m,#rrrrIVfp[Ejr`!!!2m!qIEfrIhp-`J)#$2rp[E
fr`Z3"2rrp[EfqIm!!!$r!2rjp[f3"$-)#2rfp[Er#`[rr`X,rrEfp[Rr!!!!rrm
!r`$fN!6p-`Mpp[Efr`Z3"2rrrrEfp[Rr!2m!r`!!r`$fN!Ap-`Mpp[m,#rrr#`[
rpT!%qIrr!2m!!!$r!2D3"[dc#2hr#rrfrj!%pT!%qIm!qIm!!!$r!2D3"rdcr3X
,rrD3$2Rr!!!!r`$fN!Mpr`[rpT!0qIm!!!$r!2D3#2m,#rrfN!hjr`!!!2m!pT!
&rrrr#`[rpT!1qIm!!!$r!2D3"2m,N!ErpT!0qIm!!!$r!2D3"2m,rj!%#rrfrID
3#rRr!!!!r`$fN!6r#rrfp[m,rrd"rID3#[Rr!!!!r`$fN!6r#rrfrrm,rrd)!Ih
fN!Ijp[Rr!!!!r`$fN!6r#rrrr`X,rrmc#!MppT!&qIrjqIrr!!$r!2EfrIhr#j!
&rrEfrc-)#2hfN!6jrrrjrrrr!2m!p[Ep#$2rN!AfN!6r#!J)rIEfp[Rr!2m!r`$
r!!$fp[Ep#!JcrIhrN!8)!3J)#2hprIRr!!!!r`!!!2D3"Ihp#*!'!3%"#*!%rIh
pqIm!!!$r!2D3#Ihp-c-)N!RprIhjr`!!!2m!pT!,rIdc#*!)rIhpqIm!!!$r!2D
3$Ihp-j!(rIhpqIrmr!$r!2D3$rf3#[Rrr2cmr`$fN!rkN!IprIhjrrcmr2rfqC!
Drrcm!!$rN"[mr!#3"!%!Irrrm)!!!!L(rm!)K`!m#)F!!`L(!2%)K`02#)F%3`L
RL*N)d%L(#T!!*6)0%"0H#4!+3!%3"S!"%!5!!4!j!!%33)!"%&kJ!4"5d!%39XJ
"%&c%#C(")Jh42K%+S)rJk)"J!1L!'!$SJ!B!k)!"J1k!!(r[J!"rli!!!!jrrrr
mIrrrm2rrrrMrrrrirrrrq2rrrrMrrrrirrrrq2rrrrMrrrrihrrrqTrrrrmIrrr
r(rrrrarrrrmIrrrr(rrrrarrrrmIrrrr(rrrrarrrrmIrrrrRrrrrprrrrVrrrr
irrrrq2rrrrMrrrrirrrrr[q3#rjrrrrm!!!!32rqJ!+I`TiLh(2%bd'K3`&H!9)
"dL2H1i"kJrU!![rqrrlrr[rqrrlrN!4rrhrrIrprrj!'r[rqrrlrrJ!!!)$rN!I
`r-b3"[$mcr)L)Xc-m2c2mLc-r-c`rmrbc-rrc2rrc-,-rmcmr`r-c-rmr-c2$mc
-rmc-c-m2crrmc-c-c`r2c2c-c-c2rmr-r-`Xc2rrcrrmc#rmrrc-c-c#,rc`r-c
-)L)[r2$mc*!'m2q3"r!!!!%!rj!2!2rfN!hr!2rfp[rr&T!&pT!%r`$rp[ErraB
@p[EfrrEfp[m!rrrfrrm@p[Efrrrrp[ErN!6fp[B@p[ErrrEfrrErr`$rpT!&rrr
frrD3"2m!rrD3"2rrpT!(r`$rp[q3"2D3#2m!rrErp[ErpT!)rrrrp[rfp[rfp[B
@p[Efrj!%p[q3"2EfpKErrrErrrrfN!J@&[rrp[m!rrD3"4D3"Irrp[m!rrD3$Im
!rj!2!!!!!3!!!!RB!!!)f!!!!+X+D)0`8e`!!!!F!*B!"@PME$3!!!!bD@0X1!!
!!$j*3diM!!!!5QPMFb-!!!"@D@0c0!!!!'*TBh-i!!!!EVqjrrm!N!LrZIrr!!!
#"!#3",qj!*!%"JJ!N!5rZIrr!!!($!#3",qjrrm!!!G3!*!%[lRrr`!!"p3!N!3
868P8)%YPFQ*PFQpc)%aTBR*KFRQH,!:
\ No newline at end of file
diff --git a/src/mac/MIT Kerberos.r b/src/mac/MIT Kerberos.r
index 38fc7f445..ba19e6e0c 100644
--- a/src/mac/MIT Kerberos.r
+++ b/src/mac/MIT Kerberos.r
@@ -1,11 +1,34 @@
 #include "Types.r"
 
+/*--vend „ Vendor Information Template (for Conflict Catcher) -----------------------*/
+type 'vend' {
+		longint;												/* version (0) */
+		pstring;												/* name */
+		pstring;												/* address */
+		pstring;												/* voice phone */
+		pstring;												/* fax phone */
+		pstring;												/* info URL	*/
+		pstring;												/* update URL */
+		pstring;												/* e-mail URL */
+};
+
 resource 'vers' (2, purgeable) {
 	2,
 	0,
 	final,
-	1,
+	0,
 	verUS,
-	"2.0fc1",
-	"MIT Kerberos for the Macintosh 2.0fc1"
-};
\ No newline at end of file
+	"2.0",
+	"MIT Kerberos for the Macintosh 2.0"
+};
+
+resource 'vend' (-20640, purgeable) {
+	0,
+	"MIT Information Systems MacDev",
+	"77 Massachusetts Avenue, E40-318, Cambridge, MA 02139",
+	"",
+	"",
+	"http://mit.edu/macdev/www/",
+	"",
+	"mailto:macdev@mit.edu"
+};
diff --git a/src/mac/MITKerberosLib.r b/src/mac/MITKerberosLib.r
index 6d4bfd5fd..8774a4935 100644
--- a/src/mac/MITKerberosLib.r
+++ b/src/mac/MITKerberosLib.r
@@ -4,8 +4,6 @@
 
 #include "MIT Kerberos.r"
 
-type 'CCIȘ' as 'STR ';
-
 resource 'hfdr' (-5696, purgeable) {
 	HelpMgrVersion,
 	hmDefaultOptions,
@@ -21,7 +19,7 @@ resource 'hfdr' (-5696, purgeable) {
 	}
 };
 
-resource 'CCIȘ' (128, purgeable) {
+data 'CCIȘ' (128, purgeable) {
 	"A shared library which provides Kerberos v5, "
 	"Generic Security Services (GSS), and DES services."
 };