Merge sync of head

19 files changed, 26 insertions, 28 deletions

diff --git a/lib/librpcsec_gss/Makefile b/lib/librpcsec_gss/Makefile
index 67a79635cc0d3..c3e768445004b 100644
--- a/lib/librpcsec_gss/Makefile
+++ b/lib/librpcsec_gss/Makefile
@@ -5,8 +5,7 @@ SHLIB_MAJOR= 1
 SRCS+=	rpcsec_gss.c rpcsec_gss_prot.c rpcsec_gss_conf.c rpcsec_gss_misc.c \
 	svc_rpcsec_gss.c
 
-DPADD+=	${LIBGSSAPI}
-LDADD+=	-lgssapi
+LIBADD=	gssapi
 
 VERSION_DEF=	${.CURDIR}/../libc/Versions.def
 SYMBOL_MAPS=	${.CURDIR}/Symbol.map
diff --git a/lib/librpcsec_gss/Makefile.depend b/lib/librpcsec_gss/Makefile.depend
index fc5d471433784..89fa5dfd28c19 100644
--- a/lib/librpcsec_gss/Makefile.depend
+++ b/lib/librpcsec_gss/Makefile.depend
@@ -3,7 +3,6 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
-	bin/cat.host \
 	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
diff --git a/lib/librpcsec_gss/rpc_gss_get_error.3 b/lib/librpcsec_gss/rpc_gss_get_error.3
index eea77c7554981..a16c58ee2dc37 100644
--- a/lib/librpcsec_gss/rpc_gss_get_error.3
+++ b/lib/librpcsec_gss/rpc_gss_get_error.3
@@ -44,8 +44,8 @@ Get details of the last RPCSEC_GSS error.
 A pointer to a structure where the error details will be returned
 .El
 .Sh SEE ALSO
-.Xr rpc 3 ,
 .Xr gssapi 3 ,
+.Xr rpc 3 ,
 .Xr rpcset_gss 3
 .Sh HISTORY
 The
diff --git a/lib/librpcsec_gss/rpc_gss_get_mech_info.3 b/lib/librpcsec_gss/rpc_gss_get_mech_info.3
index 0bf6d452f71a7..8fcade3fe6096 100644
--- a/lib/librpcsec_gss/rpc_gss_get_mech_info.3
+++ b/lib/librpcsec_gss/rpc_gss_get_mech_info.3
@@ -54,8 +54,8 @@ a list of the supported qualities of protection is returned,
 otherwise
 .Dv NULL .
 .Sh SEE ALSO
-.Xr rpc 3 ,
 .Xr gssapi 3 ,
+.Xr rpc 3 ,
 .Xr rpcset_gss 3
 .Sh HISTORY
 The
diff --git a/lib/librpcsec_gss/rpc_gss_get_mechanisms.3 b/lib/librpcsec_gss/rpc_gss_get_mechanisms.3
index 7c3bcca0e647e..224ab42e8db21 100644
--- a/lib/librpcsec_gss/rpc_gss_get_mechanisms.3
+++ b/lib/librpcsec_gss/rpc_gss_get_mechanisms.3
@@ -41,8 +41,8 @@ Return a
 .Dv NULL
 terminated list of installed security mechanisms.
 .Sh SEE ALSO
-.Xr rpc 3 ,
 .Xr gssapi 3 ,
+.Xr rpc 3 ,
 .Xr rpcset_gss 3
 .Sh HISTORY
 The
diff --git a/lib/librpcsec_gss/rpc_gss_get_principal_name.3 b/lib/librpcsec_gss/rpc_gss_get_principal_name.3
index 286c09f688829..ba12835aa43cd 100644
--- a/lib/librpcsec_gss/rpc_gss_get_principal_name.3
+++ b/lib/librpcsec_gss/rpc_gss_get_principal_name.3
@@ -67,9 +67,9 @@ if the principal was created or
 .Dv FALSE
 otherwise
 .Sh SEE ALSO
-.Xr rpc 3 ,
-.Xr gssapi 3 ,
 .Xr gss_export_name 3 ,
+.Xr gssapi 3 ,
+.Xr rpc 3 ,
 .Xr rpcset_gss 3
 .Sh HISTORY
 The
diff --git a/lib/librpcsec_gss/rpc_gss_get_versions.3 b/lib/librpcsec_gss/rpc_gss_get_versions.3
index 9d79db4f98927..725b2c00262d8 100644
--- a/lib/librpcsec_gss/rpc_gss_get_versions.3
+++ b/lib/librpcsec_gss/rpc_gss_get_versions.3
@@ -50,8 +50,8 @@ The value of
 is set to the lowest supported protocol version
 .El
 .Sh SEE ALSO
