Only in edit/etc/defaults: twiki.system-config.CYGWIN_NT-5.0 diff --recursive -u orig/lib/adm/integrateWithApache.pl edit/lib/adm/integrateWithApache.pl --- orig/lib/adm/integrateWithApache.pl 2003-07-18 18:17:10.000000000 -0700 +++ edit/lib/adm/integrateWithApache.pl 2003-07-21 23:18:40.000000000 -0700 @@ -33,7 +33,7 @@ sub getServerUserGroup { my %LocalVars = @_; - my $User = `grep ^User $LocalVars{HTTPDCONF} | cut -d' ' -f2`; + my $User = `grep '^User ' $LocalVars{HTTPDCONF} | cut -d' ' -f2`; my $Group =`grep ^Group $LocalVars{HTTPDCONF} | cut -d' ' -f2`; $User =~ s/\n//g; $Group =~ s/\n//g; @@ -97,13 +97,6 @@ system("chmod >/dev/null 2>&1 700 TWikiDocumentation.html TWikiHistory.html index.html readme.txt"); } -sub getServerUserGroup { - my %LocalVars = @_; - my $User = `grep ^User $LocalVars{HTTPDCONF} | cut -d' ' -f2`; $User =~ s/\n//g; - my $Group =`grep ^Group $LocalVars{HTTPDCONF} | cut -d' ' -f2`; $Group =~ s/\n//g; - return ($User, $Group); -} - sub readApacheConfig { my %LocalVars = @_; my @lines;