diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:03:30 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:03:30 -0500 |
| commit | f45ac22ae2b8fc5b4c32d9b8d17ea419a8701d89 (patch) | |
| tree | 8e05bccd7b85fc3dd2fbd33ec3286de27e152819 /fs/nfsd/auth.c | |
| parent | 79f3b3cb7a2586b319a43a7f29924c6c555e4357 (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into x86/urgent
Diffstat (limited to 'fs/nfsd/auth.c')
| -rw-r--r-- | fs/nfsd/auth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfsd/auth.c b/fs/nfsd/auth.c index 0184fe9b514c..c903e04aa217 100644 --- a/fs/nfsd/auth.c +++ b/fs/nfsd/auth.c | |||
| @@ -76,10 +76,10 @@ int nfsd_setuser(struct svc_rqst *rqstp, struct svc_export *exp) | |||
| 76 | 76 | ||
| 77 | ret = set_groups(new, gi); | 77 | ret = set_groups(new, gi); |
| 78 | put_group_info(gi); | 78 | put_group_info(gi); |
| 79 | if (!ret) | 79 | if (ret < 0) |
| 80 | goto error; | 80 | goto error; |
| 81 | 81 | ||
| 82 | if (new->uid) | 82 | if (new->fsuid) |
| 83 | new->cap_effective = cap_drop_nfsd_set(new->cap_effective); | 83 | new->cap_effective = cap_drop_nfsd_set(new->cap_effective); |
| 84 | else | 84 | else |
| 85 | new->cap_effective = cap_raise_nfsd_set(new->cap_effective, | 85 | new->cap_effective = cap_raise_nfsd_set(new->cap_effective, |