On 05/06/2010 04:10 PM, James Morris wrote:
On Thu, 6 May 2010, David Howells wrote:
Stephen Rothwell<sfr@xxxxxxxxxxxxxxxx> wrote:
I just used the version from Linus' tree.
Okay.
However, I'd like to NAK some bits of c5b60b5e67af8be4c58d3ffcc36894f69c4fbdc1
now that I see it...
Will a patch -R of below be correct enough for you? Otherwise, please
send me a new patch.
(This is one of the reasons why I'm not so keen on whitespace fixes, also
having to resolve merge conflicts, peturbing the history of the code etc.)
@@ -1282,16 +1282,16 @@ long keyctl_session_to_parent(void)
/* the parent must have the same effective ownership and mustn't be
* SUID/SGID */
- if (pcred-> uid != mycred->euid ||
+ if (pcred->uid != mycred->euid ||
pcred->euid != mycred->euid ||
pcred->suid != mycred->euid ||
- pcred-> gid != mycred->egid ||
+ pcred->gid != mycred->egid ||
pcred->egid != mycred->egid ||
pcred->sgid != mycred->egid)
goto not_permitted;
/* the keyrings must have the same UID */
- if (pcred ->tgcred->session_keyring->uid != mycred->euid ||
+ if (pcred->tgcred->session_keyring->uid != mycred->euid ||
mycred->tgcred->session_keyring->uid != mycred->euid)
goto not_permitted;
_Please_ don't do either of these. The whole point is to line stuff up so
that as the eye scans down the lines, it can easily pick out the differences
in stuff that's otherwise greatly repetitive.
David
I never would of thought this. So the != has to be lined
up so things don't break?!
Justin P. Mattock
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
