summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2012-08-21 23:50:01 +0200
committerMichael Tänzer <neo@nhng.de>2012-08-21 23:50:01 +0200
commit31fe41cd72d1a7d34a98cac8cf9122874ad07b2f (patch)
tree20c975867ecd469c2e54f4b408954416477dc100 /includes
parent9980ce2f4458dd6957aaa81fe84f1be6be80a508 (diff)
parenta980e8aa7a6c3612fb884a051cc8125b3e4811d3 (diff)
downloadcacert-devel-31fe41cd72d1a7d34a98cac8cf9122874ad07b2f.tar.gz
cacert-devel-31fe41cd72d1a7d34a98cac8cf9122874ad07b2f.tar.xz
cacert-devel-31fe41cd72d1a7d34a98cac8cf9122874ad07b2f.zip
Merge tarballs into release
File permission conflict in scripts/resetpermissions.php Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'includes')
-rw-r--r--includes/general.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/includes/general.php b/includes/general.php
index 9e2b131..3478dd4 100644
--- a/includes/general.php
+++ b/includes/general.php
@@ -215,7 +215,8 @@
//echo "Points due to name matches: $points<br/>";
- $do = `grep '$pwd' /usr/share/dict/american-english`;
+ $shellpwd = escapeshellarg($pwd);
+ $do = `grep $shellpwd /usr/share/dict/american-english`;
if($do)
$points--;