AIX: Fix undefined symbols
[openafs.git] / src / audit / audit.c
index 7e0a2ab..acb9e86 100644 (file)
 
 #include <roken.h>
 
-#include <fcntl.h>
-#include <stdarg.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#ifndef AFS_NT40_ENV
-#include <unistd.h>
-#endif
 #ifdef AFS_AIX32_ENV
 #include <sys/audit.h>
 #else
 #define AUDIT_FAIL_ACCESS 3
 #define AUDIT_FAIL_PRIV 4
 #endif /* AFS_AIX32_ENV */
-#include <errno.h>
 
+#include <afs/opr.h>
 #include "afs/afsint.h"
+#include "afs/butc.h"
 #include <rx/rx.h>
 #include <rx/rxkad.h>
 #include "audit.h"
 #include "audit-api.h"
 #include "lock.h"
-#ifdef AFS_AIX32_ENV
-#include <sys/audit.h>
-#endif
-#include <afs/afsutil.h>
 
-/* C99 requires va_copy.  Older versions of GCC provide __va_copy.  Per t
-   Autoconf manual, memcpy is a generally portable fallback. */
-#ifndef va_copy
-# ifdef __va_copy
-#  define va_copy(d, s)         __va_copy((d), (s))
-# else
-#  define va_copy(d, s)         memcpy(&(d), &(s), sizeof(va_list))
-# endif
-#endif
+#include <afs/afsutil.h>
 
 extern struct osi_audit_ops audit_file_ops;
 #ifdef HAVE_SYS_IPC_H
@@ -58,6 +39,11 @@ extern struct osi_audit_ops audit_sysvmq_ops;
 #endif
 
 static struct {
+    void *rock;
+    int (*islocal)(void *rock, char *name, char *inst, char *cell);
+} audit_user_check = { NULL, NULL };
+
+static struct {
     const char *name;
     const struct osi_audit_ops *ops;
 } audit_interfaces[] = {
@@ -67,19 +53,114 @@ static struct {
     { "sysvmq", &audit_sysvmq_ops },
 #endif
 };
+/* default_interface indexes into the audit_interfaces list. */
+static int default_interface = 0; /* Set default to the file interface */
 
 #define N_INTERFACES (sizeof(audit_interfaces) / sizeof(audit_interfaces[0]))
 
-/* default to `file' audit interface */
-static const struct osi_audit_ops *audit_ops = &audit_file_ops;
+/*
+ * Audit interface calling sequence:
+ * osi_audit_interface - sets the default audit interface
+ * osi_audit_file
+ *    create_instance - Called during command arg processing (-auditlog)
+ *    open_file - Called during command arg processing (-auditlog)
+ * osi_audit_open_interface
+ *    open_interface - Called after thread environment has been established
+ * osi_audit_close_interface
+ *    close_interface - Called during main process shutdown
+ * osi_audit
+ *    send_msg - Called during audit events
+ */
+struct audit_log {
+    struct opr_queue link;
+    const struct osi_audit_ops *audit_ops;
+    int auditout_open;
+    void *context;
+};
+
+struct audit_msg {
+    char buf[OSI_AUDIT_MAXMSG];
+    size_t len; /* length of the string in 'buf' (not including the trailing '\0') */
+    int truncated; /* was this message truncated during formatting? */
+};
+
+#ifdef AFS_PTHREAD_ENV
+static pthread_mutex_t audit_lock;
+static pthread_once_t audit_lock_once = PTHREAD_ONCE_INIT;
+#endif
+
+/* Chain of active interfaces */
+static struct opr_queue audit_logs = {&audit_logs, &audit_logs};
 
 static int osi_audit_all = (-1);       /* Not determined yet */
 static int osi_echo_trail = (-1);
 
-static int auditout_open = 0;
+static int auditout_open = 0;          /* True if any interface is open */
 
 static int osi_audit_check(void);
 
+/*
+ * Send the message to all the interfaces
+ * @pre audit_lock held
+ */
+static void
+multi_send_msg(struct audit_msg *msg)
+{
+    struct opr_queue *cursor;
+
+    if (msg->len < 1) /* Don't send empty strings */
+       return;
+
+    for (opr_queue_Scan(&audit_logs, cursor)) {
+       struct audit_log *alog;
+       alog = opr_queue_Entry(cursor, struct audit_log, link);
+       if (alog->auditout_open) {
+           alog->audit_ops->send_msg(alog->context, msg->buf, msg->len,
+                                     msg->truncated);
+       }
+    }
+}
+static void
+append_msg(struct audit_msg *msg, const char *format, ...)
+{
+    va_list ap;
+    int remaining, printed;
+
+    if (msg->truncated) {
+       return;
+    }
+
+    if (msg->len >= OSI_AUDIT_MAXMSG - 1) {
+       /* Make sure we have at least some space left */
+       msg->truncated = 1;
+       return;
+    }
+
+    remaining = OSI_AUDIT_MAXMSG - msg->len;
+
+    va_start(ap, format);
+
+    printed = vsnprintf(&msg->buf[msg->len], remaining, format, ap);
+
+    if (printed < 0) {
+       /* Error during formatting. */
+       msg->truncated = 1;
+       printed = 0;
+
+    } else if (printed >= remaining) {
+       /* We tried to write more characters than we had space for. */
+       msg->truncated = 1;
+       printed = remaining - 1;
+
+       /* Make sure we're still terminated. */
+       msg->buf[OSI_AUDIT_MAXMSG - 1] = '\0';
+    }
+
+    msg->len += printed;
+    opr_Assert(msg->len < OSI_AUDIT_MAXMSG);
+
+    va_end(ap);
+}
 #ifdef AFS_AIX32_ENV
 static char *bufferPtr;
 static int bufferLen;
@@ -153,6 +234,96 @@ audmakebuf(char *audEvent, va_list vaList)
                bufferPtr += sizeof(struct AFSFid);
                break;
            }
