增加增强数值扫描功能及对应测试用例

增加changelog到rpm包
2020-08-18 16:56:31 +08:00
parent 3791c9426e
commit 0c694b5f98
13 changed files with 158 additions and 35 deletions
--- a/src/entry/Maat_command.cpp
+++ b/src/entry/Maat_command.cpp
@@ -161,7 +161,14 @@ enum MAAT_TABLE_TYPE type_region2table(const struct Maat_region_t* p)
 			}
 			break;
 		case REGION_INTERVAL:
-			ret=TABLE_TYPE_INTERVAL;
+			if(p->interval_rule.district==NULL)
+			{
+				ret=TABLE_TYPE_INTERVAL;
+			}
+			else
+			{
+				ret=TABLE_TYPE_INTERVAL_PLUS;
+			}
 			break;
 		case REGION_DIGEST:
 			ret=TABLE_TYPE_DIGEST;
@@ -203,6 +210,9 @@ int get_valid_flag_offset(const char* line, enum MAAT_TABLE_TYPE type,int valid_
 		case	TABLE_TYPE_INTERVAL:
 			column_seq=5;
 			break;
+		case	TABLE_TYPE_INTERVAL_PLUS:
+			column_seq=6;
+			break;
 		case	TABLE_TYPE_DIGEST:
 			column_seq=6;
 			break;