Fix conflicts after heimdal-1.1 import and add build infrastructure. Import

all non-style changes made by heimdal to our own libgssapi.

1 files changed, 8 insertions, 1 deletions

diff --git a/lib/libgssapi/mech.5 b/lib/libgssapi/mech.5
index 1edcc1a846df..fd17e3a21b04 100644
--- a/lib/libgssapi/mech.5
+++ b/lib/libgssapi/mech.5
@@ -50,11 +50,18 @@ A shared library containing the implementation of this mechanism.
 A kernel module containing the implementation of this mechanism (not
 yet supported in FreeBSD).
 .It Library options (optional)
-Optionsal parameters interpreted by the mechanism. Library options
+Optional parameters interpreted by the mechanism. Library options
 must be enclosed in brackets ([ ]) to differentiate them from the
 optional kernel module entry.
 .El
 .Pp
+The first mechanism listed in
+.Pa "/etc/gss/mech"
+is the default mechanism.
+This mechanism will be used by
+.Xr gss_init_sec_context 3
+if the user doesn't specify a specific mechanism.
+.Pp
 The 
 .Pa "/etc/gss/qop"
 file contains a list of Quality of Protection values for use with