summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Beck <gbeck@sernet.de>2012-06-29 11:42:34 +0200
committerMichael Adam <obnox@samba.org>2012-06-29 17:06:05 +0200
commitec737d96048f3cd34cb2de7f939d93586c4a930f (patch)
tree2de298594af12ceb5dcd8649bbe7064473f54116
parentfef41956b9308482a2496827851d47f54dc4873b (diff)
downloadsamba-ec737d96048f3cd34cb2de7f939d93586c4a930f.tar.gz
samba-ec737d96048f3cd34cb2de7f939d93586c4a930f.tar.bz2
samba-ec737d96048f3cd34cb2de7f939d93586c4a930f.zip
s3:cclean avoid segfault in case of ctdb missbehaviour
Signed-off-by: Michael Adam <obnox@samba.org> Autobuild-User(master): Michael Adam <obnox@samba.org> Autobuild-Date(master): Fri Jun 29 17:06:05 CEST 2012 on sn-devel-104
-rw-r--r--source3/utils/cclean.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/source3/utils/cclean.c b/source3/utils/cclean.c
index d98725e7fb..487c107e47 100644
--- a/source3/utils/cclean.c
+++ b/source3/utils/cclean.c
@@ -53,9 +53,14 @@ static void print_record(const char *msg,
const struct connections_data *d)
{
char *idstr = serverid_str(k->pid);
- d_printf("%s: connection %d (%s) to \"%s\" from %u:%u@%s[%s] %s\n", msg,
- k->cnum, idstr, d->servicename, (unsigned)d->uid,
- (unsigned)d->gid, d->machine, d->addr, time_to_asc(d->start));
+ d_printf("%s: connection %d (%s) ", msg, k->cnum, idstr);
+ if (d == NULL) {
+ d_printf("<no data>\n");
+ } else {
+ d_printf("to \"%s\" from %u:%u@%s[%s] %s\n", d->servicename,
+ (unsigned)d->uid, (unsigned)d->gid, d->machine,
+ d->addr, time_to_asc(d->start));
+ }
talloc_free(idstr);
}