Merge remote branch 'origin/master' into topic/policy-scripts-new

This commit is contained in:
Seth Hall 2011-06-03 07:38:28 -04:00
commit fbf207deda
19 changed files with 192 additions and 105 deletions

View file

@ -557,7 +557,7 @@ static int load_files_with_prefix(const char* orig_file)
else
strcpy(new_filename, file);
f = search_for_file(new_filename, "bro", &full_filename);
f = search_for_file(new_filename, "bro", &full_filename, true);
delete [] new_filename;
}