From dcdbb4c686e7d4b2557c3169d7befd4e0da33207 Mon Sep 17 00:00:00 2001 From: Steve McIntosh Date: Wed, 17 Dec 2008 18:12:10 +0000 Subject: [PATCH] DEVEL15-auditlog-fids-20081217 LICENSE IPL10 FIXES 123922 make auditlog process multiple fids correctly (cherry picked from commit 8271c1674f75f80804d08e0f4ed3178b61b29eff) --- src/audit/audit.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/audit/audit.c b/src/audit/audit.c index 2dfd5d269..96283f213 100644 --- a/src/audit/audit.c +++ b/src/audit/audit.c @@ -233,24 +233,21 @@ printbuf(FILE *out, int rec, char *audEvent, char *afsName, afs_int32 hostId, break; case AUD_FIDS: /* array of Fids */ vaFids = va_arg(vaList, struct AFSCBFids *); - vaFid = NULL; if (vaFids) { int i; - if (vaFid) + + vaFid = vaFids->AFSCBFids_val; + + if (vaFid) { fprintf(out, "FIDS %u FID %u:%u:%u ", vaFids->AFSCBFids_len, vaFid->Volume, vaFid->Vnode, vaFid->Unique); - else + for ( i = 1; i < vaFids->AFSCBFids_len; i++, vaFid++ ) + fprintf(out, "FID %u:%u:%u ", vaFid->Volume, + vaFid->Vnode, vaFid->Unique); + } else fprintf(out, "FIDS 0 FID 0:0:0 "); - for ( i = 1; i < vaFids->AFSCBFids_len; i++ ) { - vaFid = vaFids->AFSCBFids_val; - if (vaFid) - fprintf(out, "FID %u:%u:%u ", vaFid->Volume, - vaFid->Vnode, vaFid->Unique); - else - fprintf(out, "FID 0:0:0 "); - } } break; default: -- 2.39.5