summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2007-05-03 11:08:44 +0000
committerroot <root@bc3d92e2-beff-0310-a7cd-cc87d7ac0ede>2007-05-03 11:08:44 +0000
commit3a500543eda93bfe54bb578976d20c86e2d55ac1 (patch)
tree4119572a35912397d32e56943b2dfc8765d2b322 /bin
parentfc887d26c72348a4f494b5d43af66244c725ce67 (diff)
protect a block with an if
git-svn-id: svn+ssh://asteria.noreply.org/svn/weaselutils/trunk@268 bc3d92e2-beff-0310-a7cd-cc87d7ac0ede
Diffstat (limited to 'bin')
-rwxr-xr-xbin/ldap2apache18
1 files changed, 10 insertions, 8 deletions
diff --git a/bin/ldap2apache b/bin/ldap2apache
index 51f1207..ff15a5c 100755
--- a/bin/ldap2apache
+++ b/bin/ldap2apache
@@ -405,15 +405,17 @@ phpwrapperfiles.each_pair do |dirname, wrappers|
phpwrapperfilesdirectories[dirname] = true
end
-Dir.entries( @phpwrapperfilesdir ).each do |e|
- next if ((e =~ /^\./) != nil)
- next if phpwrapperfilesdirectories.has_key?( e )
- Dir.entries( @phpwrapperfilesdir+'/'+e ).each do |e2|
- next if ((e2 =~ /^\./) != nil) and File.directory?(@phpwrapperfilesdir+'/'+e+'/'+e2)
- File.unlink( @phpwrapperfilesdir+'/'+e+'/'+e2 )
+if @phpwrapperfilesdir
+ Dir.entries( @phpwrapperfilesdir ).each do |e|
+ next if ((e =~ /^\./) != nil)
+ next if phpwrapperfilesdirectories.has_key?( e )
+ Dir.entries( @phpwrapperfilesdir+'/'+e ).each do |e2|
+ next if ((e2 =~ /^\./) != nil) and File.directory?(@phpwrapperfilesdir+'/'+e+'/'+e2)
+ File.unlink( @phpwrapperfilesdir+'/'+e+'/'+e2 )
+ end
+ Dir.rmdir( @phpwrapperfilesdir+'/'+e )
+ need_reload = true
end
- Dir.rmdir( @phpwrapperfilesdir+'/'+e )
- need_reload = true
end
if need_restart