-.Xr rpc 3 ,
 .Xr gssapi 3 ,
+.Xr rpc 3 ,
 .Xr rpcset_gss 3
 .Sh HISTORY
 The
diff --git a/lib/librpcsec_gss/rpc_gss_getcred.3 b/lib/librpcsec_gss/rpc_gss_getcred.3
index 515bd99743f89..3bb4b6d4432f7 100644
--- a/lib/librpcsec_gss/rpc_gss_getcred.3
+++ b/lib/librpcsec_gss/rpc_gss_getcred.3
@@ -70,8 +70,8 @@ if successful,
 .Dv FALSE
 otherwise.
 .Sh SEE ALSO
-.Xr rpc 3 ,
 .Xr gssapi 3 ,
+.Xr rpc 3 ,
 .Xr rpc_gss_set_callback 3 ,
 .Xr rpcset_gss 3
 .Sh HISTORY
diff --git a/lib/librpcsec_gss/rpc_gss_is_installed.3 b/lib/librpcsec_gss/rpc_gss_is_installed.3
index 3d83b71ad2b60..20df8bd2d9fb1 100644
--- a/lib/librpcsec_gss/rpc_gss_is_installed.3
+++ b/lib/librpcsec_gss/rpc_gss_is_installed.3
@@ -51,8 +51,8 @@ if the mechanism is installed,
 .Dv FALSE
 otherwise.
 .Sh SEE ALSO
-.Xr rpc 3 ,
 .Xr gssapi 3 ,
+.Xr rpc 3 ,
 .Xr rpcset_gss 3
 .Sh HISTORY
 The
diff --git a/lib/librpcsec_gss/rpc_gss_max_data_length.3 b/lib/librpcsec_gss/rpc_gss_max_data_length.3
index 57cf673032cb7..6438ab8109ed4 100644
--- a/lib/librpcsec_gss/rpc_gss_max_data_length.3
+++ b/lib/librpcsec_gss/rpc_gss_max_data_length.3
@@ -50,8 +50,8 @@ Maximum packet size of the underlying transport protocol
 .Sh RETURN VALUES
 The maximum message size that can be encoded
 .Sh SEE ALSO
-.Xr rpc 3 ,
 .Xr gssapi 3 ,
+.Xr rpc 3 ,
 .Xr rpcset_gss 3
 .Sh HISTORY
 The
diff --git a/lib/librpcsec_gss/rpc_gss_mech_to_oid.3 b/lib/librpcsec_gss/rpc_gss_mech_to_oid.3
index 1156325365d55..626888002bb6b 100644
--- a/lib/librpcsec_gss/rpc_gss_mech_to_oid.3
+++ b/lib/librpcsec_gss/rpc_gss_mech_to_oid.3
@@ -54,8 +54,8 @@ If the mechanism is found,
 is returned, otherwise
 .Dv FALSE .
 .Sh SEE ALSO
-.Xr rpc 3 ,
 .Xr gssapi 3 ,
+.Xr rpc 3 ,
 .Xr rpcset_gss 3
 .Sh HISTORY
 The
diff --git a/lib/librpcsec_gss/rpc_gss_oid_to_mech.3 b/lib/librpcsec_gss/rpc_gss_oid_to_mech.3
index 8ab8340f07cb2..175e361735206 100644
--- a/lib/librpcsec_gss/rpc_gss_oid_to_mech.3
+++ b/lib/librpcsec_gss/rpc_gss_oid_to_mech.3
@@ -54,8 +54,8 @@ If the mechanism is found,
 is returned, otherwise
 .Dv FALSE .
 .Sh SEE ALSO
-.Xr rpc 3 ,
 .Xr gssapi 3 ,
+.Xr rpc 3 ,
 .Xr rpcset_gss 3
 .Sh HISTORY
 The
diff --git a/lib/librpcsec_gss/rpc_gss_qop_to_num.3 b/lib/librpcsec_gss/rpc_gss_qop_to_num.3
index bb8b50a5d7f79..4041e80accaa9 100644
--- a/lib/librpcsec_gss/rpc_gss_qop_to_num.3
+++ b/lib/librpcsec_gss/rpc_gss_qop_to_num.3
@@ -56,8 +56,8 @@ If the value is found,
 is returned, otherwise
 .Dv FALSE .
 .Sh SEE ALSO
-.Xr rpc 3 ,
 .Xr gssapi 3 ,
+.Xr rpc 3 ,
 .Xr rpcset_gss 3
 .Sh HISTORY
 The
