Unbreak nscd(8). Without this change the CMSG gets truncated.
No idea how it worked before.
It also splits checks into separate "ifs", with a small tweak to debug.h
it makes it easier to see which one fails.
Details
Details
Diff Detail
Diff Detail
- Repository
- rS FreeBSD src repository - subversion
- Lint
Lint Passed - Unit
No Test Coverage - Build Status
Buildable 20554 Build 19976: arc lint + arc unit
Event Timeline
Comment Actions
The answer to “how it worked before” is that it didn't. It has never worked properly.
| usr.sbin/nscd/query.c | ||
|---|---|---|
| 191–203 | Please don't do this. Just fix the style issues in the original. I might even go one further and merge the four consistency checks with the recvmsg() call since they have the exact same error handling code. The fact that they're not really exactly the same because the macro uses __LINE__ is a bug, not a feature. | |
| usr.sbin/nscd/query.c | ||
|---|---|---|
| 191–203 | As it is now, it's useless. However, with one small diff (to be committed separately), it actually starts being kind of useful: --- debug.c (revision 339219) +++ debug.c (working copy) @@ -131,7 +131,7 @@ for (i = 0; i < trace_level; ++i) printf("\t"); - printf("<= %s\n", s); + printf("<= %s, %s: %d\n", s, f, l); } } | |
Comment Actions
I believe this is correct (with or without the suggested changes), but send_credentials() in usr.sbin/nscd/nscdcli.c also needs to be fixed. It was not touched by rS158257, which introduced the bug you are fixing here while trying to fix another, so the bug is slightly different. It is supposed to be (almost) identical to lib/libc/net/nscachedcli.c; the latter is actually the former ported into libc.
Both files as well as usr.sbin/nscd/query.c have pervasive style issues, as I pointed out when nscd was first imported, but perhaps it's best to leave that for later.
| usr.sbin/nscd/query.c | ||
|---|---|---|
| 175 | This is technically correct, but I'd still rather spell it out explicitly with CMSG_SPACE (not CMSG_LEN). | |
| 186 | We should probably check cred_hdr.msg_controllen here. | |
Comment Actions
This version has a couple of regressions from the previous one. Remember that CMSG_SPACE and CMSG_LEN already include space for the header, plus alignment and padding. See CMSG_DATA(3) and sys/sys/socket.h.
| usr.sbin/nscd/nscdcli.c | ||
|---|---|---|
| 148 | struct cmsgcred | |
| 156 | struct cmsgcred | |
| usr.sbin/nscd/query.c | ||
| 175 | struct cmsgcred | |