From 0d7a2af9084c376ad4f664389bb8a59dd6887ab7 Mon Sep 17 00:00:00 2001
From: David Disseldorp <ddiss@samba.org>
Date: Thu, 27 Sep 2012 12:34:53 +0200
Subject: vfs: check full_audit enum->str mapping on startup

Signed-off-by: Jim McDonough <jmcd@samba.org>

Autobuild-User(master): David Disseldorp <ddiss@samba.org>
Autobuild-Date(master): Fri Sep 28 19:28:49 CEST 2012 on sn-devel-104
---
 source3/modules/vfs_full_audit.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'source3/modules/vfs_full_audit.c')

diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c
index 5c5f91cfd0..6050c55027 100644
--- a/source3/modules/vfs_full_audit.c
+++ b/source3/modules/vfs_full_audit.c
@@ -203,7 +203,7 @@ typedef enum _vfs_op_type {
 	SMB_VFS_OP_LAST
 } vfs_op_type;
 
-/* The following array *must* be in the same order as defined in vfs.h */
+/* The following array *must* be in the same order as defined in vfs_op_type */
 
 static struct {
 	vfs_op_type type;
@@ -444,9 +444,10 @@ static struct bitmap *init_bitmap(TALLOC_CTX *mem_ctx, const char **ops)
 		}
 
 		for (i=0; i<SMB_VFS_OP_LAST; i++) {
-			if (vfs_op_names[i].name == NULL) {
+			if ((vfs_op_names[i].name == NULL)
+			 || (vfs_op_names[i].type != i)) {
 				smb_panic("vfs_full_audit.c: name table not "
-					  "in sync with vfs.h\n");
+					  "in sync with vfs_op_type enums\n");
 			}
 			if (strequal(op, vfs_op_names[i].name)) {
 				if (neg) {
-- 
cgit