diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-23 08:59:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-23 08:59:49 -0800 |
| commit | 7908b3ef6809e49c77d914342dfaa4b946476d7a (patch) | |
| tree | 44af103c5457b4c2286400158dcfc18846a7c4f0 /security/keys/internal.h | |
| parent | dcd6c92267155e70a94b3927bce681ce74b80d1f (diff) | |
| parent | acbbb76a26648dfae6fed0989879e40d75692bfc (diff) | |
| download | linux-7908b3ef6809e49c77d914342dfaa4b946476d7a.tar.gz linux-7908b3ef6809e49c77d914342dfaa4b946476d7a.tar.bz2 linux-7908b3ef6809e49c77d914342dfaa4b946476d7a.zip | |
Merge git://git.samba.org/sfrench/cifs-2.6
* git://git.samba.org/sfrench/cifs-2.6:
CIFS: Rename *UCS* functions to *UTF16*
[CIFS] ACL and FSCACHE support no longer EXPERIMENTAL
[CIFS] Fix build break with multiuser patch when LANMAN disabled
cifs: warn about impending deprecation of legacy MultiuserMount code
cifs: fetch credentials out of keyring for non-krb5 auth multiuser mounts
cifs: sanitize username handling
keys: add a "logon" key type
cifs: lower default wsize when unix extensions are not used
cifs: better instrumentation for coalesce_t2
cifs: integer overflow in parse_dacl()
cifs: Fix sparse warning when calling cifs_strtoUCS
CIFS: Add descriptions to the brlock cache functions
Diffstat (limited to 'security/keys/internal.h')
| -rw-r--r-- | security/keys/internal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/keys/internal.h b/security/keys/internal.h index c7a7caec4830..65647f825584 100644 --- a/security/keys/internal.h +++ b/security/keys/internal.h @@ -33,6 +33,7 @@ extern struct key_type key_type_dead; extern struct key_type key_type_user; +extern struct key_type key_type_logon; /*****************************************************************************/ /* |