diff options
| author | Keith Vetter <keithv@fusion.com> | 1995-09-28 08:22:34 +0000 |
|---|---|---|
| committer | Keith Vetter <keithv@fusion.com> | 1995-09-28 08:22:34 +0000 |
| commit | f11458f54ce37f436b1deedf68d683466afa33cc (patch) | |
| tree | ca773f55e656e920a32f8934b400da1ed5cbe8a7 /src | |
| parent | 9f3d80f60e0ede10438f160a1e0973b11b49a849 (diff) | |
| download | krb5-f11458f54ce37f436b1deedf68d683466afa33cc.tar.gz krb5-f11458f54ce37f436b1deedf68d683466afa33cc.tar.xz krb5-f11458f54ce37f436b1deedf68d683466afa33cc.zip | |
Working telnet authentication module and project consolidations
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6878 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/Makefile.in | 4 | ||||
| -rw-r--r-- | src/include/k5-int.h | 22 | ||||
| -rw-r--r-- | src/include/krb5.hin | 26 | ||||
| -rw-r--r-- | src/include/krb5/ChangeLog | 5 | ||||
| -rw-r--r-- | src/include/krb5/adm_proto.h | 2 | ||||
| -rw-r--r-- | src/include/krb5/macsock.h | 2 | ||||
| -rw-r--r-- | src/lib/kadm/ChangeLog | 8 | ||||
| -rw-r--r-- | src/lib/kadm/adm_kw_dec.c | 2 | ||||
| -rw-r--r-- | src/lib/kadm/adm_kw_enc.c | 2 | ||||
| -rw-r--r-- | src/lib/krb5/posix/getuid.c | 2 | ||||
| -rw-r--r-- | src/mac/kconfig/kconfig.sit.hqx | 690 | ||||
| -rw-r--r-- | src/mac/libraries/ChangeLog | 9 | ||||
| -rw-r--r-- | src/mac/libraries/KerberosHeaders.pch | 109 | ||||
| -rw-r--r-- | src/mac/libraries/libraries.sit.hqx | 1469 | ||||
| -rw-r--r-- | src/mac/telnet-k5-auth/telnet-k5-auth.sit.hqx | 550 |
16 files changed, 1577 insertions, 1333 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1353cf7dd8..92e4e822c3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +Wed Sep 27 16:00:00 1995 John Rivlin <jrivlin@fusion.com> + + * Makefile.in: Temporarily move autoconf.h file to include + directory while creating kerbsrc.mac tar file. + + * Makefile.in: Include telnet-k5-auth directory in download. + Eliminate telnet directory. + Wed Sep 27 11:47:38 1995 Ezra Peisach <epeisach@kangaroo.mit.edu> * Makefile.in (install-unix): Changed install to install-unix so diff --git a/src/Makefile.in b/src/Makefile.in index 0af7b5fb70..7839388dde 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -199,7 +199,7 @@ FILES= ./* \ WINFILES= windows/* windows/cns/* windows/wintel/* windows/gss/* -MACFILES= mac/* mac/kconfig/* mac/libraries/* mac/telnet/* +MACFILES= mac/* mac/kconfig/* mac/libraries/* mac/telnet-k5-auth/* WINBINARYFILES=windows/cns/*.ico windows/wintel/*.ico windows/gss/*.ico @@ -250,8 +250,10 @@ kerbsrc-nt.zip: awk-windows-mac rm -f $(CLEANUP) kerbsrc.mac: awk-windows-mac + cp mac/libraries/autoconf.h include/autoconf.h tar cvf kerbsrc.tar `find $(FILES) $(MACFILES) -prune -type f -print | grep -v kerbsrc` rm -f $(CLEANUP) + rm -f include/autoconf.h # # Part of building the PC release has to be done on Unix. This includes diff --git a/src/include/k5-int.h b/src/include/k5-int.h index cb70dec60c..314f618f3f 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -177,8 +177,28 @@ int sscanf(const char *str, char const *fmt0, ...); #else /* Rest of include file is for non-Microloss-Windows */ +#ifndef _MACINTOSH +#if defined(__MWERKS__) || defined(applec) || defined(THINK_C) +#define _MACINTOSH +#define SIZEOF_INT 4 +#define SIZEOF_SHORT 2 +#define HAVE_SRAND +#define NO_PASSWORD +#define HAS_LABS +#define ENOMEM -1 +#define ANSI_STDIO +#ifndef _SIZET +typedef unsigned int size_t; +#define _SIZET +#endif +#include <unix.h> +#include <ctype.h> +#endif +#endif + #if defined(_MACINTOSH) + #ifdef NEED_LOWLEVEL_IO #include <fcntl.h> #endif @@ -191,7 +211,7 @@ typedef short nlink_t; typedef unsigned long uid_t; typedef unsigned long gid_t; typedef long off_t; -#ifndef _MWERKS +#ifndef __MWERKS__ struct stat { mode_t st_mode; /* File mode; see #define's below */ diff --git a/src/include/krb5.hin b/src/include/krb5.hin index 4999d44752..cea5d34efe 100644 --- a/src/include/krb5.hin +++ b/src/include/krb5.hin @@ -63,12 +63,36 @@ typedef unsigned char u_char; #define FAR #define NEAR #endif /* !KRB5_CONFIG__ */ -#ifndef _MACINTOSH +#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif #endif /* _MSDOS */ /* + * figure if we're on a macintosh + */ + +#if defined(__MWERKS__) || defined(applec) || defined(THINK_C) +#define _MACINTOSH +#endif + +#ifdef _MACINTOSH +#define SIZEOF_INT 4 +#define SIZEOF_SHORT 2 +#define HAVE_SRAND +#define NO_PASSWORD +#define HAS_LABS +#define ENOMEM -1 +#define ANSI_STDIO +#ifndef _SIZET +typedef unsigned int size_t; +#define _SIZET +#endif +#include <unix.h> +#include <ctype.h> +#endif /* _MACINTOSH */ + +/* * begin wordsize.h */ diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog index c7753c3218..2278193d54 100644 --- a/src/include/krb5/ChangeLog +++ b/src/include/krb5/ChangeLog @@ -1,3 +1,8 @@ +Wed Sep 27 16:00:00 1995 John Rivlin <jrivlin@fusion.com> + + * adm_proto.h: Removed use of prototypes using krb5_db_entry + on the Macintosh. + Tue Sep 26 15:36:20 1995 <tytso@rsts-11.mit.edu> * kdb.h, kdb_dbm.h: Add #if !defined(_MSDOS) && diff --git a/src/include/krb5/adm_proto.h b/src/include/krb5/adm_proto.h index 64b10c46c2..1cc2c02469 100644 --- a/src/include/krb5/adm_proto.h +++ b/src/include/krb5/adm_proto.h @@ -62,7 +62,7 @@ void INTERFACE krb5_adm_disconnect krb5_auth_context, krb5_ccache)); -#if ! defined(_WINDOWS) +#if ! defined(_WINDOWS) && ! defined(_MACINTOSH) /* adm_kw_dec.c */ krb5_error_code krb5_adm_proto_to_dbent KRB5_PROTOTYPE((krb5_context, diff --git a/src/include/krb5/macsock.h b/src/include/krb5/macsock.h index 1b8e307541..d320f2aa6c 100644 --- a/src/include/krb5/macsock.h +++ b/src/include/krb5/macsock.h @@ -122,7 +122,7 @@ struct servent { char *s_proto; /* protocol to use */ }; -#ifndef _MWERKS +#ifndef __MWERKS__ /* Timeout values */ struct timeval { long tv_sec; /* Seconds */ diff --git a/src/lib/kadm/ChangeLog b/src/lib/kadm/ChangeLog index ab1e6780c1..f0afd5f6d6 100644 --- a/src/lib/kadm/ChangeLog +++ b/src/lib/kadm/ChangeLog @@ -1,3 +1,11 @@ +Tue Sep 27 12:00:00 1995 <jrivlin@fusion.com> + + * adm_kw_dec.c (krb5_adm_proto_to_dbent): Routine removed for + Windows and Mac to match with the prototype. + + * adm_kw_dec.c (krb5_adm_dbent_to_proto): Routine removed for + Windows and Mac to match with the prototype. + Tue Sep 26 16:24:00 1995 <tytso@rsts-11.mit.edu> * alt_prof.c (krb5_read_realm_params): On an error, initialize the diff --git a/src/lib/kadm/adm_kw_dec.c b/src/lib/kadm/adm_kw_dec.c index 9258353757..83c9395ae5 100644 --- a/src/lib/kadm/adm_kw_dec.c +++ b/src/lib/kadm/adm_kw_dec.c @@ -226,6 +226,7 @@ decode_kw_tagged(dataentp, keyword, ntags, taglist, lenp, datap) return(kret); } +#if ! defined(_WINDOWS) && ! defined(_MACINTOSH) /* * krb5_adm_proto_to_dbent() - Convert external attribute list into a * database entry. @@ -574,3 +575,4 @@ krb5_adm_proto_to_dbent(kcontext, nent, data, validp, dbentp, pwordp) *validp |= parsed_mask; return(retval); } +#endif diff --git a/src/lib/kadm/adm_kw_enc.c b/src/lib/kadm/adm_kw_enc.c index 4e0318712e..3a0741c104 100644 --- a/src/lib/kadm/adm_kw_enc.c +++ b/src/lib/kadm/adm_kw_enc.c @@ -161,6 +161,7 @@ format_kw_tagged(datap, kwordp, ntags, taglist, vallen, val) return(retval); } +#if ! defined(_WINDOWS) && ! defined(_MACINTOSH) /* * krb5_adm_dbent_to_proto() - Convert database a database entry into * an external attribute list. @@ -428,4 +429,5 @@ krb5_adm_dbent_to_proto(kcontext, valid, dbentp, password, nentp, datap) *nentp = outindex; return(kret); } +#endif diff --git a/src/lib/krb5/posix/getuid.c b/src/lib/krb5/posix/getuid.c index 2c0109521b..a44aa743ee 100644 --- a/src/lib/krb5/posix/getuid.c +++ b/src/lib/krb5/posix/getuid.c @@ -1,5 +1,5 @@ /* Very simple getuid() for systems that don't have one. */ -#ifndef _MWERKS +#ifndef __MWERKS__ int getuid() { diff --git a/src/mac/kconfig/kconfig.sit.hqx b/src/mac/kconfig/kconfig.sit.hqx index e836ba78bc..8ea45b178a 100644 --- a/src/mac/kconfig/kconfig.sit.hqx +++ b/src/mac/kconfig/kconfig.sit.hqx @@ -1,346 +1,346 @@ (This file must be converted with BinHex 4.0) - -:#fYMEfjQD@FZFfPd!&0*9%46593K!3#3!cmp!!!"4S3,8dP8)3!#!!!r2A*-BA8 -#!3#3!aB!!!d!$'YMEfjQD@FZFR0bBcl5$!!6Y2S!N!1!!*!%!NXG`2,I!*!8-3F -!N!6rN!458e*$4'peCb%!UekH"+aMSJ#3!fkS!*!'-)%!N!5+AJ#3#-ed$X$i[V- -VQT20VV1,G96Z0XpZjFUpl5p(fjTH,hpl0m[-@rI&Pp1Rh*0lFLpk43Im[)AEUD` -Z6[FJpS[RjA80G1'r22r@aH[XdX[VM2*&&fl3BjYGbqPL[$bIlM22VQ0j+rIAQAP -!9ehApdfkfJmhj%X%5L!C3,+3!)IN))&'$NS1-J)"1Z$hQh3LPSKFrj*)&rl"[i$ -c2jqD05YkZUrV@YAFfpHlBP8!%8Z[@,UJ[@GJeFNL6a,KL2r)qFa9[a8bRZi(hf* -lP)66)T44j"UV4[UY#d1"bbj9IadLcl)@$&9G0I1U@9HpkkUc[DJ*FTDFF@p!"Z' -p65SekTHXif@GG88*fr-6JPljHhMV3T8,1VTAG+l9Q"1P6fCBbqX0`NNb@CTPcG! -a#h[kqXpUllQKSk[E4,B#Ch%*TeADj$,J9#cYl&Kl!b0q3m*($9!J*$1NCkL1#N3 -ZAK,T@,QbYl1[l`d9jNUl,!C@@38bI,Gdb`-90I0@hY$9(HRVl,fTXaI9T9D1dIL -2@UI*[9C(54r2lqRc84Q"pi4aI5VP5MR@DKLDFQPRll@G[6epN58GIAdhpr5ZM#a -BhG'pUP04)R+hc,5ZpT5*b"UC+4mE#LhZZ-(%cdEmaDAifA+mA)ciqJ8$[EfGhId -P5KUp&&MAPV#@)L1["9E0iXkE$q'X!FiY*CcVj36j9H#F%Z%C!jXi[EHcIm1kcNK -r6`6Cd(AGKY14%9q4"X@G*,mZTeUhH&AS@*NRTmTG3c@,HPCdV)eSCVeE)dm(cQc -VPL(VI3EhG+Q(MRF005cZl!I,0C%"*&Xhp(lhX4SIP)INEGDUS4-@,,iL8XUG"9U -f"hSlqVYkY,3J-aZYDE)S9,'SCe9AYpBaa-33Xbe8LCLHJAlPX`amImYkf02T5e* -[KA`[m$jP6E1QKZT-4NE@HFS($E,eH9PYl3N&N45Q6Uj&a#!L+YXlehEfQ`bp(6& -h)bCd`FSZ`rK,L0JjM[YhL(MK-1j,L#Q1ibk!8PGB$`kGDJVS@5aP6!a0c2&6,P` -2!I02J6Rp#UeBSjA[2k&D8j&M92pNkeHYFkhYINhcr9j0Qi!-6eU2H9jEMV2Q@N0 -$)mVNJQlNbiV1PC&V0d3@E&M92G!AZ@*JhEUHhRl@LKXkeR4'Q,dQDCXRQZcU)pS -P2DZl)kG',KPBfpA4r*T%Bf+YlHcSkic-2[Ib@Fd6,qcTMI4hVPJGk6-dciad)NA -@4VT0$CR4elPLS,HVId2E#P@MH8A2$@G1r#Qp#!LK8+f04'G&cTPeEQ6fc,-MXmk -C1E-C@Nq@-b4NA@jPB'PrLE1CaQ4C*"I+ipD$BT8#ErqR`!qB`-@b8Y,@hi`'rSS -*R#`6V@A@La)X"FEa2qqqmqj6je2@DQN)Z$AL1[!Zp2jqT1BV8Y6hha-h-AiX6aQ -c#PK9idhM4Eq`'jD,RakaD1hB)3(DRrbN"'PIGjf%D*ppYP3S#TSDSX!6TJfm+YV -!UkB0[!QdJAH-XN'r66E!QdJE%E@dJ9G('hMeY)(AS+a&'XNDH'qM$Ea*Y"%jQ6E -`MU80[108(C%T9!Giap-'hJQdJIGffN#B5KYi*kU+D"1T)[j0Y)%AS3fmNfN$EaT -Y),e$e4BjK@V$pdlD`$Z90["1S`fmkE5"GlTQKFJCc!TiSV5"GbBYi-fJ$EaQfX! -l5k0&CM)DH,0S)q*GY)%(,68rcU%0[(19KFM2N3A`ITifm&TS)h)fEH#pQcE`cP1 -f)R2)&RMRd`EHA0V!Dk80K$ED`*ZRUSM-TbV!@d!ErhED`,Z!0[!ZT!fNLe3pe"H -U"lb,D52Q%YV!Zj3fm"E4"Yjl9'@4a93CRXYS!fm*EH"G6KYi5fN$l`V0"V4Jc!E -J,DH0L"KYi,fA&[$H4aYi[k"4)PFb#RLr5"Yi[d3ENHqR$EbVD!2[DNA(d)6S`1Z -J$EaVD30["@dJV+30[%jPL43J5q#YSJfmeE6alk)0[1YT!fQ0US''N@S!l`ED`1Z -QMGJHfX"E4aYi0kTU)Ve8$CiqfX$VT`fm!GV!ZiNfm'j@G8A@8ehJED#0L&qQ$Ea -ED!0[)fhJhDTCJ)%2X`"iQfJ$Ej!!0L,MY)'hQ4E`EPF[QKKkJIG"fX$l&GV!Zi- -f%)CS!qp$LLVbBD)#lb1dJIG4fX$l9GViEk%0T+h+6Q3Ef3([efJ$lf1dJIGafX# -iNcE`lP)94$j"&H#jQcE`lU%02-eHi(f+0["qAGA#H)PU!HmhD52LYfJ$lp1dJAF -[EH$pYUSUFKp9"GlpY)(h!'e%rJjYi2dZEH$pRUS[mL$9"pj$Y)(h-'hJIBBf%"+ -dJIIlDSPmPKE`2NFEH(p!'hKr5"YiRkH0ramTQXJIQ`j0rJ0Yi2d*EH"pJ6E`[NJ -E@(qUV$MH!#Yi[N`EH(p''hKr6KYiAk%02!a+06q'b4jiMp"'a&r5"YjAD32[8GV -!qbY95H3aUJ5mlE5"pcKY42j(fX$lDpV!qaY9%b5T*[#q4KYi1fN$EaGY)$a"'hK -rUkTM8%,4JIGefX$6%5c`rTifm,j"'dMrX(H[kAHIIPVYEhiCLZ2mim0QY21YS5' -e[hhcc@Sr[AbjfXqdYk[pl,4TDSmdQ+(8Gd58dAF"48E2L5LMliNSSqG&P0%,)XS -)hE-bHP&%'@(iV)bq,k+-IN"5B,4(b6mY,p-')e80M2E4"U-NE6"kK6BBlDF04JG -SJp&"fQ#8fUY(dNrVNFbAp8MfB6f5'p)MqC[e5''j(V(Ep8KaQKja'[5`mbmGIfC -Jl-SijK")pD0Rf#GXP8"+8QQN'1h(*34,8YpJE1ZGBU@NQ+TKK2qPLLP,8KN*qa( -&9*!!pT0`K,`!!$a0!KILRdlRJlP8+Th,ZrPJ'[&j#@Eb#FGaDa,aE!S"a5aK[bP -@aREFUN3mR8VP(6GI6#(,8Xq5aq*25L#G6q6FX!dUdAc"XGfTLAL8k#Q!C"+Zkm4 -Mf5a`RAJflQCYSm'%!J*cfD,VC'!)`TiKRdXqJBPF!IjLfNN*3+eme%hE)'bPir! -QdK!eRFSj4GI+)JiP,HHii8)UlEKZ-9jd!rNd`NC8QlZ4*"REPD)6GG*ZUX)'fA5 -Dc!+56MJ)c+H$UA3'LN[@34L8H9B%EV$)3C8Br`a8VGm$EE+JNh!b,N3*&0`LZ%! -3+jdSZX&X1Kfed`(b)E+L5JD+a+-aake)412)!!I!MT&Rk6h-DqKM&E01*K40J`p -NLUVb80*bdVEU9TA1ZfiX(8dE5K#Q2Kj&SYUa6$5$Ae3MPG0!5D*X+"-YZ)9#@T3 -$H9E%&Fa*@mL@9+MSaZJXTX*q!FP)l@Jj`CF[ZU&i*T20&M-"8+9iTZD8-ID5pJE -3"X&`-4E,`LlBD5ZD*TEB%#0A4,j)ZT!!#Q6GQ!hU8p+C$!Z%pfRYJJ''AU%#liS -#D'HbGLCS0(1CR%l'5U1)94MJ9dMp*LBj*5mkXD$YfY&m@NJFf43'2[)$C5j9RFX -`Ie,T2!Y(-@HR*N360VpB+PY%5*a&)@I$9H%8%hBf9dK8jCKBU95Zb"50&r2)*#e -m"mMl"L0j,55hNCf!iXGL)$%NFMB!iS3VTZcd-DJ)ELk9MVXZkjH9)H-mbQl)"X& -meJd9XaQ@0%&pU%j(LbKPf96@B4fd8rY*peC$0e$-S@jCa8a4-pH52,)ZN89pK3# -1PRXTT'V*0`qedkLq44B(cH5%Qmr'N5QCBTTq+5"MN!!J"@JHTp4J&S*+D468kQ) -mMe,*Y&5eEc&ea8*US!CV)C!!P*[#!"F"eCVfd"XG#0X5'id'5L!+'@Xc5TR5YCb -X%a8E[(01&-@mL+S0A!$$K5S6ME,LSJbMpN-M8bL9I*r@mB0ZC3%NSC1V1S2i"", -2-NNP94#S$!C!ME*ZSrbP59)+aBa@d`)SdH(*([9BCkK)ZSLF8`3Al*4d2a-1#9M --Za9j&GHAQjA'c3M8b8)AE52X+!XpQ"Q'F8-CfCbab0-6QLjJC!6GJKY&J5!QQJQ -8IU51XZiTTcQU3ijbXeP*SBa@*A+Hf+3YK#j!Y9!#)%ER,2j3%Fd%fBF,+!X3cZL -FcB#d6F*&"l@F0H(JD--3,1Cba3,U%&S+e%pf3UJXk)4LN!!*C5qVRBb9L,,eB4Y -P-JQ8B9F8[#a@RBdF)FD`b&!0*(59BV"%U-i$AQX@!ZmmkP``!9`Q[143Yh-abT! -!4MqLY5$"rN&*3emN80CLc6)1Ne,C)&LENSBB&"qN$LSUD1G-"q$4[XQN&h)J*r' -m'bKNSfK8LUN#FKc5-GQ-dT8*E4h)@L@f#M(M1-,DP"JR@mdZ&P8ETZ013+&L(V! -ZDCD9H"H9YjAAKJKU-km,I[%%p65S&`eej"!mf6FP4fiVKLFj-`0PL*f"Nl04Frc -+kCAYbQ)XKjbbmkLp9NBE3+KKbVB@6eY#'EElMJS2k9JSE#M1hJ$kC(h&5c+-5Zp -N`MNR%BmAFYQ#9mZdCGRSj6MD,46-,-S9%L#-c#B%qT!!aM`bMVUc!C5BQmG`!6Q -8G5%J#cK51(XNimC6ce-rR!&D!KQApqUhXYpX8Ui+dM1rf%aTN8%cJNTB@k6+fZ" -)+SDq'`dMT'E$'%A28U&Cm028mmA(H!$&!@84P3VLNj11%66YEi-'k!jC4N-%4@- -BFJZQ"BmbY5!)%K"p'eYeY%dJJjN(p-HiKB6+"HperIhXTjl9a83#2cXHBjF$4TS -$D*`NQdH$Q+2D8E3c,UB4'8`Tf*!!6F"F"MdV4((c',"SXaC%HX+dXP$8dXDib-) -(KY!+BL%Ll'LpLV*GaCK"%JIGJ-fLiLAH0IKRdZJS-P'-K6"++D#-TLh8"LC+-68 -*I@NU(80RbMD)fC!!bF5BR8iZjU!QUa8UjT'bp'Cb"pbJVAf3!*p@RCm3Y)"T!$X -S&LkTSj[+CUZdb@*@Dd3ZEMZ*Bq)jY[hkTBVTLQ`Z(XpP8Y%#1QJlBq22J3[DLib -9Jj*-+lpiGT-QdN)aE'"B'3a9U$dR3NkkJ&%$TNFTp!qB8%8VG3"!V6%FdL`XDSq -RqBJ)0eU!l@5#b1"iS@$C'$1&G-6JY@*AhF1q$M-$*8"C-I"352Jadk*-&NG-Q1D -NFkQpi&c%[k"6)N)9Sf&N9Blc'KEFDU5AGT!!A[1cm"-Jjk64r!'h#)p%h5M5#!e -r+QZ84-X&SLrJMa+44HiL0r2C#CKEQ-ilCC4kredBDa3`9Z%8S'M'5@K5%@3apq$ -2Ba+3!)9-G1G05*%#)U4!jKK39'C"$J8Al3-53[PjL6$hicSlY&-jG0`BNFPq-mH -d*H20-Eq9#ZRiX*!!#HB5VZh0ih5-a2T`*a*A",a4h"hi#TKXdT0"4iNK+JLB83P -#+X`)bNR9H628dP6+`8K"Cka@(TRU*$