diff options
| author | James Morris <jmorris@namei.org> | 2012-02-09 01:02:34 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2012-02-09 01:02:34 -0500 |
| commit | 9e3ff38647a316e4f92d59b14c8f0eb13b33bb2c (patch) | |
| tree | 2750d9fc94b8fb78d9982ea4a62d586e7f0a7862 /net | |
| parent | 2eb6038c51034bf7f9335b15ce9238a028fdd2d6 (diff) | |
| parent | 4c2c392763a682354fac65b6a569adec4e4b5387 (diff) | |
Merge branch 'next-queue' into next
Diffstat (limited to 'net')
| -rw-r--r-- | net/dns_resolver/dns_key.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/dns_resolver/dns_key.c b/net/dns_resolver/dns_key.c index fa000d26dc60..c73bba326d70 100644 --- a/net/dns_resolver/dns_key.c +++ b/net/dns_resolver/dns_key.c | |||
| @@ -281,6 +281,7 @@ static int __init init_dns_resolver(void) | |||
| 281 | 281 | ||
| 282 | /* instruct request_key() to use this special keyring as a cache for | 282 | /* instruct request_key() to use this special keyring as a cache for |
| 283 | * the results it looks up */ | 283 | * the results it looks up */ |
| 284 | set_bit(KEY_FLAG_ROOT_CAN_CLEAR, &keyring->flags); | ||
| 284 | cred->thread_keyring = keyring; | 285 | cred->thread_keyring = keyring; |
| 285 | cred->jit_keyring = KEY_REQKEY_DEFL_THREAD_KEYRING; | 286 | cred->jit_keyring = KEY_REQKEY_DEFL_THREAD_KEYRING; |
| 286 | dns_resolver_cache = cred; | 287 | dns_resolver_cache = cred; |