Patch for bug 143490: eliminate unsupported calls from checksetup.pl when…

checksetup.pl

@@ -452,13 +452,19 @@ $index_html = 0;
 END
 
 if (!LocalVarExists('mysqlpath')) {
-    my $mysql_binaries = `which mysql`;
+    my $mysql_binaries;
+    if ($^O !~ /MSWin32/i) {
+        $mysql_binaries = `which mysql`;
         if ($mysql_binaries =~ /no mysql/ || $mysql_binaries eq '') {
             # If which didn't find it, just provide a reasonable default
             $mysql_binaries = "/usr/bin";
         } else {
             $mysql_binaries =~ s:/mysql\n$::;
         }
+    } else {
+        # provide a reasonable default for Windows
+        $mysql_binaries = 'c:\mysql\bin';
+    }    
     
     LocalVar('mysqlpath', <<"END");
 #
@@ -467,19 +473,24 @@ if (!LocalVarExists('mysqlpath')) {
 # Because it's possible that these files aren't in your path, you can specify
 # their location here.
 # Please specify only the directory name, with no trailing slash.
-\$mysqlpath = "$mysql_binaries";
+\$mysqlpath = '$mysql_binaries';
 END
 }
 
 
 if (!LocalVarExists('cvsbin')) {
-    my $cvs_executable = `which cvs`;
+    my $cvs_executable;
+    if ($^O !~ /MSWin32/i) {
+        $cvs_executable = `which cvs`;
         if ($cvs_executable =~ /no cvs/ || $cvs_executable eq '') {
             # If which didn't find it, just set to blank
             $cvs_executable = "";
         } else {
             chomp $cvs_executable;
         }
+    } else {
+        $cvs_executable = "";
+    }
 
     LocalVar('cvsbin', <<"END");
 #
@@ -493,7 +504,9 @@ END
 
 
 if (!LocalVarExists('interdiffbin')) {
-    my $interdiff_executable = `which interdiff`;
+    my $interdiff_executable;
+    if ($^O !~ /MSWin32/i) {
+        $interdiff_executable = `which interdiff`;
         if ($interdiff_executable =~ /no interdiff/ || $interdiff_executable eq '') {
             if (!$silent) {
                 print "\nOPTIONAL NOTE: If you want to ";
@@ -508,6 +521,9 @@ if (!LocalVarExists('interdiffbin')) {
         } else {
             chomp $interdiff_executable;
         }
+    } else {
+        $interdiff_executable = "";
+    }
 
     LocalVar('interdiffbin', <<"END");
 
@@ -522,13 +538,18 @@ END
 
 
 if (!LocalVarExists('diffpath')) {
-    my $diff_binaries = `which diff`;
+    my $diff_binaries;
+    if ($^O !~ /MSWin32/i) {
+        $diff_binaries = `which diff`;
         if ($diff_binaries =~ /no diff/ || $diff_binaries eq '') {
             # If which didn't find it, set to blank
             $diff_binaries = "";
         } else {
             $diff_binaries =~ s:/diff\n$::;
         }
+    } else {
+        $diff_binaries = "";
+    }
 
     LocalVar('diffpath', <<"END");
 
@@ -556,8 +577,14 @@ LocalVar('create_htaccess', <<'END');
 $create_htaccess = 1;
 END
 
+my $webservergroup_default;
+if ($^O !~ /MSWin32/i) {
+    $webservergroup_default = 'nobody';
+} else {
+    $webservergroup_default = '';
+}
 
-LocalVar('webservergroup', '
+LocalVar('webservergroup', <<"END");
 #
 # This is the group your web server runs on.
 # If you have a windows box, ignore this setting.
@@ -569,8 +596,8 @@ LocalVar('webservergroup', '
 # and you cannot set this up any other way. YOU HAVE BEEN WARNED.
 # If you set this to anything besides "", you will need to run checksetup.pl
 # as root, or as a user who is a member of the specified group.
-$webservergroup = "nobody";
-');
+\$webservergroup = "$webservergroup_default";
+END
 
 
 
@@ -745,6 +772,20 @@ see below are caused by this.
 
 EOF
     }
+
+    if ($^O =~ /MSWin32/i) {
+        print <<EOF;
+      
+Warning: You have set webservergroup in your localconfig.
+Please understand that this does not bring you any security when
+running under Windows.
+Verify that the file permissions in your Bugzilla directory are
+suitable for your system.
+Avoid unnecessary write access.
+
+EOF
+    }
+
 } else {
     # Theres no webservergroup, this is very very very very bad.
     # However, if we're being run on windows, then this option doesn't
@@ -1249,7 +1290,8 @@ sub fixPerms {
     }
 }
 
-if ($my_webservergroup) {
+if ($^O !~ /MSWin32/i) {
+    if ($my_webservergroup) {
         # Funny! getgrname returns the GID if fed with NAME ...
         my $webservergid = getgrnam($my_webservergroup) 
         or die("no such group: $my_webservergroup");
@@ -1278,7 +1320,7 @@ if ($my_webservergroup) {
         chmod 0771, $datadir;
         chown $<, $webservergid, 'graphs';
         chmod 0770, 'graphs';
-} else {
+    } else {
         # get current gid from $( list
         my $gid = (split " ", $()[0];
         fixPerms('.htaccess', $<, $gid, 022); # glob('*') doesn't catch dotfiles
@@ -1302,6 +1344,7 @@ if ($my_webservergroup) {
         chmod 0777, $datadir;
         chown $<, $gid, 'graphs';
         chmod 01777, 'graphs';
+    }
 }
 
 ###########################################################################
@@ -3877,7 +3920,9 @@ if (!GroupDoesExist("canconfirm")) {
 
 
 sub bailout {   # this is just in case we get interrupted while getting passwd
+    if ($^O !~ /MSWin32/i) {
         system("stty","echo"); # re-enable input echoing
+    }
     exit 1;
 }
 
@@ -4028,7 +4073,9 @@ if ($sth->rows == 0) {
     $SIG{QUIT} = \&bailout;
     $SIG{TERM} = \&bailout;
 
+    if ($^O !~ /MSWin32/i) {
         system("stty","-echo");  # disable input echoing
+    }
 
     while( $pass1 ne $pass2 ) {
       while( $pass1 eq "" || $pass1 !~ /^[[:print:]]{3,16}$/ ) {
@@ -4060,7 +4107,10 @@ if ($sth->rows == 0) {
     # Crypt the administrator's password
     my $cryptedpassword = Crypt($pass1);
 
+    if ($^O !~ /MSWin32/i) {
         system("stty","echo"); # re-enable input echoing
+    }
+
     $SIG{HUP}  = 'DEFAULT'; # and remove our interrupt hooks
     $SIG{INT}  = 'DEFAULT';
     $SIG{QUIT} = 'DEFAULT';