Date: Tue, 11 Nov 2008 12:01:40 +0000 (UTC) From: Doug Rabson <dfr@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r184841 - in user/dfr/gssapi/6/sys: conf kgssapi kgssapi/krb5 modules/kgssapi modules/kgssapi_krb5 nfsclient nfsserver rpc rpc/rpcsec_gss Message-ID: <200811111201.mABC1eqk000806@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dfr Date: Tue Nov 11 12:01:40 2008 New Revision: 184841 URL: http://svn.freebsd.org/changeset/base/184841 Log: Fix kernel build post-merge. Modified: user/dfr/gssapi/6/sys/conf/Makefile.alpha user/dfr/gssapi/6/sys/conf/Makefile.amd64 user/dfr/gssapi/6/sys/conf/Makefile.arm user/dfr/gssapi/6/sys/conf/Makefile.i386 user/dfr/gssapi/6/sys/conf/Makefile.ia64 user/dfr/gssapi/6/sys/conf/Makefile.pc98 user/dfr/gssapi/6/sys/conf/Makefile.powerpc user/dfr/gssapi/6/sys/conf/Makefile.sparc64 user/dfr/gssapi/6/sys/conf/files user/dfr/gssapi/6/sys/kgssapi/gss_accept_sec_context.c user/dfr/gssapi/6/sys/kgssapi/gss_acquire_cred.c user/dfr/gssapi/6/sys/kgssapi/gss_add_oid_set_member.c user/dfr/gssapi/6/sys/kgssapi/gss_canonicalize_name.c user/dfr/gssapi/6/sys/kgssapi/gss_delete_sec_context.c user/dfr/gssapi/6/sys/kgssapi/gss_display_status.c user/dfr/gssapi/6/sys/kgssapi/gss_export_name.c user/dfr/gssapi/6/sys/kgssapi/gss_impl.c user/dfr/gssapi/6/sys/kgssapi/gss_import_name.c user/dfr/gssapi/6/sys/kgssapi/gss_init_sec_context.c user/dfr/gssapi/6/sys/kgssapi/gss_pname_to_uid.c user/dfr/gssapi/6/sys/kgssapi/gss_set_cred_option.c user/dfr/gssapi/6/sys/kgssapi/gssd_prot.c user/dfr/gssapi/6/sys/kgssapi/krb5/kcrypto.c user/dfr/gssapi/6/sys/kgssapi/krb5/kcrypto_aes.c user/dfr/gssapi/6/sys/kgssapi/krb5/kcrypto_arcfour.c user/dfr/gssapi/6/sys/kgssapi/krb5/kcrypto_des.c user/dfr/gssapi/6/sys/kgssapi/krb5/kcrypto_des3.c user/dfr/gssapi/6/sys/kgssapi/krb5/krb5_mech.c user/dfr/gssapi/6/sys/modules/kgssapi/Makefile user/dfr/gssapi/6/sys/modules/kgssapi_krb5/Makefile user/dfr/gssapi/6/sys/nfsclient/nfs_krpc.c user/dfr/gssapi/6/sys/nfsclient/nfs_vfsops.c user/dfr/gssapi/6/sys/nfsserver/nfs_serv.c user/dfr/gssapi/6/sys/nfsserver/nfs_srvkrpc.c user/dfr/gssapi/6/sys/rpc/rpcsec_gss/rpcsec_gss.c user/dfr/gssapi/6/sys/rpc/rpcsec_gss/rpcsec_gss_conf.c user/dfr/gssapi/6/sys/rpc/rpcsec_gss/rpcsec_gss_misc.c user/dfr/gssapi/6/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c user/dfr/gssapi/6/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c user/dfr/gssapi/6/sys/rpc/svc.c Modified: user/dfr/gssapi/6/sys/conf/Makefile.alpha ============================================================================== --- user/dfr/gssapi/6/sys/conf/Makefile.alpha Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/conf/Makefile.alpha Tue Nov 11 12:01:40 2008 (r184841) @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600003 +%VERSREQ= 600004 .if !defined(S) .if exists(./@/.) Modified: user/dfr/gssapi/6/sys/conf/Makefile.amd64 ============================================================================== --- user/dfr/gssapi/6/sys/conf/Makefile.amd64 Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/conf/Makefile.amd64 Tue Nov 11 12:01:40 2008 (r184841) @@ -18,7 +18,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600003 +%VERSREQ= 600004 STD8X16FONT?= iso Modified: user/dfr/gssapi/6/sys/conf/Makefile.arm ============================================================================== --- user/dfr/gssapi/6/sys/conf/Makefile.arm Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/conf/Makefile.arm Tue Nov 11 12:01:40 2008 (r184841) @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600003 +%VERSREQ= 600004 # Temporary stuff while we're still embryonic NO_MODULES= Modified: user/dfr/gssapi/6/sys/conf/Makefile.i386 ============================================================================== --- user/dfr/gssapi/6/sys/conf/Makefile.i386 Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/conf/Makefile.i386 Tue Nov 11 12:01:40 2008 (r184841) @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600003 +%VERSREQ= 600004 STD8X16FONT?= iso Modified: user/dfr/gssapi/6/sys/conf/Makefile.ia64 ============================================================================== --- user/dfr/gssapi/6/sys/conf/Makefile.ia64 Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/conf/Makefile.ia64 Tue Nov 11 12:01:40 2008 (r184841) @@ -19,7 +19,7 @@ GCC3= you bet # Which version of config(8) is required. -%VERSREQ= 600003 +%VERSREQ= 600004 STD8X16FONT?= iso Modified: user/dfr/gssapi/6/sys/conf/Makefile.pc98 ============================================================================== --- user/dfr/gssapi/6/sys/conf/Makefile.pc98 Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/conf/Makefile.pc98 Tue Nov 11 12:01:40 2008 (r184841) @@ -19,7 +19,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600003 +%VERSREQ= 600004 .if !defined(S) .if exists(./@/.) Modified: user/dfr/gssapi/6/sys/conf/Makefile.powerpc ============================================================================== --- user/dfr/gssapi/6/sys/conf/Makefile.powerpc Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/conf/Makefile.powerpc Tue Nov 11 12:01:40 2008 (r184841) @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600003 +%VERSREQ= 600004 STD8X16FONT?= iso Modified: user/dfr/gssapi/6/sys/conf/Makefile.sparc64 ============================================================================== --- user/dfr/gssapi/6/sys/conf/Makefile.sparc64 Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/conf/Makefile.sparc64 Tue Nov 11 12:01:40 2008 (r184841) @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600003 +%VERSREQ= 600004 STD8X16FONT?= iso Modified: user/dfr/gssapi/6/sys/conf/files ============================================================================== --- user/dfr/gssapi/6/sys/conf/files Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/conf/files Tue Nov 11 12:01:40 2008 (r184841) @@ -1450,17 +1450,17 @@ kern/vfs_vnops.c standard # gssd.h optional kgssapi \ dependency "$S/kgssapi/gssd.x" \ - compile-with "rpcgen -hM $S/kgssapi/gssd.x | grep -v pthread.h > gssd.h" \ + compile-with "rpcgen -hM -C $S/kgssapi/gssd.x | grep -v pthread.h > gssd.h" \ no-obj no-implicit-rule before-depend local \ clean "gssd.h" gssd_xdr.c optional kgssapi \ dependency "$S/kgssapi/gssd.x gssd.h" \ - compile-with "rpcgen -c $S/kgssapi/gssd.x -o gssd_xdr.c" \ + compile-with "rpcgen -c -C $S/kgssapi/gssd.x -o gssd_xdr.c" \ no-implicit-rule before-depend local \ clean "gssd_xdr.c" gssd_clnt.c optional kgssapi \ dependency "$S/kgssapi/gssd.x gssd.h" \ - compile-with "rpcgen -lM $S/kgssapi/gssd.x | grep -v string.h > gssd_clnt.c" \ + compile-with "rpcgen -lM -C $S/kgssapi/gssd.x | grep -v string.h > gssd_clnt.c" \ no-implicit-rule before-depend local \ clean "gssd_clnt.c" kgssapi/gss_accept_sec_context.c optional kgssapi Modified: user/dfr/gssapi/6/sys/kgssapi/gss_accept_sec_context.c ============================================================================== --- user/dfr/gssapi/6/sys/kgssapi/gss_accept_sec_context.c Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/kgssapi/gss_accept_sec_context.c Tue Nov 11 12:01:40 2008 (r184841) @@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <sys/kobj.h> #include <sys/malloc.h> +#include <sys/systm.h> #include <kgssapi/gssapi.h> #include <kgssapi/gssapi_impl.h> Modified: user/dfr/gssapi/6/sys/kgssapi/gss_acquire_cred.c ============================================================================== --- user/dfr/gssapi/6/sys/kgssapi/gss_acquire_cred.c Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/kgssapi/gss_acquire_cred.c Tue Nov 11 12:01:40 2008 (r184841) @@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$"); #include <sys/kobj.h> #include <sys/malloc.h> #include <sys/proc.h> +#include <sys/systm.h> #include <kgssapi/gssapi.h> #include <kgssapi/gssapi_impl.h> Modified: user/dfr/gssapi/6/sys/kgssapi/gss_add_oid_set_member.c ============================================================================== --- user/dfr/gssapi/6/sys/kgssapi/gss_add_oid_set_member.c Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/kgssapi/gss_add_oid_set_member.c Tue Nov 11 12:01:40 2008 (r184841) @@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <sys/kobj.h> #include <sys/malloc.h> +#include <sys/systm.h> #include <kgssapi/gssapi.h> #include <kgssapi/gssapi_impl.h> Modified: user/dfr/gssapi/6/sys/kgssapi/gss_canonicalize_name.c ============================================================================== --- user/dfr/gssapi/6/sys/kgssapi/gss_canonicalize_name.c Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/kgssapi/gss_canonicalize_name.c Tue Nov 11 12:01:40 2008 (r184841) @@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <sys/kobj.h> #include <sys/malloc.h> +#include <sys/systm.h> #include <kgssapi/gssapi.h> #include <kgssapi/gssapi_impl.h> Modified: user/dfr/gssapi/6/sys/kgssapi/gss_delete_sec_context.c ============================================================================== --- user/dfr/gssapi/6/sys/kgssapi/gss_delete_sec_context.c Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/kgssapi/gss_delete_sec_context.c Tue Nov 11 12:01:40 2008 (r184841) @@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <sys/kobj.h> #include <sys/malloc.h> +#include <sys/systm.h> #include <kgssapi/gssapi.h> #include <kgssapi/gssapi_impl.h> Modified: user/dfr/gssapi/6/sys/kgssapi/gss_display_status.c ============================================================================== --- user/dfr/gssapi/6/sys/kgssapi/gss_display_status.c Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/kgssapi/gss_display_status.c Tue Nov 11 12:01:40 2008 (r184841) @@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <sys/kobj.h> #include <sys/malloc.h> +#include <sys/systm.h> #include <kgssapi/gssapi.h> #include <kgssapi/gssapi_impl.h> Modified: user/dfr/gssapi/6/sys/kgssapi/gss_export_name.c ============================================================================== --- user/dfr/gssapi/6/sys/kgssapi/gss_export_name.c Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/kgssapi/gss_export_name.c Tue Nov 11 12:01:40 2008 (r184841) @@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <sys/kobj.h> #include <sys/malloc.h> +#include <sys/systm.h> #include <kgssapi/gssapi.h> #include <kgssapi/gssapi_impl.h> Modified: user/dfr/gssapi/6/sys/kgssapi/gss_impl.c ============================================================================== --- user/dfr/gssapi/6/sys/kgssapi/gss_impl.c Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/kgssapi/gss_impl.c Tue Nov 11 12:01:40 2008 (r184841) @@ -33,10 +33,10 @@ __FBSDID("$FreeBSD$"); #include <sys/kobj.h> #include <sys/malloc.h> #include <sys/module.h> -#include <sys/priv.h> #include <sys/syscall.h> #include <sys/sysent.h> #include <sys/sysproto.h> +#include <sys/systm.h> #include <kgssapi/gssapi.h> #include <kgssapi/gssapi_impl.h> @@ -53,7 +53,14 @@ MALLOC_DEFINE(M_GSSAPI, "GSS-API", "GSS- */ static int gssd_syscall_offset = SYS_gssd_syscall; static struct sysent gssd_syscall_prev_sysent; +#if __FreeBSD_version < 700000 +static struct sysent gssd_syscall_sysent = { + (sizeof(struct gssd_syscall_args) / sizeof(register_t)) | SYF_MPSAFE, + (sy_call_t *) gssd_syscall +}; +#else MAKE_SYSENT(gssd_syscall); +#endif static bool_t gssd_syscall_registered = FALSE; struct kgss_mech_list kgss_mechs; @@ -92,7 +99,7 @@ gssd_syscall(struct thread *td, struct g char path[MAXPATHLEN]; int error; - error = priv_check(td, PRIV_NFS_DAEMON); + error = suser(td); if (error) return (error); Modified: user/dfr/gssapi/6/sys/kgssapi/gss_import_name.c ============================================================================== --- user/dfr/gssapi/6/sys/kgssapi/gss_import_name.c Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/kgssapi/gss_import_name.c Tue Nov 11 12:01:40 2008 (r184841) @@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <sys/kobj.h> #include <sys/malloc.h> +#include <sys/systm.h> #include <kgssapi/gssapi.h> #include <kgssapi/gssapi_impl.h> Modified: user/dfr/gssapi/6/sys/kgssapi/gss_init_sec_context.c ============================================================================== --- user/dfr/gssapi/6/sys/kgssapi/gss_init_sec_context.c Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/kgssapi/gss_init_sec_context.c Tue Nov 11 12:01:40 2008 (r184841) @@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$"); #include <sys/kobj.h> #include <sys/malloc.h> #include <sys/proc.h> +#include <sys/systm.h> #include <kgssapi/gssapi.h> #include <kgssapi/gssapi_impl.h> Modified: user/dfr/gssapi/6/sys/kgssapi/gss_pname_to_uid.c ============================================================================== --- user/dfr/gssapi/6/sys/kgssapi/gss_pname_to_uid.c Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/kgssapi/gss_pname_to_uid.c Tue Nov 11 12:01:40 2008 (r184841) @@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <sys/kobj.h> #include <sys/malloc.h> +#include <sys/systm.h> #include <kgssapi/gssapi.h> #include <kgssapi/gssapi_impl.h> Modified: user/dfr/gssapi/6/sys/kgssapi/gss_set_cred_option.c ============================================================================== --- user/dfr/gssapi/6/sys/kgssapi/gss_set_cred_option.c Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/kgssapi/gss_set_cred_option.c Tue Nov 11 12:01:40 2008 (r184841) @@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <sys/kobj.h> #include <sys/malloc.h> +#include <sys/systm.h> #include <kgssapi/gssapi.h> #include <kgssapi/gssapi_impl.h> Modified: user/dfr/gssapi/6/sys/kgssapi/gssd_prot.c ============================================================================== --- user/dfr/gssapi/6/sys/kgssapi/gssd_prot.c Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/kgssapi/gssd_prot.c Tue Nov 11 12:01:40 2008 (r184841) @@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$"); #ifdef _KERNEL #include <sys/malloc.h> +#include <sys/systm.h> #else #include <stdlib.h> #include <string.h> Modified: user/dfr/gssapi/6/sys/kgssapi/krb5/kcrypto.c ============================================================================== --- user/dfr/gssapi/6/sys/kgssapi/krb5/kcrypto.c Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/kgssapi/krb5/kcrypto.c Tue Nov 11 12:01:40 2008 (r184841) @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include <kgssapi/gssapi.h> #include <kgssapi/gssapi_impl.h> -#include "kcrypto.h" +#include <kgssapi/krb5/kcrypto.h> static struct krb5_encryption_class *krb5_encryption_classes[] = { &krb5_des_encryption_class, Modified: user/dfr/gssapi/6/sys/kgssapi/krb5/kcrypto_aes.c ============================================================================== --- user/dfr/gssapi/6/sys/kgssapi/krb5/kcrypto_aes.c Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/kgssapi/krb5/kcrypto_aes.c Tue Nov 11 12:01:40 2008 (r184841) @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); #include <kgssapi/gssapi.h> #include <kgssapi/gssapi_impl.h> -#include "kcrypto.h" +#include <kgssapi/krb5/kcrypto.h> struct aes_state { struct mtx as_lock; @@ -97,8 +97,7 @@ aes_set_key(struct krb5_key_state *ks, c cri[1].cri_key = ks->ks_key; cri[1].cri_next = NULL; - crypto_newsession(&as->as_session, cri, - CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE); + crypto_newsession(&as->as_session, cri, 0); } static void Modified: user/dfr/gssapi/6/sys/kgssapi/krb5/kcrypto_arcfour.c ============================================================================== --- user/dfr/gssapi/6/sys/kgssapi/krb5/kcrypto_arcfour.c Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/kgssapi/krb5/kcrypto_arcfour.c Tue Nov 11 12:01:40 2008 (r184841) @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); #include <kgssapi/gssapi.h> #include <kgssapi/gssapi_impl.h> -#include "kcrypto.h" +#include <kgssapi/krb5/kcrypto.h> static void arcfour_init(struct krb5_key_state *ks) Modified: user/dfr/gssapi/6/sys/kgssapi/krb5/kcrypto_des.c ============================================================================== --- user/dfr/gssapi/6/sys/kgssapi/krb5/kcrypto_des.c Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/kgssapi/krb5/kcrypto_des.c Tue Nov 11 12:01:40 2008 (r184841) @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #include <kgssapi/gssapi.h> #include <kgssapi/gssapi_impl.h> -#include "kcrypto.h" +#include <kgssapi/krb5/kcrypto.h> struct des1_state { struct mtx ds_lock; @@ -91,8 +91,7 @@ des1_set_key(struct krb5_key_state *ks, cri[0].cri_key = ks->ks_key; cri[0].cri_next = NULL; - crypto_newsession(&ds->ds_session, cri, - CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE); + crypto_newsession(&ds->ds_session, cri, 0); } static void Modified: user/dfr/gssapi/6/sys/kgssapi/krb5/kcrypto_des3.c ============================================================================== --- user/dfr/gssapi/6/sys/kgssapi/krb5/kcrypto_des3.c Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/kgssapi/krb5/kcrypto_des3.c Tue Nov 11 12:01:40 2008 (r184841) @@ -40,9 +40,7 @@ __FBSDID("$FreeBSD$"); #include <kgssapi/gssapi.h> #include <kgssapi/gssapi_impl.h> -#include "kcrypto.h" - -#define DES3_FLAGS (CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE) +#include <kgssapi/krb5/kcrypto.h> struct des3_state { struct mtx ds_lock; @@ -97,8 +95,7 @@ des3_set_key(struct krb5_key_state *ks, cri[1].cri_key = ks->ks_key; cri[1].cri_next = NULL; - crypto_newsession(&ds->ds_session, cri, - CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE); + crypto_newsession(&ds->ds_session, cri, 0); } static void Modified: user/dfr/gssapi/6/sys/kgssapi/krb5/krb5_mech.c ============================================================================== --- user/dfr/gssapi/6/sys/kgssapi/krb5/krb5_mech.c Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/kgssapi/krb5/krb5_mech.c Tue Nov 11 12:01:40 2008 (r184841) @@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$"); #include <kgssapi/gssapi_impl.h> #include "kgss_if.h" -#include "kcrypto.h" +#include <kgssapi/krb5/kcrypto.h> #define GSS_TOKEN_SENT_BY_ACCEPTOR 1 #define GSS_TOKEN_SEALED 2 Modified: user/dfr/gssapi/6/sys/modules/kgssapi/Makefile ============================================================================== --- user/dfr/gssapi/6/sys/modules/kgssapi/Makefile Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/modules/kgssapi/Makefile Tue Nov 11 12:01:40 2008 (r184841) @@ -44,12 +44,12 @@ CLEANFILES= gssd.h gssd_xdr.c gssd_clnt. S= ${.CURDIR}/../.. gssd.h: $S/kgssapi/gssd.x - rpcgen -hM $S/kgssapi/gssd.x | grep -v pthread.h > gssd.h + rpcgen -hM -C $S/kgssapi/gssd.x | grep -v pthread.h > gssd.h gssd_xdr.c: $S/kgssapi/gssd.x - rpcgen -c $S/kgssapi/gssd.x -o gssd_xdr.c + rpcgen -c -C $S/kgssapi/gssd.x -o gssd_xdr.c gssd_clnt.c: $S/kgssapi/gssd.x - rpcgen -lM $S/kgssapi/gssd.x | grep -v string.h > gssd_clnt.c + rpcgen -lM -C $S/kgssapi/gssd.x | grep -v string.h > gssd_clnt.c .include <bsd.kmod.mk> Modified: user/dfr/gssapi/6/sys/modules/kgssapi_krb5/Makefile ============================================================================== --- user/dfr/gssapi/6/sys/modules/kgssapi_krb5/Makefile Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/modules/kgssapi_krb5/Makefile Tue Nov 11 12:01:40 2008 (r184841) @@ -16,6 +16,6 @@ MFILES= kgssapi/kgss_if.m S= ${.CURDIR}/../.. gssd.h: $S/kgssapi/gssd.x - rpcgen -hM $S/kgssapi/gssd.x | grep -v pthread.h > gssd.h + rpcgen -hM -C $S/kgssapi/gssd.x | grep -v pthread.h > gssd.h .include <bsd.kmod.mk> Modified: user/dfr/gssapi/6/sys/nfsclient/nfs_krpc.c ============================================================================== --- user/dfr/gssapi/6/sys/nfsclient/nfs_krpc.c Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/nfsclient/nfs_krpc.c Tue Nov 11 12:01:40 2008 (r184841) @@ -221,7 +221,7 @@ nfs_connect(struct nfsmount *nmp, struct pktscale = 2; if (pktscale > 64) pktscale = 64; - mtx_lock(&nmp->nm_mtx); + mtx_lock(&Giant); if (nmp->nm_sotype == SOCK_DGRAM) { sndreserve = (nmp->nm_wsize + NFS_MAXPKTHDR) * pktscale; rcvreserve = (max(nmp->nm_rsize, nmp->nm_readdirsize) + @@ -238,7 +238,7 @@ nfs_connect(struct nfsmount *nmp, struct rcvreserve = (nmp->nm_rsize + NFS_MAXPKTHDR + sizeof (u_int32_t)) * pktscale; } - mtx_unlock(&nmp->nm_mtx); + mtx_unlock(&Giant); client = clnt_reconnect_create(nconf, saddr, NFS_PROG, vers, sndreserve, rcvreserve); @@ -253,7 +253,7 @@ nfs_connect(struct nfsmount *nmp, struct retries = INT_MAX; CLNT_CONTROL(client, CLSET_RETRIES, &retries); - mtx_lock(&nmp->nm_mtx); + mtx_lock(&Giant); if (nmp->nm_client) { /* * Someone else already connected. @@ -268,19 +268,19 @@ nfs_connect(struct nfsmount *nmp, struct * unconnected for servers that reply from a port other than NFS_PORT. */ if (!(nmp->nm_flag & NFSMNT_NOCONN)) { - mtx_unlock(&nmp->nm_mtx); + mtx_unlock(&Giant); CLNT_CONTROL(client, CLSET_CONNECT, &one); } else { - mtx_unlock(&nmp->nm_mtx); + mtx_unlock(&Giant); } /* Restore current thread's credentials. */ td->td_ucred = origcred; - mtx_lock(&nmp->nm_mtx); + mtx_lock(&Giant); /* Initialize other non-zero congestion variables */ nfs_init_rtt(nmp); - mtx_unlock(&nmp->nm_mtx); + mtx_unlock(&Giant); return (0); } @@ -292,18 +292,18 @@ nfs_disconnect(struct nfsmount *nmp) { CLIENT *client; - mtx_lock(&nmp->nm_mtx); + mtx_lock(&Giant); if (nmp->nm_client) { client = nmp->nm_client; nmp->nm_client = NULL; - mtx_unlock(&nmp->nm_mtx); + mtx_unlock(&Giant); #ifdef KGSSAPI rpc_gss_secpurge(client); #endif CLNT_CLOSE(client); CLNT_RELEASE(client); } else { - mtx_unlock(&nmp->nm_mtx); + mtx_unlock(&Giant); } } @@ -662,6 +662,28 @@ nfs_msleep(struct thread *td, void *iden } /* + * NFS wrapper to tsleep(), that shoves a new p_sigmask and restores the + * old one after tsleep() returns. + */ +int +nfs_tsleep(struct thread *td, void *ident, int priority, char *wmesg, int timo) +{ + sigset_t oldset; + int error; + struct proc *p; + + if ((priority & PCATCH) == 0) + return tsleep(ident, priority, wmesg, timo); + if (td == NULL) + td = curthread; /* XXX */ + nfs_set_sigmask(td, &oldset); + error = tsleep(ident, priority, wmesg, timo); + nfs_restore_sigmask(td, &oldset); + p = td->td_proc; + return (error); +} + +/* * Test for a termination condition pending on the process. * This is used for NFSMNT_INT mounts. */ @@ -718,22 +740,22 @@ nfs_down(struct nfsmount *nmp, struct th { if (nmp == NULL) return; - mtx_lock(&nmp->nm_mtx); + mtx_lock(&Giant); if ((flags & NFSSTA_TIMEO) && !(nmp->nm_state & NFSSTA_TIMEO)) { nmp->nm_state |= NFSSTA_TIMEO; - mtx_unlock(&nmp->nm_mtx); + mtx_unlock(&Giant); vfs_event_signal(&nmp->nm_mountp->mnt_stat.f_fsid, VQ_NOTRESP, 0); } else - mtx_unlock(&nmp->nm_mtx); - mtx_lock(&nmp->nm_mtx); + mtx_unlock(&Giant); + mtx_lock(&Giant); if ((flags & NFSSTA_LOCKTIMEO) && !(nmp->nm_state & NFSSTA_LOCKTIMEO)) { nmp->nm_state |= NFSSTA_LOCKTIMEO; - mtx_unlock(&nmp->nm_mtx); + mtx_unlock(&Giant); vfs_event_signal(&nmp->nm_mountp->mnt_stat.f_fsid, VQ_NOTRESPLOCK, 0); } else - mtx_unlock(&nmp->nm_mtx); + mtx_unlock(&Giant); nfs_msg(td, nmp->nm_mountp->mnt_stat.f_mntfromname, msg, error); } @@ -747,23 +769,23 @@ nfs_up(struct nfsmount *nmp, struct thre nfs_msg(td, nmp->nm_mountp->mnt_stat.f_mntfromname, msg, 0); } - mtx_lock(&nmp->nm_mtx); + mtx_lock(&Giant); if ((flags & NFSSTA_TIMEO) && (nmp->nm_state & NFSSTA_TIMEO)) { nmp->nm_state &= ~NFSSTA_TIMEO; - mtx_unlock(&nmp->nm_mtx); + mtx_unlock(&Giant); vfs_event_signal(&nmp->nm_mountp->mnt_stat.f_fsid, VQ_NOTRESP, 1); } else - mtx_unlock(&nmp->nm_mtx); + mtx_unlock(&Giant); - mtx_lock(&nmp->nm_mtx); + mtx_lock(&Giant); if ((flags & NFSSTA_LOCKTIMEO) && (nmp->nm_state & NFSSTA_LOCKTIMEO)) { nmp->nm_state &= ~NFSSTA_LOCKTIMEO; - mtx_unlock(&nmp->nm_mtx); + mtx_unlock(&Giant); vfs_event_signal(&nmp->nm_mountp->mnt_stat.f_fsid, VQ_NOTRESPLOCK, 1); } else - mtx_unlock(&nmp->nm_mtx); + mtx_unlock(&Giant); } #endif /* !NFS_LEGACYRPC */ Modified: user/dfr/gssapi/6/sys/nfsclient/nfs_vfsops.c ============================================================================== --- user/dfr/gssapi/6/sys/nfsclient/nfs_vfsops.c Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/nfsclient/nfs_vfsops.c Tue Nov 11 12:01:40 2008 (r184841) @@ -814,6 +814,7 @@ nfs_mount(struct mount *mp, struct threa has_addr_opt = 0; has_fh_opt = 0; has_hostname_opt = 0; + error = 0; if (vfs_filteropt(mp->mnt_optnew, nfs_opts)) { error = EINVAL; @@ -1102,7 +1103,7 @@ nfs_mount(struct mount *mp, struct threa } } error = mountnfs(&args, mp, nam, args.hostname, &vp, td->td_ucred); - +out: if (!error) { MNT_ILOCK(mp); mp->mnt_kern_flag |= MNTK_LOOKUP_SHARED; @@ -1211,9 +1212,11 @@ mountnfs(struct nfs_args *argp, struct m nfs_decode_args(mp, nmp, argp); +#ifdef NFS_LEGACYRPC if (nmp->nm_sotype == SOCK_STREAM) mtx_init(&nmp->nm_nfstcpstate.mtx, "NFS/TCP state lock", NULL, MTX_DEF); +#endif /* * For Connection based sockets (TCP,...) defer the connect until @@ -1260,8 +1263,10 @@ mountnfs(struct nfs_args *argp, struct m return (0); bad: +#ifdef NFS_LEGACYRPC if (nmp->nm_sotype == SOCK_STREAM) mtx_destroy(&nmp->nm_nfstcpstate.mtx); +#endif nfs_disconnect(nmp); uma_zfree(nfsmount_zone, nmp); FREE(nam, M_SONAME); @@ -1303,8 +1308,10 @@ nfs_unmount(struct mount *mp, int mntfla nfs_disconnect(nmp); FREE(nmp->nm_nam, M_SONAME); +#ifdef NFS_LEGACYRPC if (nmp->nm_sotype == SOCK_STREAM) mtx_destroy(&nmp->nm_nfstcpstate.mtx); +#endif uma_zfree(nfsmount_zone, nmp); return (0); Modified: user/dfr/gssapi/6/sys/nfsserver/nfs_serv.c ============================================================================== --- user/dfr/gssapi/6/sys/nfsserver/nfs_serv.c Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/nfsserver/nfs_serv.c Tue Nov 11 12:01:40 2008 (r184841) @@ -268,7 +268,7 @@ nfsrv_getattr(struct nfsrv_descript *nfs nfsdbprintf(("%s %d\n", __FILE__, __LINE__)); fhp = &nfh.fh_generic; nfsm_srvmtofh(fhp); - error = nfsrv_fhtovp(fhp, 1, &vp, &vfslocked, nfsd, slp, nam, + error = nfsrv_fhtovp(fhp, 1, &vp, nfsd, slp, nam, &rdonly, TRUE); if (error) { nfsm_reply(0); Modified: user/dfr/gssapi/6/sys/nfsserver/nfs_srvkrpc.c ============================================================================== --- user/dfr/gssapi/6/sys/nfsserver/nfs_srvkrpc.c Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/nfsserver/nfs_srvkrpc.c Tue Nov 11 12:01:40 2008 (r184841) @@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$"); #include <sys/vnode.h> #include <sys/malloc.h> #include <sys/mount.h> -#include <sys/priv.h> #include <sys/proc.h> #include <sys/bio.h> #include <sys/buf.h> @@ -121,7 +120,7 @@ static int nfssvc_nfsd(struct thread *, extern u_long sb_max_adj; int32_t (*nfsrv3_procs[NFS_NPROCS])(struct nfsrv_descript *nd, - struct nfssvc_sock *slp, struct mbuf **mreqp) = { + struct nfssvc_sock *slp, struct thread *td, struct mbuf **mreqp) = { nfsrv_null, nfsrv_getattr, nfsrv_setattr, @@ -178,7 +177,7 @@ nfssvc(struct thread *td, struct nfssvc_ KASSERT(!mtx_owned(&Giant), ("nfssvc(): called with Giant")); - error = priv_check(td, PRIV_NFS_DAEMON); + error = suser(td); if (error) return (error); if (uap->flag & NFSSVC_ADDSOCK) { @@ -316,7 +315,7 @@ nfssvc_program(struct svc_req *rqst, SVC { rpcproc_t procnum; int32_t (*proc)(struct nfsrv_descript *nd, struct nfssvc_sock *slp, - struct mbuf **mreqp); + struct thread *td, struct mbuf **mreqp); int flag; struct nfsrv_descript nd; struct mbuf *mreq, *mrep; @@ -372,7 +371,7 @@ nfssvc_program(struct svc_req *rqst, SVC } nfsrvstats.srvrpccnt[nd.nd_procnum]++; - error = proc(&nd, NULL, &mrep); + error = proc(&nd, NULL, curthread, &mrep); if (nd.nd_cr) crfree(nd.nd_cr); @@ -405,7 +404,10 @@ nfssvc_addsock(struct file *fp, struct t so = fp->f_data; - siz = sb_max_adj; + if (so->so_type == SOCK_STREAM) + siz = NFS_MAXPACKET + sizeof (u_long); + else + siz = NFS_MAXPACKET; error = soreserve(so, siz, siz); if (error) { return (error); Modified: user/dfr/gssapi/6/sys/rpc/rpcsec_gss/rpcsec_gss.c ============================================================================== --- user/dfr/gssapi/6/sys/rpc/rpcsec_gss/rpcsec_gss.c Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/rpc/rpcsec_gss/rpcsec_gss.c Tue Nov 11 12:01:40 2008 (r184841) @@ -82,7 +82,7 @@ __FBSDID("$FreeBSD$"); #include <rpc/rpc.h> #include <rpc/rpcsec_gss.h> -#include "rpcsec_gss_int.h" +#include <rpc/rpcsec_gss/rpcsec_gss_int.h> static void rpc_gss_nextverf(AUTH*); static bool_t rpc_gss_marshal(AUTH *, uint32_t, XDR *, struct mbuf *); Modified: user/dfr/gssapi/6/sys/rpc/rpcsec_gss/rpcsec_gss_conf.c ============================================================================== --- user/dfr/gssapi/6/sys/rpc/rpcsec_gss/rpcsec_gss_conf.c Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/rpc/rpcsec_gss/rpcsec_gss_conf.c Tue Nov 11 12:01:40 2008 (r184841) @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include <rpc/rpc.h> #include <rpc/rpcsec_gss.h> -#include "rpcsec_gss_int.h" +#include <rpc/rpcsec_gss/rpcsec_gss_int.h> bool_t rpc_gss_mech_to_oid(const char *mech, gss_OID *oid_ret) Modified: user/dfr/gssapi/6/sys/rpc/rpcsec_gss/rpcsec_gss_misc.c ============================================================================== --- user/dfr/gssapi/6/sys/rpc/rpcsec_gss/rpcsec_gss_misc.c Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/rpc/rpcsec_gss/rpcsec_gss_misc.c Tue Nov 11 12:01:40 2008 (r184841) @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); #include <rpc/rpc.h> #include <rpc/rpcsec_gss.h> -#include "rpcsec_gss_int.h" +#include <rpc/rpcsec_gss/rpcsec_gss_int.h> static rpc_gss_error_t _rpc_gss_error; Modified: user/dfr/gssapi/6/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c ============================================================================== --- user/dfr/gssapi/6/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c Tue Nov 11 12:01:40 2008 (r184841) @@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$"); #include <rpc/rpc.h> #include <rpc/rpcsec_gss.h> -#include "rpcsec_gss_int.h" +#include <rpc/rpcsec_gss/rpcsec_gss_int.h> #define MAX_GSS_SIZE 10240 /* XXX */ Modified: user/dfr/gssapi/6/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c ============================================================================== --- user/dfr/gssapi/6/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c Tue Nov 11 12:01:40 2008 (r184841) @@ -77,7 +77,7 @@ __FBSDID("$FreeBSD$"); #include <rpc/rpc.h> #include <rpc/rpcsec_gss.h> -#include "rpcsec_gss_int.h" +#include <rpc/rpcsec_gss/rpcsec_gss_int.h> static bool_t svc_rpc_gss_wrap(SVCAUTH *, struct mbuf **); static bool_t svc_rpc_gss_unwrap(SVCAUTH *, struct mbuf **); Modified: user/dfr/gssapi/6/sys/rpc/svc.c ============================================================================== --- user/dfr/gssapi/6/sys/rpc/svc.c Tue Nov 11 11:25:13 2008 (r184840) +++ user/dfr/gssapi/6/sys/rpc/svc.c Tue Nov 11 12:01:40 2008 (r184841) @@ -1186,18 +1186,16 @@ svc_thread_start(void *arg) { svc_run_internal((SVCPOOL *) arg, FALSE); - kthread_exit(); + kthread_exit(0); } static void svc_new_thread(SVCPOOL *pool) { - struct thread *td; pool->sp_threadcount++; - kthread_add(svc_thread_start, pool, - pool->sp_proc, &td, 0, 0, - "%s: service", pool->sp_name); + kthread_create(svc_thread_start, pool, + NULL, 0, 0, "%s: service", pool->sp_name); } void @@ -1209,7 +1207,7 @@ svc_run(SVCPOOL *pool) p = curproc; td = curthread; - snprintf(td->td_name, sizeof(td->td_name), + snprintf(p->p_comm, sizeof(p->p_comm), "%s: master", pool->sp_name); pool->sp_state = SVCPOOL_ACTIVE; pool->sp_proc = p;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811111201.mABC1eqk000806>