mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-06 17:18:32 +00:00
Fix build of KGSSAPI bits post-vimage.
This commit is contained in:
parent
3f8cd45f79
commit
57d8181b40
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=192678
|
@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
|
||||||
#include <sys/socketvar.h>
|
#include <sys/socketvar.h>
|
||||||
#include <sys/sysent.h>
|
#include <sys/sysent.h>
|
||||||
#include <sys/sysproto.h>
|
#include <sys/sysproto.h>
|
||||||
|
#include <sys/vimage.h>
|
||||||
|
|
||||||
#include <kgssapi/gssapi.h>
|
#include <kgssapi/gssapi.h>
|
||||||
#include <kgssapi/gssapi_impl.h>
|
#include <kgssapi/gssapi_impl.h>
|
||||||
|
@ -227,7 +228,7 @@ gsstest_1(void)
|
||||||
|
|
||||||
{
|
{
|
||||||
static char sbuf[512];
|
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.value = sbuf;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -430,7 +431,7 @@ gsstest_2(int step, const gss_buffer_t input_token,
|
||||||
case 1:
|
case 1:
|
||||||
if (server_context == GSS_C_NO_CONTEXT) {
|
if (server_context == GSS_C_NO_CONTEXT) {
|
||||||
static char sbuf[512];
|
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.value = sbuf;
|
||||||
name_desc.length = strlen((const char *)
|
name_desc.length = strlen((const char *)
|
||||||
name_desc.value);
|
name_desc.value);
|
||||||
|
@ -811,7 +812,7 @@ gsstest_3(void)
|
||||||
return(1);
|
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,
|
auth = rpc_gss_seccreate(client, curthread->td_ucred,
|
||||||
service, "kerberosv5", rpc_gss_svc_privacy,
|
service, "kerberosv5", rpc_gss_svc_privacy,
|
||||||
|
@ -881,7 +882,7 @@ gsstest_4(void)
|
||||||
const char **mechs;
|
const char **mechs;
|
||||||
static rpc_gss_callback_t cb;
|
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();
|
mechs = rpc_gss_get_mechanisms();
|
||||||
while (*mechs) {
|
while (*mechs) {
|
||||||
|
|
|
@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$");
|
||||||
#include <sys/fcntl.h>
|
#include <sys/fcntl.h>
|
||||||
#include <sys/lockf.h>
|
#include <sys/lockf.h>
|
||||||
#include <sys/eventhandler.h>
|
#include <sys/eventhandler.h>
|
||||||
|
#include <sys/vimage.h>
|
||||||
|
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
#include <netinet/tcp.h>
|
#include <netinet/tcp.h>
|
||||||
|
@ -488,7 +489,7 @@ nfssvc_nfsd(struct thread *td, struct nfsd_nfsd_args *args)
|
||||||
if (error)
|
if (error)
|
||||||
return (error);
|
return (error);
|
||||||
} else {
|
} else {
|
||||||
snprintf(principal, sizeof(principal), "nfs@%s", hostname);
|
snprintf(principal, sizeof(principal), "nfs@%s", V_hostname);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue