Need to use socket at module level, for exports

diff --git a/WebminCore.pm b/WebminCore.pm
index 226df14..5d167ec 100644 (file)
--- a/WebminCore.pm
+++ b/WebminCore.pm
@@ -16,7 +16,6 @@ $main::export_to_caller = 1;
 package WebminCore;
 require Exporter;
 @ISA = qw(Exporter);
-use Socket;
 
 # Add functions in web-lib-funcs.pl
 # Generated with :

diff --git a/hpuxexports/hpuxexports-lib.pl b/hpuxexports/hpuxexports-lib.pl
index a40553d..20e7db8 100644 (file)
--- a/hpuxexports/hpuxexports-lib.pl
+++ b/hpuxexports/hpuxexports-lib.pl
@@ -4,6 +4,7 @@
 do '../web-lib.pl';
 &init_config();
 do '../ui-lib.pl';
+use Socket;
 
 # list_exports()
 # Return a list of all the directories currently being exported

diff --git a/servers/auto.pl b/servers/auto.pl
index 927811e..3273d52 100755 (executable)
--- a/servers/auto.pl
+++ b/servers/auto.pl
@@ -3,7 +3,6 @@
 
 $no_acl_check++;
 require './servers-lib.pl';
-use Socket;
 &foreign_require("mailboxes", "mailboxes-lib.pl");
 &foreign_require("net", "net-lib.pl");
 

diff --git a/servers/find.cgi b/servers/find.cgi
index e91f1cf..eaee02e 100755 (executable)
--- a/servers/find.cgi
+++ b/servers/find.cgi
@@ -5,7 +5,6 @@
 require './servers-lib.pl';
 &ReadParse();
 $access{'find'} || &error($text{'find_ecannot'});
-use Socket;
 
 if (defined($in{'scan'})) {
        # send to all addresses on the given network

diff --git a/servers/servers-lib.pl b/servers/servers-lib.pl
index ea8a898..7a7a0a4 100644 (file)
--- a/servers/servers-lib.pl
+++ b/servers/servers-lib.pl
@@ -18,6 +18,7 @@ for RPC operations. Example code :
 
 BEGIN { push(@INC, ".."); };
 use WebminCore;
+use Socket;
 &init_config();
 %access = &get_module_acl();
 $cron_cmd = "$module_config_directory/auto.pl";

diff --git a/status/status-lib.pl b/status/status-lib.pl
index 70ed895..6d6603b 100644 (file)
--- a/status/status-lib.pl
+++ b/status/status-lib.pl
@@ -5,6 +5,7 @@ BEGIN { push(@INC, ".."); };
 use WebminCore;
 &init_config();
 %access = &get_module_acl();
+use Socket;
 
 $services_dir = "$module_config_directory/services";
 $cron_cmd = "$module_config_directory/monitor.pl";

diff --git a/webmin/change_access.cgi b/webmin/change_access.cgi
index d4bab8f..f005bdd 100755 (executable)
--- a/webmin/change_access.cgi
+++ b/webmin/change_access.cgi
@@ -3,7 +3,6 @@
 # Update IP allow and deny parameters
 
 require './webmin-lib.pl';
-use Socket;
 &ReadParse();
 &error_setup($text{'access_err'});
 

diff --git a/webmin/change_bind.cgi b/webmin/change_bind.cgi
index a961dc1..2657d35 100755 (executable)
--- a/webmin/change_bind.cgi
+++ b/webmin/change_bind.cgi
@@ -3,7 +3,6 @@
 # Update the binding IP address and port for miniserv
 
 require './webmin-lib.pl';
-use Socket;
 &ReadParse();
 &get_miniserv_config(\%miniserv);
 %oldminiserv = %miniserv;

diff --git a/webmin/webmin-lib.pl b/webmin/webmin-lib.pl
index 8df671e..87084c6 100644 (file)
--- a/webmin/webmin-lib.pl
+++ b/webmin/webmin-lib.pl
@@ -8,6 +8,7 @@ BEGIN { push(@INC, ".."); };
 use WebminCore;
 &init_config();
 do './gnupg-lib.pl';
+use Socket;
 
 @cs_codes = ( 'cs_page', 'cs_text', 'cs_table', 'cs_header', 'cs_link' );
 @cs_names = map { $text{$_} } @cs_codes;

diff --git a/zones/forms-lib.pl b/zones/forms-lib.pl
index 56f3e40..cc4fd2e 100644 (file)
--- a/zones/forms-lib.pl
+++ b/zones/forms-lib.pl
@@ -1,4 +1,5 @@
 use Webmin::All;
+use Socket;
 
 # get_zone_form(&in, &zinfo)
 # Returns a form for editing a zone