Description: Adds support for specifying hostnames in policy rules
Origin: debian, unknown
Forwarded: no

Index: tripwire-2.4.2/src/fs/fsparserutil.cpp
===================================================================
--- tripwire-2.4.2.orig/src/fs/fsparserutil.cpp	2010-06-28 13:12:12.822527740 +0200
+++ tripwire-2.4.2/src/fs/fsparserutil.cpp	2010-06-28 13:12:46.853530264 +0200
@@ -168,6 +168,19 @@
         sName  = TSS_GetString( cFS, fs::STR_PARSER_DEVICE );
         sValue = TSS_GetString( cFS, fs::STR_FS_PARSER_DEVICE_VAL );
         return true;
+    case 6:
+        sName  = TSS_GetString( cFS, fs::STR_PARSER_HOSTNAME );
+        try
+        {
+			iFSServices::GetInstance()->GetMachineName( sValue);
+			if (sValue.empty())
+				sValue = TSS_GetString( cFS, fs::STR_FS_PARSER_HOSTNAME_VAL );
+        }
+        catch( eFSServices& )
+        {
+			sValue = TSS_GetString( cFS, fs::STR_FS_PARSER_HOSTNAME_VAL );
+        }
+        return true;
     default:
         return false;
     }
Index: tripwire-2.4.2/src/fs/fsstrings.cpp
===================================================================
--- tripwire-2.4.2.orig/src/fs/fsstrings.cpp	2010-06-28 13:12:18.810530044 +0200
+++ tripwire-2.4.2/src/fs/fsstrings.cpp	2010-06-28 13:12:54.521615246 +0200
@@ -99,6 +99,7 @@
     TSS_StringEntry( fs::STR_PARSER_IGNOREALL,	        _T("IgnoreAll")),
     TSS_StringEntry( fs::STR_PARSER_IGNORENONE,         _T("IgnoreNone")),
     TSS_StringEntry( fs::STR_PARSER_DEVICE,	            _T("Device")),
+    TSS_StringEntry( fs::STR_PARSER_HOSTNAME,	            _T("HOSTNAME")),
 
     TSS_StringEntry( fs::STR_FS_PARSER_READONLY_VAL,    _T("+pinugsmtdbCM-raclSH" ) ),
     TSS_StringEntry( fs::STR_FS_PARSER_DYNAMIC_VAL,	    _T("+pinugtd-rsacmblCMSH" ) ),
@@ -106,6 +107,7 @@
     TSS_StringEntry( fs::STR_FS_PARSER_IGNOREALL_VAL,	_T("-pinusgamctdrblCMSH" ) ),
     TSS_StringEntry( fs::STR_FS_PARSER_IGNORENONE_VAL,	_T("+pinusgamctdrbCMSH-l" ) ),
     TSS_StringEntry( fs::STR_FS_PARSER_DEVICE_VAL,	    _T("+pugsdr-intlbamcCMSH" ) ),
+    TSS_StringEntry( fs::STR_FS_PARSER_HOSTNAME_VAL,	    _T("localhost" ) ),
     
 	TSS_StringEntry( fs::STR_DIFFERENT_FILESYSTEM,      _T("The object: \"%s\" is on a different file system...ignoring.\n") ),
 
Index: tripwire-2.4.2/src/fs/fsstrings.h
===================================================================
--- tripwire-2.4.2.orig/src/fs/fsstrings.h	2010-06-28 13:12:25.197535788 +0200
+++ tripwire-2.4.2/src/fs/fsstrings.h	2010-06-28 13:13:29.845633116 +0200
@@ -102,13 +102,15 @@
     STR_PARSER_IGNOREALL,
     STR_PARSER_IGNORENONE,
     STR_PARSER_DEVICE,
+    STR_PARSER_HOSTNAME,
     
     STR_FS_PARSER_READONLY_VAL,
     STR_FS_PARSER_DYNAMIC_VAL,
     STR_FS_PARSER_GROWING_VAL,
     STR_FS_PARSER_IGNOREALL_VAL,
     STR_FS_PARSER_IGNORENONE_VAL,
-    STR_FS_PARSER_DEVICE_VAL,    
+    STR_FS_PARSER_DEVICE_VAL,
+    STR_FS_PARSER_HOSTNAME_VAL,
     
 	STR_DIFFERENT_FILESYSTEM
 
