From owner-svn-src-all@FreeBSD.ORG  Sun May 24 11:10:28 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 137871065675;
	Sun, 24 May 2009 11:10:28 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DBC8B8FC12;
	Sun, 24 May 2009 11:10:27 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4OBARIM088026;
	Sun, 24 May 2009 11:10:27 GMT (envelope-from dfr@svn.freebsd.org)
Received: (from dfr@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4OBARpV088025;
	Sun, 24 May 2009 11:10:27 GMT (envelope-from dfr@svn.freebsd.org)
Message-Id: <200905241110.n4OBARpV088025@svn.freebsd.org>
From: Doug Rabson <dfr@FreeBSD.org>
Date: Sun, 24 May 2009 11:10:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r192678 - in head/sys: kgssapi nfsserver
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 May 2009 11:10:28 -0000

Author: dfr
Date: Sun May 24 11:10:27 2009
New Revision: 192678
URL: http://svn.freebsd.org/changeset/base/192678

Log:
  Fix build of KGSSAPI bits post-vimage.

Modified:
  head/sys/kgssapi/gsstest.c
  head/sys/nfsserver/nfs_srvkrpc.c

Modified: head/sys/kgssapi/gsstest.c
==============================================================================
--- head/sys/kgssapi/gsstest.c	Sun May 24 09:42:53 2009	(r192677)
+++ head/sys/kgssapi/gsstest.c	Sun May 24 11:10:27 2009	(r192678)
@@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socketvar.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
+#include <sys/vimage.h>
 
 #include <kgssapi/gssapi.h>
 #include <kgssapi/gssapi_impl.h>
@@ -227,7 +228,7 @@ gsstest_1(void)
 
 	{
 		static char sbuf[512];
-		snprintf(sbuf, sizeof(sbuf), "nfs@%s", hostname);
+		snprintf(sbuf, sizeof(sbuf), "nfs@%s", V_hostname);
 		name_desc.value = sbuf;
 	}
 
@@ -430,7 +431,7 @@ gsstest_2(int step, const gss_buffer_t i
 	case 1:
 		if (server_context == GSS_C_NO_CONTEXT) {
 			static char sbuf[512];
-			snprintf(sbuf, sizeof(sbuf), "nfs@%s", hostname);
+			snprintf(sbuf, sizeof(sbuf), "nfs@%s", V_hostname);
 			name_desc.value = sbuf;
 			name_desc.length = strlen((const char *)
 			    name_desc.value);
@@ -811,7 +812,7 @@ gsstest_3(void)
 		return(1);
 	}
 
-	snprintf(service, sizeof(service), "host@%s", hostname);
+	snprintf(service, sizeof(service), "host@%s", V_hostname);
 
 	auth = rpc_gss_seccreate(client, curthread->td_ucred,
 	    service, "kerberosv5", rpc_gss_svc_privacy,
@@ -881,7 +882,7 @@ gsstest_4(void)
 	const char **mechs;
 	static rpc_gss_callback_t cb;
 
-	snprintf(principal, sizeof(principal), "host@%s", hostname);
+	snprintf(principal, sizeof(principal), "host@%s", V_hostname);
 
 	mechs = rpc_gss_get_mechanisms();
 	while (*mechs) {

Modified: head/sys/nfsserver/nfs_srvkrpc.c
==============================================================================
--- head/sys/nfsserver/nfs_srvkrpc.c	Sun May 24 09:42:53 2009	(r192677)
+++ head/sys/nfsserver/nfs_srvkrpc.c	Sun May 24 11:10:27 2009	(r192678)
@@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/fcntl.h>
 #include <sys/lockf.h>
 #include <sys/eventhandler.h>
+#include <sys/vimage.h>
 
 #include <netinet/in.h>
 #include <netinet/tcp.h>
@@ -488,7 +489,7 @@ nfssvc_nfsd(struct thread *td, struct nf
 		if (error)
 			return (error);
 	} else {
-		snprintf(principal, sizeof(principal), "nfs@%s", hostname);
+		snprintf(principal, sizeof(principal), "nfs@%s", V_hostname);
 	}
 #endif