diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-21 05:10:52 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-21 05:10:52 +0200 |
| commit | eda0841094a3a232357ca10a24b40da461db3fcf (patch) | |
| tree | 08f6ffd17275e6fab7bd8014d849d2fce46632d9 /include | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | nfsd4: fix break_lease flags on nfsd open (diff) | |
| download | linux-eda0841094a3a232357ca10a24b40da461db3fcf.tar.xz linux-eda0841094a3a232357ca10a24b40da461db3fcf.zip | |
Merge branch 'for-2.6.40' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.40' of git://linux-nfs.org/~bfields/linux:
nfsd4: fix break_lease flags on nfsd open
nfsd: link returns nfserr_delay when breaking lease
nfsd: v4 support requires CRYPTO
nfsd: fix dependency of nfsd on auth_rpcgss
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/sunrpc/gss_krb5_enctypes.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/sunrpc/gss_krb5_enctypes.h b/include/linux/sunrpc/gss_krb5_enctypes.h new file mode 100644 index 000000000000..ec6234eee89c --- /dev/null +++ b/include/linux/sunrpc/gss_krb5_enctypes.h @@ -0,0 +1,4 @@ +/* + * Dumb way to share this static piece of information with nfsd + */ +#define KRB5_SUPPORTED_ENCTYPES "18,17,16,23,3,1,2" |