svn commit: r192678 - in head/sys: kgssapi nfsserver

[Doug Rabson]

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), "n...@%s", hostname);
+               snprintf(sbuf, sizeof(sbuf), "n...@%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), "n...@%s", hostname);
+                       snprintf(sbuf, sizeof(sbuf), "n...@%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), "h...@%s", hostname);
+       snprintf(service, sizeof(service), "h...@%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), "h...@%s", hostname);
+       snprintf(principal, sizeof(principal), "h...@%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), "n...@%s", hostname);
+               snprintf(principal, sizeof(principal), "n...@%s", V_hostname);
        }
 #endif
 
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"