--- cygnus/src/mac/ReadMe	Tue Jul  1 14:14:03 1997
+++ kerbnet-1.2/mac/ReadMe	Tue May 27 22:03:05 1997
@@ -30,9 +30,9 @@
     suntar 2.0.3   available on mac.archive.umich.edu
     untar          available on mac.archive.umich.edu
     tar 4.0        available on mac.archive.umich.edu
-    Stuffit Deluxe (with an additional tar translator)
+    StuffIt Deluxe (with an additional tar translator)
 	
-    suntar and stuffit deluxe can perform cr-lf translations
+    suntar and StuffIt deluxe can perform cr-lf translations
 
 NOTE:  Beware that all tars are not created equal.  Some tars will dump 
 the first level directory into the source file location, while others 
@@ -49,7 +49,7 @@
 	
    Drop Text  available on mac.archive.umich.edu
    CRLF       available on mac.archive.umich.edu
-   Stuffit    Deluxe (with translator) from Aladdin Systems Inc.
+   StuffIt    Deluxe (with translator) from Aladdin Systems Inc.
    BBEdit     demo version available on mac.archuve.umich.edu
               or Bare Bones Software
 
@@ -59,129 +59,79 @@
 
 5) Unstuff .hqx Files
 
-At this point all source files are now Mac text files.  There are a number
-of special files which have been packed in binhqx format for the
-Mac to ensure the resource forks were not damaged, and that binary 
-translation did not corrupt them.  These files are located in the 
-following paths:
-
-   :mac:kconfig:kconfig.sit.hqx
-   :mac:libraries:libraries.sit.hqx
-   :mac:telnet-k5-auth:telnet-k5-auth.sit.hqx
-   :mac:telnet:telnet.sit.hqx
+At this point all source files are now Mac text files. There are two
+files which have been packed in binhex format for the Mac to ensure
+the resource forks were not damaged, and that binary translation did
+not corrupt them. These files are located in the following paths:
+
+   :mac:ncsa-telnet:telnet-2.7k5.sit.hqx
+   :mac:ncsa-telnet:telnet-2.7k5-source.sit.hqx
 		
-These binhqx files each contain a Stuffit archive with metrowerks project
-files and resource files.  To convert these files, use a program 
-(listed below) to convert the file from binhqx format, then convert the 
-"xxx.sit" file which should result from the previous conversion to the 
-expanded files.  There are programs which accomplish both steps automatically.
+The first is a slightly modified version of NCSA Telnet 2.7b4 that
+works with the authentication/encryption plugin in
+:mac:telnet-k5-auth. The second file is the source for it--you only
+need to unstuff it if you are planning to rebuild it.
+
+To convert these files, use a program (listed below) to convert the
+file from binhqx format, then convert the "xxx.sit" file which should
+result from the previous conversion to the expanded files. There are
+programs which accomplish both steps automatically.
 		
-To convert from binhqx to archive:
-   Stuffit Expander	(available on mac.archive.umich.edu)
-   Stuffit Deluxe (with binhqx translator)
-   binhqx
+To convert from binhex to archive:
+   StuffIt Expander	(available on mac.archive.umich.edu)
+   StuffIt Deluxe (with binhex translator)
+   binhex
    suntar 2.0.3
 		
 To convert from archive to individual files:
-   Stuffit Expander	(available on mac.archive.umich.edu)
-   Stuffit Deluxe
-   Stuffit Lite
+   StuffIt Expander	(available on mac.archive.umich.edu)
+   StuffIt Deluxe
+   StuffIt Lite
    DropUnstuff
    NOW Utilities 5.0 Quickfiler
 
 
-6) Build the Kerberos Libraries
-	
-Building the static libraries:  Be sure to use "MW C/C++ 68K 1.2.2" when 
-building these projects.  Open the project (libkrb5.µ or libgss.µ) and 
-type Cmd-M, or select "Make" from the "Project" menu.  This will produce 
-"libkrb5" or "libgss" depending on the selected project. You must
-build libkrb5 before libgss.
-
-Building the CFM libraries.  Be sure the use "MW C/C++ CFM68K 1.0d1" when
-building these projects.  Open one of "Kerberos 5 Library.µ" or 
-"GSS Library.µ".  Type Cmd-M, or select "Make" from the "Project" menu.
-This will produce "Kerberos 5 Library" or "GSS Library" depending on the 
-selected project.
-
-
-7) Build the Cygnus Network Security Application
-
-To start the build of kconfig (or CNS Config) double click on the project 
-file named :mac:kconfig:kconfig.µ or drag it onto the application/compiler
-"MW C/C++ 68K 1.2.2".  If you are doing CFM development be careful that the
-CFM compiler is not invoked when you double click on the project file.
+6) Build the Kerberos Libraries and Applications
 	