diff --git a/lib/librpcsec_gss/rpc_gss_seccreate.3 b/lib/librpcsec_gss/rpc_gss_seccreate.3
index 37e9efd5c04af..7e9bc3483fd88 100644
--- a/lib/librpcsec_gss/rpc_gss_seccreate.3
+++ b/lib/librpcsec_gss/rpc_gss_seccreate.3
@@ -96,11 +96,11 @@ To use this security context for subsequent RPC calls, set
 .Va clnt->cl_auth
 to this value.
 .Sh SEE ALSO
-.Xr rpc 3 ,
 .Xr gssapi 3 ,
+.Xr rpc 3 ,
+.Xr rpcset_gss 3 ,
 .Xr mech 5 ,
-.Xr qop 5 ,
-.Xr rpcset_gss 3
+.Xr qop 5
 .Sh HISTORY
 The
 .Nm
diff --git a/lib/librpcsec_gss/rpc_gss_set_callback.3 b/lib/librpcsec_gss/rpc_gss_set_callback.3
index 2d202a5b03832..54f3f517680d1 100644
--- a/lib/librpcsec_gss/rpc_gss_set_callback.3
+++ b/lib/librpcsec_gss/rpc_gss_set_callback.3
@@ -93,9 +93,9 @@ if the callback was registered successfully or
 .Dv FALSE
 otherwise
 .Sh SEE ALSO
-.Xr rpc 3 ,
 .Xr gssapi 3 ,
-.Xr rpc_gss_getcred 3
+.Xr rpc 3 ,
+.Xr rpc_gss_getcred 3 ,
 .Xr rpcset_gss 3
 .Sh HISTORY
 The
diff --git a/lib/librpcsec_gss/rpc_gss_set_defaults.3 b/lib/librpcsec_gss/rpc_gss_set_defaults.3
index dcef9dad0b606..983d2c039bc0d 100644
--- a/lib/librpcsec_gss/rpc_gss_set_defaults.3
+++ b/lib/librpcsec_gss/rpc_gss_set_defaults.3
@@ -56,8 +56,8 @@ Returns
 .Dv TRUE
 if the values were set
 .Sh SEE ALSO
-.Xr rpc 3 ,
 .Xr gssapi 3 ,
+.Xr rpc 3 ,
 .Xr rpcset_gss 3
 .Sh HISTORY
 The
diff --git a/lib/librpcsec_gss/rpc_gss_set_svc_name.3 b/lib/librpcsec_gss/rpc_gss_set_svc_name.3
index 97f1dee439437..44b15c73c150f 100644
--- a/lib/librpcsec_gss/rpc_gss_set_svc_name.3
+++ b/lib/librpcsec_gss/rpc_gss_set_svc_name.3
@@ -72,9 +72,9 @@ if the service principal was registered or
 .Dv FALSE
 otherwise.
 .Sh SEE ALSO
-.Xr rpc 3 ,
-.Xr gssapi 3 ,
 .Xr gss_acquire_cred 3 ,
+.Xr gssapi 3 ,
+.Xr rpc 3 ,
 .Xr rpcset_gss 3
 .Sh HISTORY
 The
diff --git a/lib/librpcsec_gss/rpc_gss_svc_max_data_length.3 b/lib/librpcsec_gss/rpc_gss_svc_max_data_length.3
index 24eeae90dd263..59ee837698adb 100644
--- a/lib/librpcsec_gss/rpc_gss_svc_max_data_length.3
+++ b/lib/librpcsec_gss/rpc_gss_svc_max_data_length.3
@@ -50,8 +50,8 @@ Maximum packet size of the underlying transport protocol
 .Sh RETURN VALUES
 The maximum message size that can be encoded
 .Sh SEE ALSO
-.Xr rpc 3 ,
 .Xr gssapi 3 ,
+.Xr rpc 3 ,
 .Xr rpcset_gss 3
 .Sh HISTORY
 The
diff --git a/lib/librpcsec_gss/rpcsec_gss.3 b/lib/librpcsec_gss/rpcsec_gss.3
index d3120a6cee1b3..966a1e06acd70 100644
--- a/lib/librpcsec_gss/rpcsec_gss.3
+++ b/lib/librpcsec_gss/rpcsec_gss.3
@@ -214,12 +214,12 @@ Create a client principal name from various strings
 Calculate maximum server message sizes.
 .El
 .Sh SEE ALSO
-.Xr rpc 3 ,
-.Xr gssapi 3 ,
 .Xr gss_export_name 3 ,
+.Xr gssapi 3 ,
+.Xr rpc 3 ,
+.Xr rpcset_gss 3 ,
 .Xr mech 5 ,
-.Xr qop 5 ,
-.Xr rpcset_gss 3
+.Xr qop 5
 .Sh HISTORY
 The
 .Nm