From 45ad90d75d375f1e12d18f146a625142fe38e497 Mon Sep 17 00:00:00 2001 From: div0 Date: Mon, 14 Dec 2009 15:58:24 +0000 Subject: [PATCH] factor out the hardcoded ACL git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8393 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/common/mapinfo.qc | 12 ++---------- data/qcsrc/common/mapinfo.qh | 3 +++ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/data/qcsrc/common/mapinfo.qc b/data/qcsrc/common/mapinfo.qc index a1609f6a3..7057dcf63 100644 --- a/data/qcsrc/common/mapinfo.qc +++ b/data/qcsrc/common/mapinfo.qc @@ -553,15 +553,7 @@ void _MapInfo_Parse_Settemp(string pFilename, string acl, float type, string s, print("Map ", pFilename, " contains a potentially harmful setting, ignored\n"); else if not (cvar_value_issafe(s)) print("Map ", pFilename, " contains a potentially harmful setting, ignored\n"); - else if(substring(t, 0, 10) == "g_mapinfo_") - print("Map ", pFilename, " contains a potentially harmful setting, ignored\n"); - else if(substring(t, 0, 5) == "rcon_") - print("Map ", pFilename, " contains a potentially harmful setting, ignored\n"); - else if(substring(t, 0, 8) == "settemp_") - print("Map ", pFilename, " contains a potentially harmful setting, ignored\n"); - else if(substring(t, 0, 1) == "_") - print("Map ", pFilename, " contains a potentially harmful setting, ignored\n"); - else if(substring(t, 0, 5) == "g_ban") + else if(matchacl(MAPINFO_SETTEMP_ACL_SYSTEM, t) <= 0) print("Map ", pFilename, " contains a potentially harmful setting, ignored\n"); else if(matchacl(acl, t) <= 0) print("Map ", pFilename, " contains a denied setting, ignored\n"); @@ -594,7 +586,7 @@ float MapInfo_Get_ByName(string pFilename, float pAllowGenerate, float pGametype float r, f, n, i; string acl; - acl = cvar_string("g_mapinfo_settemp_acl"); + acl = MAPINFO_SETTEMP_ACL_USER; if(strstrofs(pFilename, "/", 0) >= 0) { diff --git a/data/qcsrc/common/mapinfo.qh b/data/qcsrc/common/mapinfo.qh index a8cd7a2b9..11096ea34 100644 --- a/data/qcsrc/common/mapinfo.qh +++ b/data/qcsrc/common/mapinfo.qh @@ -82,3 +82,6 @@ void MapInfo_Cache_Invalidate(); // delete cache if any, but keep enabled void MapInfo_ClearTemps(); // call this when done with mapinfo for this frame void MapInfo_Shutdown(); // call this in the shutdown handler + +#define MAPINFO_SETTEMP_ACL_USER cvar_string("g_mapinfo_settemp_acl") +#define MAPINFO_SETTEMP_ACL_SYSTEM "-g_mapinfo_* -rcon_* -settemp_* -_* -g_ban* +*" -- 2.39.2