+       /* butc tape label */
+       case AUD_TLBL:
+           {
+               struct tc_tapeLabel *label;
+
+               label = (struct tc_tapeLabel *)va_arg(vaList,
+                                                     struct tc_tapeLabel *);
+               if (label)
+                   memcpy(bufferPtr, label, sizeof(*label));
+               else
+                   memset(bufferPtr, 0, sizeof(*label));
+               bufferPtr += sizeof(label);
+               break;
+           }
+       /* butc dump interface */
+       case AUD_TDI:
+           {
+               struct tc_dumpInterface *di;
+
+               di = (struct tc_dumpInterface *)
+                       va_arg(vaList, struct tc_dumpInterface *);
+               if (di)
+                   memcpy(bufferPtr, di, sizeof(*di));
+               else
+                   memset(bufferPtr, 0, sizeof(*di));
+               bufferPtr += sizeof(*di);
+               break;
+           }
+       /*
+        * butc dump array
+        * An array of dump descriptions, but the AIX audit package assumes fixed
+        * length, so we can only do the first one for now.
+        */
+       case AUD_TDA:
+           {
+               struct tc_dumpArray *da;
+
+               da = (struct tc_dumpArray *)
+                       va_arg(vaList, struct tc_dumpArray *);
+               if (da && da->tc_dumpArray_len) {
+                   memcpy(bufferPtr, &da->tc_dumpArray_len, sizeof(u_int));
+                   bufferPtr += sizeof(u_int);
+                   memcpy(bufferPtr, da->tc_dumpArray_val,
+                          sizeof(da->tc_dumpArray_val[0]));
+               } else {
+                   memset(bufferPtr, 0, sizeof(u_int));
+                   bufferPtr += sizeof(u_int);
+                   memset(bufferPtr, 0, sizeof(da->tc_dumpArray_val[0]));
+               }
+               bufferPtr += sizeof(da->tc_dumpArray_val[0]);
+               break;
+           }
+       /*
+        * butc restore array
+        * An array of restore descriptions, but the AIX audit package assumes
+        * fixed length, so we can only do the first one for now.
+        */
+       case AUD_TRA:
+           {
+               struct tc_restoreArray *ra;
+
+               ra = (struct tc_restoreArray *)
+                       va_arg(vaList, struct tc_restoreArray *);
+               if (ra && ra->tc_restoreArray_len) {
+                   memcpy(bufferPtr, &ra->tc_restoreArray_len, sizeof(u_int));
+                   bufferPtr += sizeof(u_int);
+                   memcpy(bufferPtr, ra->tc_restoreArray_val,
+                          sizeof(ra->tc_restoreArray_val[0]));
+               } else {
+                   memset(bufferPtr, 0, sizeof(u_int));
+                   bufferPtr += sizeof(u_int);
+                   memset(bufferPtr, 0, sizeof(ra->tc_restoreArray_val[0]));
+               }
+               bufferPtr += sizeof(ra->tc_restoreArray_val[0]);
+               break;
+           }
+       /* butc tape controller status */
+       case AUD_TSTT:
+           {
+               struct tciStatusS *status;
+
+               status = (struct tciStatusS *)va_arg(vaList,
+                                                    struct tciStatusS *);
+               if (status)
+                   memcpy(bufferPtr, status, sizeof(*status));
+               else
+                   memset(bufferPtr, 0, sizeof(*status));
+               bufferPtr += sizeof(*status);
+               break;
+           }
        default:
 #ifdef AFS_AIX32_ENV
            code =
