svn commit: r286608 - stable/9/sbin/mount_nfs

[Rick Macklem]

Author: rmacklem
Date: Mon Aug 10 22:30:13 2015
New Revision: 286608
URL: https://svnweb.freebsd.org/changeset/base/286608

Log:
  MFC: r285260
  Since the case where secflavor < 0 indicates the security flavor is
  to be negotiated, it could be a Kerberized mount. As such, filling
  in the "principal" argument using the canonized host name makes sense.
  If it is negotiated as AUTH_SYS, the "principal" argument is meaningless
  but harmless.

Modified:
  stable/9/sbin/mount_nfs/mount_nfs.c
Directory Properties:
  stable/9/sbin/mount_nfs/   (props changed)

Modified: stable/9/sbin/mount_nfs/mount_nfs.c
==============================================================================
--- stable/9/sbin/mount_nfs/mount_nfs.c	Mon Aug 10 22:26:14 2015	(r286607)
+++ stable/9/sbin/mount_nfs/mount_nfs.c	Mon Aug 10 22:30:13 2015	(r286608)
@@ -801,8 +801,8 @@ getnfsargs(char *spec, struct iovec **io
 		 * For a Kerberized nfs mount where the "principal"
 		 * argument has not been set, add it here.
 		 */
-		if (got_principal == 0 && secflavor >= 0 &&
-		    secflavor != AUTH_SYS && ai_nfs->ai_canonname != NULL) {
+		if (got_principal == 0 && secflavor != AUTH_SYS &&
+		    ai_nfs->ai_canonname != NULL) {
 			snprintf(pname, sizeof (pname), "nfs@%s",
 			    ai_nfs->ai_canonname);
 			build_iovec(iov, iovlen, "principal", pname,