Pre-loading makes no sense in inetd mode
authorJamie Cameron <jcameron@webmin.com>
Sun, 28 Jun 2009 17:52:16 +0000 (17:52 +0000)
committerJamie Cameron <jcameron@webmin.com>
Sun, 28 Jun 2009 17:52:16 +0000 (17:52 +0000)
miniserv.pl

index cccbc08..067900e 100755 (executable)
@@ -287,31 +287,33 @@ if ($config{'extauth'}) {
        }
 
 # Pre-load any libraries
-foreach $pl (split(/\s+/, $config{'preload'})) {
-       ($pkg, $lib) = split(/=/, $pl);
-       $pkg =~ s/[^A-Za-z0-9]/_/g;
-       eval "package $pkg; do '$config{'root'}/$lib'";
-       if ($@) {
-               print STDERR "Failed to pre-load $lib in $pkg : $@\n";
-               }
-       else {
-               print STDERR "Pre-loaded $lib in $pkg\n";
-               }
-       }
-foreach $pl (split(/\s+/, $config{'premodules'})) {
-       if ($pl =~ /\//) {
-               ($dir, $mod) = split(/\//, $pl);
-               }
-       else {
-               ($dir, $mod) = (undef, $pl);
-               }
-       push(@INC, "$config{'root'}/$dir");
-       eval "package $mod; use $mod ()";
-       if ($@) {
-               print STDERR "Failed to pre-load $mod : $@\n";
+if (!$config{'inetd'}) {
+       foreach $pl (split(/\s+/, $config{'preload'})) {
+               ($pkg, $lib) = split(/=/, $pl);
+               $pkg =~ s/[^A-Za-z0-9]/_/g;
+               eval "package $pkg; do '$config{'root'}/$lib'";
+               if ($@) {
+                       print STDERR "Failed to pre-load $lib in $pkg : $@\n";
+                       }
+               else {
+                       print STDERR "Pre-loaded $lib in $pkg\n";
+                       }
                }
-       else {
-               print STDERR "Pre-loaded $mod\n";
+       foreach $pl (split(/\s+/, $config{'premodules'})) {
+               if ($pl =~ /\//) {
+                       ($dir, $mod) = split(/\//, $pl);
+                       }
+               else {
+                       ($dir, $mod) = (undef, $pl);
+                       }
+               push(@INC, "$config{'root'}/$dir");
+               eval "package $mod; use $mod ()";
+               if ($@) {
+                       print STDERR "Failed to pre-load $mod : $@\n";
+                       }
+               else {
+                       print STDERR "Pre-loaded $mod\n";
+                       }
                }
        }