@@ -178,29 +349,38 @@ printbuf(int rec, char *audEvent, char *afsName, afs_int32 hostId,
     char *vaStr;
     struct AFSFid *vaFid;
     struct AFSCBFids *vaFids;
+    struct tc_tapeLabel *vaLabel;
+    struct tc_dumpInterface *vaDI;
+    struct tc_dumpArray *vaDA;
+    struct tc_restoreArray *vaRA;
+    struct tciStatusS *vaTCstatus;
     int num = LogThreadNum();
     struct in_addr hostAddr;
     time_t currenttime;
-    char *timeStamp;
     char tbuffer[26];
+    struct tm tm;
+    struct audit_msg *msg = calloc(1, sizeof(*msg));
+
+    if (!msg) {
+       return;
+    }
 
     /* Don't print the timestamp or thread id if we recursed */
     if (rec == 0) {
        currenttime = time(0);
-       timeStamp = afs_ctime(&currenttime, tbuffer,
-                             sizeof(tbuffer));
-       timeStamp[24] = ' ';   /* ts[24] is the newline, 25 is the null */
-       audit_ops->append_msg(timeStamp);
+       if (strftime(tbuffer, sizeof(tbuffer), "%a %b %d %H:%M:%S %Y ",
+                    localtime_r(&currenttime, &tm)) !=0)
+           append_msg(msg, tbuffer);
 
        if (num > -1)
-           audit_ops->append_msg("[%d] ", num);
+           append_msg(msg, "[%d] ", num);
     }
 
-    audit_ops->append_msg("EVENT %s CODE %d ", audEvent, errCode);
+    append_msg(msg, "EVENT %s CODE %d ", audEvent, errCode);
 
     if (afsName) {
        hostAddr.s_addr = hostId;
-       audit_ops->append_msg("NAME %s HOST %s ", afsName, inet_ntoa(hostAddr));
+       append_msg(msg, "NAME %s HOST %s ", afsName, inet_ntoa(hostAddr));
     }
 
     vaEntry = va_arg(vaList, int);
@@ -209,52 +389,52 @@ printbuf(int rec, char *audEvent, char *afsName, afs_int32 hostId,
        case AUD_STR:           /* String */
            vaStr = (char *)va_arg(vaList, char *);
            if (vaStr)
-               audit_ops->append_msg("STR %s ", vaStr);
+               append_msg(msg, "STR %s ", vaStr);
            else
-               audit_ops->append_msg("STR <null>");
+               append_msg(msg, "STR <null>");
            break;
        case AUD_NAME:          /* Name */
            vaStr = (char *)va_arg(vaList, char *);
            if (vaStr)
-               audit_ops->append_msg("NAME %s ", vaStr);
+               append_msg(msg, "NAME %s ", vaStr);
            else
-               audit_ops->append_msg("NAME <null>");
+               append_msg(msg, "NAME <null>");
            break;
        case AUD_ACL:           /* ACL */
            vaStr = (char *)va_arg(vaList, char *);
            if (vaStr)
-               audit_ops->append_msg("ACL %s ", vaStr);
+               append_msg(msg, "ACL %s ", vaStr);
            else
-               audit_ops->append_msg("ACL <null>");
+               append_msg(msg, "ACL <null>");
            break;
        case AUD_INT:           /* Integer */
            vaInt = va_arg(vaList, int);
-           audit_ops->append_msg("INT %d ", vaInt);
+           append_msg(msg, "INT %d ", vaInt);
            break;
        case AUD_ID:            /* ViceId */
            vaInt = va_arg(vaList, int);
-           audit_ops->append_msg("ID %d ", vaInt);
+           append_msg(msg, "ID %d ", vaInt);
            break;
        case AUD_DATE:          /* Date    */
            vaLong = va_arg(vaList, afs_int32);
-           audit_ops->append_msg("DATE %u ", vaLong);
+           append_msg(msg, "DATE %u ", vaLong);
            break;
        case AUD_HOST:          /* Host ID */
            vaLong = va_arg(vaList, afs_int32);
             hostAddr.s_addr = vaLong;
-           audit_ops->append_msg("HOST %s ", inet_ntoa(hostAddr));
+           append_msg(msg, "HOST %s ", inet_ntoa(hostAddr));
            break;
        case AUD_LONG:          /* afs_int32    */
            vaLong = va_arg(vaList, afs_int32);
-           audit_ops->append_msg("LONG %d ", vaLong);
+           append_msg(msg, "LONG %d ", vaLong);
            break;
        case AUD_FID:           /* AFSFid - contains 3 entries */
            vaFid = va_arg(vaList, struct AFSFid *);
            if (vaFid)
-               audit_ops->append_msg("FID %u:%u:%u ", vaFid->Volume, vaFid->Vnode,
-                      vaFid->Unique);
+               append_msg(msg, "FID %u:%u:%u ", vaFid->Volume, vaFid->Vnode,
+                          vaFid->Unique);
            else
-               audit_ops->append_msg("FID %u:%u:%u ", 0, 0, 0);
+               append_msg(msg, "FID %u:%u:%u ", 0, 0, 0);
            break;
        case AUD_FIDS:          /* array of Fids */
            vaFids = va_arg(vaList, struct AFSCBFids *);
@@ -265,36 +445,130 @@ printbuf(int rec, char *audEvent, char *afsName, afs_int32 hostId,
                 vaFid = vaFids->AFSCBFids_val;
 
                 if (vaFid) {
-                    audit_ops->append_msg("FIDS %u FID %u:%u:%u ", vaFids->AFSCBFids_len, vaFid->Volume,
-                             vaFid->Vnode, vaFid->Unique);
-                    for ( i = 1; i < vaFids->AFSCBFids_len; i++, vaFid++ )
-                        audit_ops->append_msg("FID %u:%u:%u ", vaFid->Volume,
-                                vaFid->Vnode, vaFid->Unique);
+                   append_msg(msg, "FIDS %u ", vaFids->AFSCBFids_len);
+                    for ( i = 1; i <= vaFids->AFSCBFids_len; i++, vaFid++ )
+                       append_msg(msg, "FID %u:%u:%u ", vaFid->Volume,
+                                  vaFid->Vnode, vaFid->Unique);
                 } else
-                    audit_ops->append_msg("FIDS 0 FID 0:0:0 ");
+                   append_msg(msg, "FIDS 0 FID 0:0:0 ");
 
             }
            break;
+       case AUD_TLBL:          /* butc tape label */
+           vaLabel = va_arg(vaList, struct tc_tapeLabel *);
+
+           if (vaLabel) {
+               append_msg(msg, "TAPELABEL %d:%.*s:%.*s:%u ",
+                          vaLabel->size,
+                          TC_MAXTAPELEN, vaLabel->afsname,
+                          TC_MAXTAPELEN, vaLabel->pname,
+                          vaLabel->tapeId);
+           } else {
+               append_msg(msg, "TAPELABEL <null>");
+           }
+           break;
+       case AUD_TDI:
+           vaDI = va_arg(vaList, struct tc_dumpInterface *);
+
+           if (vaDI) {
+               append_msg(msg,
+    "TCDUMPINTERFACE %.*s:%.*s:%.*s:%d:%d:%d:%d:%.*s:%.*s:%d:%d:%d:%d:%d ",
+    TC_MAXDUMPPATH, vaDI->dumpPath, TC_MAXNAMELEN, vaDI->volumeSetName,
+    TC_MAXNAMELEN, vaDI->dumpName, vaDI->parentDumpId, vaDI->dumpLevel,
+    vaDI->doAppend,
+    vaDI->tapeSet.id, TC_MAXHOSTLEN, vaDI->tapeSet.tapeServer,
+    TC_MAXFORMATLEN, vaDI->tapeSet.format, vaDI->tapeSet.maxTapes,
+    vaDI->tapeSet.a, vaDI->tapeSet.b, vaDI->tapeSet.expDate,
+    vaDI->tapeSet.expType);
+           } else {
+               append_msg(msg, "TCDUMPINTERFACE <null>");
+           }
+           break;
+       case AUD_TDA:
+           vaDA = va_arg(vaList, struct tc_dumpArray *);
+
+           if (vaDA) {
+               u_int i;
+               struct tc_dumpDesc *desc;
+               struct in_addr hostAddr;
+
+               desc = vaDA->tc_dumpArray_val;
+               if (desc) {
+                   append_msg(msg, "DUMPS %d ", vaDA->tc_dumpArray_len);
+                   for (i = 0; i < vaDA->tc_dumpArray_len; i++, desc++) {
+                       hostAddr.s_addr = desc->hostAddr;
+                       append_msg(msg, "DUMP %d:%d:%.*s:%d:%d:%d:%s ",
+                                  desc->vid, desc->vtype, TC_MAXNAMELEN, desc->name,
+                                  desc->partition, desc->date, desc->cloneDate,
+                                  inet_ntoa(hostAddr));
+                   }
+               } else {
+                   append_msg(msg, "DUMPS 0 DUMP 0:0::0:0:0:0.0.0.0");
+               }
+           }
+           break;
+       case AUD_TRA:
+           vaRA = va_arg(vaList, struct tc_restoreArray *);
+
+           if (vaRA) {
+               u_int i;
+               struct tc_restoreDesc *desc;
+               struct in_addr hostAddr;
+
+               desc = vaRA->tc_restoreArray_val;
+               if (desc) {
+                   append_msg(msg, "RESTORES %d ",
+                                         vaRA->tc_restoreArray_len);
+                   for(i = 0; i < vaRA->tc_restoreArray_len; i++, desc++) {
+                       hostAddr.s_addr = desc->hostAddr;
+                       append_msg(msg,
+                                  "RESTORE %d:%.*s:%d:%d:%d:%d:%d:%d:%d:%s:%.*s:%.*s ",
+                                  desc->flags, TC_MAXTAPELEN, desc->tapeName,
+                                  desc->dbDumpId, desc->initialDumpId,
+                                  desc->position, desc->origVid, desc->vid,
+                                  desc->partition, desc->dumpLevel,
+                                  inet_ntoa(hostAddr), TC_MAXNAMELEN,
+                                  desc->oldName, TC_MAXNAMELEN, desc->newName);
+                   }
+               } else {
+                   append_msg(msg,
+                       "RESTORES 0 RESTORE 0::0:0:0:0:0:0:0:0.0.0.0::: ");
+               }
+           }
+           break;
+       case AUD_TSTT:
+           vaTCstatus = va_arg(vaList, struct tciStatusS *);
+
+           if (vaTCstatus)
+               append_msg(msg, "TCSTATUS %.*s:%d:%d:%d:%d:%.*s:%d:%d ",
+                          TC_MAXNAMELEN, vaTCstatus->taskName,
+                          vaTCstatus->taskId, vaTCstatus->flags,
+                          vaTCstatus->dbDumpId, vaTCstatus->nKBytes,
+                          TC_MAXNAMELEN, vaTCstatus->volumeName,
+                          vaTCstatus->volsFailed,
+                          vaTCstatus->lastPolled);
+           else
+               append_msg(msg, "TCSTATUS <null>");
+           break;
        default:
-           audit_ops->append_msg("--badval-- ");
+           append_msg(msg, "--badval-- ");
            break;
        }                       /* end switch */
        vaEntry = va_arg(vaList, int);
     }                          /* end while */
 