-To start the build type Cmd-M or select "Make" from the "Project" menu.
-The compiler should build the KerberosHeaders.pch file into a precompiled
-header file, then start compiling the sources, finally link the executable
-named "CNS Config" and write a symbol files for use with symbolic debugging.
-
-At this point assuming a valid configuration (see kerberos release notes for
-usage) double clicking on "CNS Config" should bring you to the main CNS 
-configuration window where you can login, logout, change passwords and the
-environment.
-
-8) Build Kerberized Telnet
-
-The telnet-k5-auth directory contains the project file necessary to
-build a telnet authorization code resource module.  Open the project
-"K5AuthModule" in the :mac:telnet-k5-auth folder and type Cmd-M,
-or select "Make" from the "Project" menu.  This will build the
-telnet authorization module.  The authorization module should be
-placed in the same directory as the NCSA telnet application which uses
-it. Any NCSA telnet version after 2.6.1d8 should work in conjunction
-with the supplied authentication module.  Also included in the
-telnet-k5-auth directory is version 2.7b4 of telnet.
+Open MPW and use the `Directory' command in the MPW Shell to change to
+the top-level directory of your Kerberos build tree. (If your
+untarring program output MPW text files, you can do start up MPW in
+that directory by double-clicking on one of the files in that
+directory.) In the Worksheet window, type `:makeworld' and Enter or
+Command+Return. (Note the `:' before `makeworld'.) This should
+automatically build the libraries, CNS Config program (in
+:mac:kconfig), telnet authentication plugin (in :mac:telnet-k5-auth),
+and GSS sample application (in :mac:gss-sample).
+
+
+7) Build Kerberized Telnet (optional)
+
+If you want to rebuild NCSA Telnet, unpack the sources as described
+above, open the 68k or PPC project file in CodeWarrior, and type
+Command+M (or choose `Make' from the `Project' menu). The PPC project
+expects the 68k client to have been built already, and incorporates it
+into a fat executable.
+
 
 
 Installation
 
 The following assumes that you have followed the steps above to build
-the Kerberos libraries.  What you now have supports both the Kerberos
-and GSS APIs.  Each is supported as both a shared library and a Code 
-Warrior static link library for 68k Macs.  Following are the binary
-components provided in this release:
+the Kerberos libraries. What you now have supports both the Kerberos
+and GSS APIs. Following are the binary components provided in this
+release:
 
-   * Code Fragment Manager libraries for 68k Macintosh
-     (:mac:libraries:GSSLibrary and :mac:libraries:Kerberos 5 Library)
-    
-   * Code Warrior static libraries for 68k Macintosh
-     (:mac:libraries:libgss and :mac:libraries:libkrb5)
+   * CodeWarrior static libraries for 68k and PPC Macintosh
+     (libgss.68k, libkrb5.68k, libgss.PPC, libkrb5.PPC)
+
+   * CodeWarrior static libraries for 68k Code Resources
+     (libgss.68k.a4, libkrb5.68k.a4)
 
    * Cygnus Network Security Configuration program
      (:mac:kconfig:CNS Config)
     
+   * GSS Sample application
+     (:mac:gss-sample:gss-client)
+    
    * Sample krb5.ini file using CYGNUS.COM as the default realm
      (:mac:krb5.ini)
-     
-   * An include directory containing the files necessary
-     for development (:include)
-
-   To install the Kerberos system:
-
-   1) Drop the :mac:krb5.ini file into the "Preferences"
-   folder contained in the "System Folder".
-   
-   2) To install the shared libraries (optional), simply copy the 
-   "GSS Library" and "Kerberos 5 Library" files to the "Extensions" 
-   folder in the "System Folder".
-
-
-Getting Started Programming
-
-You may program using either the Kerberos or GSS APIs.  As delivered, the
-libraries containing the GSS API are complete.  They do not rely on the
-krb5 library.
-
-To add Kerberos utility to a Code Warrior based application:
-
-   1) Decide on whether to use CFM or static libraries.
-
-   2) Decide on whether to use ther Kerberos or GSS APIs.
-
-   3) Drag the appropriate library into your project
-     (One of: :mac:libraries:libgss, mac:libraries:libkrb5,
-     :mac:libraries:GSS Library or :mac:libraries:Kerberos 5 Library).
-
-   4) Set the project options to 4 byte integers and enums treated as ints.
