Syncing up my tree with the official one ... going with Nathan and
Frank's fixes.
Changes committed to git://oss.sgi.com/kenj/pcp.git dev
man/man1/pcpintro.1 | 29 +++++++++++++++++++++++++++++
src/libpcp/src/auxconnect.c | 2 +-
src/pmdas/pmcd/src/pmcd.c | 17 -----------------
src/pmlogger/src/ports.c | 15 ++-------------
4 files changed, 32 insertions(+), 31 deletions(-)
commit 75db10c6b103b00520fb937101bb03e709118d36
Merge: 92d5e95 6f2777e
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Mon Nov 18 19:50:06 2013 +1100
Merge branch 'dev' of git://oss.sgi.com/pcp/pcp into dev
Conflicts:
src/libpcp/src/auxconnect.c
Go with Nathan's fix, not mine.
commit 6f2777e0392127773e67b2002832e3af4c513827
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Nov 18 14:37:38 2013 +1100
Do not initialise a hostent name with a bogus non-heap name
If we cannot resolve a hostname in __pmHostEntGetName, it is
not useful to initialize it to "Unknown Host". No good will
ever come from faking a host name in this way, and libpcp is
now demonstrably exposed to __pmHostEntFree failure when its
time to free the hostent structure.
commit ac82c63b9c48f24e3c80c2bf20534938efecf72f
Merge: e3293ef 6e5b567
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Nov 18 14:25:50 2013 +1100
Merge branch 'fche/dev' of ../pcpfans into dev
commit e3293ef7176aadfe8d89e7e26e41f0d80cc17fb8
Merge: 7fc6219 32f7bc6
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Nov 18 14:03:27 2013 +1100
Merge branch 'dev' of git://oss.sgi.com/kenj/pcp into dev
commit 6e5b5672a93d5ca873912564a2f8e0c47124a095
Author: Frank Ch. Eigler <fche@xxxxxxxxxx>
Date: Sun Nov 17 07:17:48 2013 -0500
FQDN cleanup: remove #if-0'd use of __pmHostEntGetName from pmcd-pmda.
commit 84db849a07f962c7a0e02058a3068cefff33cc8d
Author: Frank Ch. Eigler <fche@xxxxxxxxxx>
Date: Sun Nov 17 07:12:15 2013 -0500
FQDN cleanup: pmlogger's shouldn't try to dns-canonicalize its
pid-tmp file
pmlogger's use of __pmHostEntGetName in writing out the
$PCP_TMP_DIR/pmlogger/$pid file was uncaught in the earlier FQDN
cleanup. It was trying to do the same sort of iffy
DNS-canonicalization as deprecated pmhostname does, when we already
have a suitable hostname available in pmcd_host. Just use the latter.
Note to self, also deprecate use of __pmHostEntGetName elsewhere.
commit db22e83f02b82a78bf604d2e5205cbe02bbc3e2f
Author: Frank Ch. Eigler <fche@xxxxxxxxxx>
Date: Mon Nov 11 21:56:24 2013 -0500
pcpintro.1 man page: add a security philosophy subsection
This section aims to answer how we choose defaults for access control
for reading and writing performance data of a host.
|