-    audit_ops->send_msg();
+    MUTEX_ENTER(&audit_lock);
+    multi_send_msg(msg);
+    MUTEX_EXIT(&audit_lock);
+
+    free(msg);
 }
 
 #ifdef AFS_PTHREAD_ENV
-static pthread_mutex_t audit_lock;
-static volatile afs_int32   audit_lock_initialized = 0;
-static pthread_once_t audit_lock_once = PTHREAD_ONCE_INIT;
-
 static void
 osi_audit_init_lock(void)
 {
     MUTEX_INIT(&audit_lock, "audit", MUTEX_DEFAULT, 0);
-    audit_lock_initialized = 1;
 }
 #endif
 
@@ -302,9 +576,7 @@ void
 osi_audit_init(void)
 {
 #ifdef AFS_PTHREAD_ENV
-    if (!audit_lock_initialized) {
-       pthread_once(&audit_lock_once, osi_audit_init_lock);
-    }
+    pthread_once(&audit_lock_once, osi_audit_init_lock);
 #endif /* AFS_PTHREAD_ENV */
 }
 
@@ -327,9 +599,9 @@ osi_audit_internal(char *audEvent,  /* Event name (15 chars or less) */
 
 #ifdef AFS_PTHREAD_ENV
     /* i'm pretty sure all the server apps now call osi_audit_init(),
-     * but to be extra careful we'll leave this assert in here for a
+     * but to be extra careful we'll leave this in here for a
      * while to make sure */
-    osi_Assert(audit_lock_initialized);
+    pthread_once(&audit_lock_once, osi_audit_init_lock);
 #endif /* AFS_PTHREAD_ENV */
 
     if ((osi_audit_all < 0) || (osi_echo_trail < 0))
@@ -363,8 +635,8 @@ osi_audit_internal(char *audEvent,  /* Event name (15 chars or less) */
     }
 #endif
 
-    MUTEX_ENTER(&audit_lock);
 #ifdef AFS_AIX32_ENV
+    MUTEX_ENTER(&audit_lock);
     bufferPtr = BUFFER;
 
     /* Put the error code into the buffer list */
@@ -372,17 +644,15 @@ osi_audit_internal(char *audEvent,        /* Event name (15 chars or less) */
     bufferPtr += sizeof(errCode);
 
     audmakebuf(audEvent, vaList);
-#endif
 
-#ifdef AFS_AIX32_ENV
     bufferLen = (int)((afs_int32) bufferPtr - (afs_int32) & BUFFER[0]);
     code = auditlog(audEvent, result, BUFFER, bufferLen);
+    MUTEX_EXIT(&audit_lock);
 #else
     if (auditout_open) {
        printbuf(0, audEvent, afsName, hostId, errCode, vaList);
     }
 #endif
-    MUTEX_EXIT(&audit_lock);
 
     return 0;
 }
@@ -416,7 +686,7 @@ osi_auditU(struct rx_call *call, char *audEvent, int errCode, ...)
     struct rx_peer *peer;
     afs_int32 secClass;
     afs_int32 code;
-    char afsName[MAXKTCNAMELEN];
+    char afsName[MAXKTCNAMELEN + MAXKTCNAMELEN + MAXKTCREALMLEN + 3];
     afs_int32 hostId;
     va_list vaList;
 
@@ -432,15 +702,14 @@ osi_auditU(struct rx_call *call, char *audEvent, int errCode, ...)
        conn = rx_ConnectionOf(call);   /* call -> conn) */
        if (conn) {
             secClass = rx_SecurityClassOf(conn);       /* conn -> securityIndex */
-           if (secClass == 0) {        /* unauthenticated */
+           if (secClass == RX_SECIDX_NULL) {   /* unauthenticated */
                osi_audit("AFS_Aud_Unauth", (-1), AUD_STR, audEvent, AUD_END);
                strcpy(afsName, "--UnAuth--");
-           } else if (secClass == 2) { /* authenticated */
+           } else if (secClass == RX_SECIDX_KAD || secClass == RX_SECIDX_KAE) {
+               /* authenticated with rxkad */
                 char tcell[MAXKTCREALMLEN];
                 char name[MAXKTCNAMELEN];
                 char inst[MAXKTCNAMELEN];
-                char vname[256];
-                int  ilen, clen;
 
                 code =
                    rxkad_GetServerInfo(conn, NULL, NULL, name, inst, tcell,
@@ -449,66 +718,26 @@ osi_auditU(struct rx_call *call, char *audEvent, int errCode, ...)
                    osi_audit("AFS_Aud_NoAFSId", (-1), AUD_STR, audEvent, AUD_END);
                    strcpy(afsName, "--NoName--");
                } else {
-                    strncpy(vname, name, sizeof(vname));
-                    if ((ilen = strlen(inst))) {
-                        if (strlen(vname) + 1 + ilen >= sizeof(vname))
-                            goto done;
-                        strcat(vname, ".");
-                        strcat(vname, inst);
-                    }
-                    if ((clen = strlen(tcell))) {
-#if defined(AFS_ATHENA_STDENV) || defined(AFS_KERBREALM_ENV)
-                        static char local_realms[AFS_NUM_LREALMS][AFS_REALM_SZ];
-                       static int  num_lrealms = -1;
-                       int i, lrealm_match;
-
-                       if (num_lrealms == -1) {
-                           for (i = 0; i < AFS_NUM_LREALMS; i++) {
-                               if (afs_krb_get_lrealm(local_realms[i], i) != 0 /*KSUCCESS*/)
-                                   break;
-                           }
-
-                           if (i == 0)
-                               strncpy(local_realms[0], "UNKNOWN.LOCAL.REALM", AFS_REALM_SZ);
-                           num_lrealms = i;
-                        }
-
-                       /* Check to see if the ticket cell matches one of the local realms */
-                       lrealm_match = 0;
-                       for (i = 0; i < num_lrealms ; i++ ) {
-                           if (!strcasecmp(local_realms[i], tcell)) {
-                               lrealm_match = 1;
-                               break;
-                           }
-                       }
-                       /* If yes, then make sure that the name is not present in
-                        * an exclusion list */
-                       if (lrealm_match) {
-                           char uname[256];
-                           if (inst[0])
-                               snprintf(uname,sizeof(uname),"%s.%s@%s",name,inst,tcell);
-                           else
-                               snprintf(uname,sizeof(uname),"%s@%s",name,tcell);
-
-                           if (afs_krb_exclusion(uname))
-                               lrealm_match = 0;
-                       }
-
-                       if (!lrealm_match) {
-                            if (strlen(vname) + 1 + clen >= sizeof(vname))
-                                goto done;
-                            strcat(vname, "@");
-                            strcat(vname, tcell);
-                        }
-#endif
-                    }
-                    strcpy(afsName, vname);
-                }
-           } else {            /* Unauthenticated & unknown */
+                   afs_int32 islocal = 0;
+                   if (audit_user_check.islocal) {
+                       islocal =
+                           audit_user_check.islocal(audit_user_check.rock,
+                                                    name, inst, tcell);
+                   }
+                   strlcpy(afsName, name, sizeof(afsName));
+                   if (inst[0]) {
+                       strlcat(afsName, ".", sizeof(afsName));
+                       strlcat(afsName, inst, sizeof(afsName));
+                   }
+                   if (tcell[0] && !islocal) {
+                       strlcat(afsName, "@", sizeof(afsName));
+                       strlcat(afsName, tcell, sizeof(afsName));
+                   }
+               }
+           } else {            /* Unauthenticated and/or unknown */
                osi_audit("AFS_Aud_UnknSec", (-1), AUD_STR, audEvent, AUD_END);
                 strcpy(afsName, "--Unknown--");
            }
-       done:
            peer = rx_PeerOf(conn);     /* conn -> peer */
            if (peer)
                hostId = rx_HostOf(peer);       /* peer -> host */
@@ -568,32 +797,337 @@ osi_audit_check(void)
     return 0;
 }
 
+/*!
+ * Helper for processing cmd line options
+ *
+ * Process the parameters for the -audit-interface and -auditlog command line
+ * options
+ *
+ * @param[in] default_iface
+ *     String for the default audit interface or NULL
+ * @param[in] audit_loglist
+ *     Pointer to a cmd_item list of audit logs or NULL
+ *
+ * @return status
+ * @retval     0       - success
+ * @retval     -1      - Error (message printed to stderr)
+ */
+
 int
-osi_audit_file(const char *fileName)
+osi_audit_cmd_Options(char *default_iface, struct cmd_item *audit_loglist)
+{
+
+    if (default_iface) {
+       if (osi_audit_interface(default_iface)) {
+           fprintf(stderr, "Invalid auditinterface '%s'\n", default_iface);
+           return -1;
+       }
+    }
+
+    while (audit_loglist != NULL) {
+       if (osi_audit_file(audit_loglist->data)) {
+           fprintf(stderr, "Error processing auditlog options '%s'\n",
+                   audit_loglist->data);
+           return -1;
+       }
+       audit_loglist = audit_loglist->next;
+    }
+    return 0;
+}
+
+ /*
+ * Handle parsing a string: [interface_name:]filespec[:options]
+ * The string a:b will parse 'a' as the interface name and 'b' as the filespec.
+ * Note that the string pointed by optionstr will be modified
+ * by strtok_r by inserting '\0' between the tokens.
+ * The values returned in interface_name, filespec and options
+ * are pointers to the 'sub-strings' within optionstr.
+ */
+static int
+parse_file_options(char *optionstr,
+                  const char **interface_name,
+                  char **filespec,
+                  char **options)
 {
-    if(!audit_ops->open_file(fileName)) {
-        auditout_open = 1;
-        return 0;
+    int code = 0;
+    char *opt_cursor = optionstr;
+    char *tok1 = NULL, *tok2 = NULL, *tok3 = NULL, *tokptrsave = NULL;
+
+    /*
+     * Handle the fact that strtok doesn't handle empty fields e.g. a::b
+     * and will return tok1-> a tok2-> b
+     */
+
+    /* 1st field */
+    if (*opt_cursor != ':') {
+       tok1 = strtok_r(opt_cursor, ":", &tokptrsave);
+       opt_cursor = strtok_r(NULL, "", &tokptrsave);
+    } else  {
+       /* Skip the ':' */
+       opt_cursor++;
+    }
+
+    /* 2nd field */
+    if (opt_cursor != NULL) {
+       if (*opt_cursor != ':') {
+           tok2 = strtok_r(opt_cursor, ":", &tokptrsave);
+           opt_cursor = strtok_r(NULL, "", &tokptrsave);
+       } else {
+           /* Skip the ':' */
+           opt_cursor++;
+       }
+    }
+
+    /* 3rd field is just the remainder if any */
+    tok3 = opt_cursor;
+
+    if (tok1 == NULL || strlen(tok1) == 0) {
+       fprintf(stderr, "Missing -auditlog parameter\n");
+       code = EINVAL;
+       goto done;
+    }
+
+    /* If only one token, then it's the filespec */
+    if (tok2 == NULL && tok3 == NULL) {
+       *filespec = tok1;
+    } else {
+       *interface_name = tok1;
+       *filespec = tok2;
+       *options = tok3;
+    }
+
+ done:
+    return code;
+}
+
+/*
+ * Parse the options looking for comma-seperated values.
+ */
+static int
+parse_option_string(const struct osi_audit_ops *ops, void *rock, char *options)
+{
+    int code = 0;
+    char *tok1, *tokptrsave = NULL;
+
+    tok1 = strtok_r(options, ",", &tokptrsave);
+    while (tok1) {
+       /* Handle opt=val or just opt */
+       char *opt, *val;
+       char *optvalsave;
+
+       opt = strtok_r(tok1, "=", &optvalsave);
+       val = strtok_r(NULL, "", &optvalsave);
+
+       code = ops->set_option(rock, opt, val);
+
+       if (code) {
+           /* Bad option */
+           goto done;
+       }
+       tok1 = strtok_r(NULL, ",", &tokptrsave);
+    }
+
+ done:
+    return code;
+}
+
+/*
+ * Process -auditlog
+ *  [interface]:filespec[:options]
+ *      interface - interface name (optional - defaults to default_interface)
+ *      filespec - depends on the interface (required)
+ *      options - optional string passed to interface
+ * Returns 0 - success
+ *        EINVAL - option error
+ *        ENOMEM - error allocating memory
+ */
+
+int
+osi_audit_file(const char *fileplusoptions)
+{
+
+    int idx;
+    int code;
+
+    char *optionstr = NULL;
+
+    const char *interface_name = NULL;
+    char *filespec = NULL;
+    char *options = NULL;
+
+    const struct osi_audit_ops *ops = NULL;
+    struct audit_log *new_alog = NULL;
+
+    /* Use the default unless specified */
+    interface_name = audit_interfaces[default_interface].name;
+
+    /* dup of the input string so the parsing can safely modify it */
+    optionstr = strdup(fileplusoptions);
+    if (!optionstr) {
+       code = ENOMEM;
+       goto done;
+    }
+
+    code = parse_file_options(optionstr, &interface_name, &filespec, &options);
+    if (code)
+       goto done;
+
+    if (interface_name && strlen(interface_name) != 0) {
+       for (idx = 0; idx < N_INTERFACES; idx++) {
+           if (strcmp(interface_name, audit_interfaces[idx].name) == 0) {
+               ops = audit_interfaces[idx].ops;
+               break;
+           }
+       }
+       if (ops == NULL) {
+           /* Couldn't find the interface name */
+           fprintf(stderr, "Could not find the specified audit interface %s\n", interface_name);
+           code = EINVAL;
+           goto done;
+       }
+    } else {
+       fprintf(stderr, "Missing interface name\n");
+       code = EINVAL;
+       goto done;
+    }
+
+    if (filespec == NULL || strlen(filespec) == 0) {
+       fprintf(stderr, "Missing auditlog path for %s interface\n", interface_name);
+       code = EINVAL;
+       goto done;
     }
-    return 1;
+
+    opr_Assert(ops->create_interface != NULL);
+    opr_Assert(ops->close_interface != NULL);
+    opr_Assert(ops->open_file != NULL);
+    opr_Assert(ops->send_msg != NULL);
+    opr_Assert(ops->print_interface_stats != NULL);
+    /* open_interface, set_option and close_interface are optional */
+
+    new_alog = calloc(1, sizeof(*new_alog));
+    if (!new_alog) {
+       code = ENOMEM;
+       goto done;
+    }
+
+    new_alog->audit_ops = ops;
+    new_alog->auditout_open = 0;
+
+    new_alog->context = ops->create_interface();
+    if (new_alog->context == NULL) {
+           code = ENOMEM;
+           goto done;
+    }
+
+    if (options != NULL && ops->set_option != NULL) {
+       /* Split the option string at commas */
+       code = parse_option_string(ops, new_alog->context, options);
+       if (code)
+           goto done;
+    }
+
+    code = ops->open_file(new_alog->context, filespec);
+    if (code) {
+       /* Error opening file */
+       goto done;
+    }
+
+    new_alog->auditout_open = 1;
+    auditout_open = 1;
+
+    /* Add to chain of active interfaces */
+    opr_queue_Append(&audit_logs, &new_alog->link);
+    new_alog = NULL;
+
+    code = 0;
+
+ done:
+     if (code) {
+        /* Error condition present.. */
+        if (new_alog) {
+            ops->close_interface(&new_alog->context);
+            free(new_alog);
+        }
+     }
+
+    if (optionstr)
+       free(optionstr);
+    return code;
 }
 
+/*
+ * Set the default interface
+ * return 0 for success
+ *        EINVAL missing or invalid interface name
+ */
 int
 osi_audit_interface(const char *interface)
 {
-    int i;
-    for (i = 0; i < N_INTERFACES; ++i) {
-       if (strcmp(interface, audit_interfaces[i].name) == 0) {
-           audit_ops = audit_interfaces[i].ops;
+    int idx;
+
+    if (interface == NULL || strlen(interface) == 0)
+       return EINVAL;
+
+    for (idx = 0; idx < N_INTERFACES; idx++) {
+       if (strcmp(interface, audit_interfaces[idx].name) == 0) {
+           default_interface = idx;
            return 0;
        }
     }
+    return EINVAL;
+}
 
-    return 1;
+/*
+ * Let the interfaces finish initialization
+ */
+void
+osi_audit_open(void)
+{
+    struct opr_queue *cursor;
+
+    for (opr_queue_Scan(&audit_logs, cursor)) {
+       struct audit_log *alog;
+       alog = opr_queue_Entry(cursor, struct audit_log, link);
+       if (alog->auditout_open && alog->audit_ops->open_interface != NULL)
+           alog->audit_ops->open_interface(alog->context);
+    }
+}
+
+/*
+ * Shutdown the interfaces
+ */
+void
+osi_audit_close(void)
+{
+    struct opr_queue *cursor, *cursorsave;
+
+    for (opr_queue_ScanSafe(&audit_logs, cursor, cursorsave)) {
+       struct audit_log *alog;
+       alog = opr_queue_Entry(cursor, struct audit_log, link);
+       alog->audit_ops->close_interface(&alog->context);
+       opr_queue_Remove(&alog->link);
+       free(alog);
+    }
+}
+
+void
+osi_audit_set_user_check(void *rock,
+                        int (*islocal) (void *rock, char *name, char *inst,
+                                        char *cell))
+{
+    audit_user_check.rock = rock;
+    audit_user_check.islocal = islocal;
 }
 
 void
 audit_PrintStats(FILE *out)
 {
-    audit_ops->print_interface_stats(out);
+    struct opr_queue *cursor;
+
+    for (opr_queue_Scan(&audit_logs, cursor)) {
+       struct audit_log *alog;
+       alog = opr_queue_Entry(cursor, struct audit_log, link);
+       if (alog->auditout_open)
+           alog->audit_ops->print_interface_stats(alog->context, out);
+    }
 }