version 1.369, 2007/04/04 00:02:50
|
version 1.372, 2007/04/04 00:49:13
|
Line 4619 sub inst_usertypes_handler {
|
Line 4619 sub inst_usertypes_handler {
|
my ($cmd, $domain, $client) = @_; |
my ($cmd, $domain, $client) = @_; |
my $res; |
my $res; |
my $userinput = $cmd.":".$domain; # For logging purposes. |
my $userinput = $cmd.":".$domain; # For logging purposes. |
my (%typeshash,@order); |
my (%typeshash,@order,$result); |
if (&localenroll::inst_usertypes($domain,\%typeshash,\@order) eq 'ok') { |
eval { |
|
local($SIG{__DIE__})='DEFAULT'; |
|
$result=&localenroll::inst_usertypes($domain,\%typeshash,\@order); |
|
}; |
|
if ($result eq 'ok') { |
if (keys(%typeshash) > 0) { |
if (keys(%typeshash) > 0) { |
foreach my $key (keys(%typeshash)) { |
foreach my $key (keys(%typeshash)) { |
$res.=&escape($key).'='.&escape($typeshash{$key}).'&'; |
$res.=&escape($key).'='.&escape($typeshash{$key}).'&'; |
Line 5044 sub UpdateHosts {
|
Line 5048 sub UpdateHosts {
|
# either dropped or changed hosts. Note that the re-read of the table |
# either dropped or changed hosts. Note that the re-read of the table |
# will take care of new and changed hosts as connections come into being. |
# will take care of new and changed hosts as connections come into being. |
|
|
#FIXME need a way to tell lonnet that it needs to reset host |
&Apache::lonnet::reset_hosts_info(); |
#cached host info |
|
|
|
foreach my $child (keys(%children)) { |
foreach my $child (keys(%children)) { |
my $childip = $children{$child}; |
my $childip = $children{$child}; |
if (defined(&Apache::lonnet::get_hosts_from_ip($childip))) { |
if (!defined(&Apache::lonnet::get_hosts_from_ip($childip))) { |
logthis('<font color="blue"> UpdateHosts killing child ' |
logthis('<font color="blue"> UpdateHosts killing child ' |
." $child for ip $childip </font>"); |
." $child for ip $childip </font>"); |
kill('INT', $child); |
kill('INT', $child); |
Line 5367 sub make_new_child {
|
Line 5370 sub make_new_child {
|
# ----------------------------------------------------------------------------- |
# ----------------------------------------------------------------------------- |
# see if we know client and 'check' for spoof IP by ineffective challenge |
# see if we know client and 'check' for spoof IP by ineffective challenge |
|
|
ReadManagerTable; # May also be a manager!! |
|
|
|
my $outsideip=$clientip; |
my $outsideip=$clientip; |
if ($clientip eq '127.0.0.1') { |
if ($clientip eq '127.0.0.1') { |
$outsideip=&Apache::lonnet::get_host_ip($perlvar{'lonHostID'}); |
$outsideip=&Apache::lonnet::get_host_ip($perlvar{'lonHostID'}); |