mirror of
				https://github.com/xcat2/xcat-core.git
				synced 2025-11-03 21:02:34 +00:00 
			
		
		
		
	fix for defect 3985
This commit is contained in:
		@@ -63,7 +63,7 @@ sub preprocess_request
 | 
			
		||||
    my @ents = xCAT::TableUtils->get_site_attribute("sharedtftp");
 | 
			
		||||
    my $site_ent = $ents[0];
 | 
			
		||||
    unless (  defined($site_ent)
 | 
			
		||||
            and ($site_ent =~ /no/i or $site_ent =~ /0/))
 | 
			
		||||
            and ($site_ent eq "no" or $site_ent eq "NO"  or $site_ent eq "0"))
 | 
			
		||||
    {
 | 
			
		||||
 | 
			
		||||
        #unless requesting no sharedtftp, don't make hierarchical call
 | 
			
		||||
 
 | 
			
		||||
@@ -75,9 +75,9 @@ sub preprocess_request
 | 
			
		||||
    my $stab = xCAT::Table->new('site');
 | 
			
		||||
    my $sent;
 | 
			
		||||
    ($sent) = $stab->getAttribs({key => 'sharedtftp'}, 'value');
 | 
			
		||||
    unless (    $sent
 | 
			
		||||
            and defined($sent->{value})
 | 
			
		||||
            and ($sent->{value} =~ /no/i or $sent->{value} =~ /0/))
 | 
			
		||||
    unless ( $sent
 | 
			
		||||
        and defined($sent->{value})
 | 
			
		||||
            and ($sent->{value} eq "no" or $sent->{value} eq "NO" or $sent->{value} eq "0"))
 | 
			
		||||
    {
 | 
			
		||||
 | 
			
		||||
        #unless requesting no sharedtftp, don't make hierarchical call
 | 
			
		||||
 
 | 
			
		||||
@@ -328,7 +328,7 @@ sub preprocess_request {
 | 
			
		||||
   #my $sent = $stab->getAttribs({key=>'sharedtftp'},'value');
 | 
			
		||||
   my @entries =  xCAT::TableUtils->get_site_attribute("sharedtftp");
 | 
			
		||||
   my $t_entry = $entries[0];
 | 
			
		||||
   if ( defined($t_entry) and ($t_entry == 0 or $t_entry =~ /no/i)) {
 | 
			
		||||
   if ( defined($t_entry)  and ($t_entry eq "0" or $t_entry eq "no" or $t_entry eq "NO")) {
 | 
			
		||||
      # check for  computenodes and servicenodes from the noderange, if so error out
 | 
			
		||||
      my @SN;
 | 
			
		||||
      my @CN;
 | 
			
		||||
 
 | 
			
		||||
@@ -68,9 +68,10 @@ sub preprocess_request
 | 
			
		||||
    my @entries =  xCAT::TableUtils->get_site_attribute("sharedtftp");
 | 
			
		||||
    my $t_entry = $entries[0];
 | 
			
		||||
    unless (  defined($t_entry)
 | 
			
		||||
            and ($t_entry =~ /no/i or $t_entry =~ /0/))
 | 
			
		||||
            and ($t_entry eq "no" or $t_entry eq "NO"  or $t_entry eq "0"))
 | 
			
		||||
    {
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        #unless requesting no sharedtftp, don't make hierarchical call
 | 
			
		||||
        return [$req];
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
@@ -260,7 +260,7 @@ sub preprocess_request {
 | 
			
		||||
 | 
			
		||||
   my @entries =  xCAT::TableUtils->get_site_attribute("sharedtftp");
 | 
			
		||||
   my $t_entry = $entries[0];
 | 
			
		||||
   if ( defined($t_entry) and ($t_entry == 0 or $t_entry =~ /no/i)) {
 | 
			
		||||
   if ( defined($t_entry)  and ($t_entry eq "0" or $t_entry eq "no" or $t_entry eq "NO")) {
 | 
			
		||||
      # check for  computenodes and servicenodes from the noderange, if so error out
 | 
			
		||||
      my @SN;
 | 
			
		||||
      my @CN;
 | 
			
		||||
 
 | 
			
		||||
@@ -348,7 +348,7 @@ sub preprocess_request {
 | 
			
		||||
   #they specify no sharedtftp in site table
 | 
			
		||||
   my @entries =  xCAT::TableUtils->get_site_attribute("sharedtftp");
 | 
			
		||||
   my $t_entry = $entries[0];
 | 
			
		||||
   if ( defined($t_entry) and ($t_entry == 0 or $t_entry =~ /no/i)) {
 | 
			
		||||
   if ( defined($t_entry)  and ($t_entry eq "0" or $t_entry eq "no" or $t_entry eq "NO")) {
 | 
			
		||||
      # check for  computenodes and servicenodes from the noderange, if so error out
 | 
			
		||||
      my @SN;
 | 
			
		||||
      my @CN;
 | 
			
		||||
 
 | 
			
		||||
@@ -379,7 +379,8 @@ sub preprocess_request {
 | 
			
		||||
   #if they specify no sharedtftp in site table
 | 
			
		||||
   my @entries =  xCAT::TableUtils->get_site_attribute("sharedtftp");
 | 
			
		||||
   my $t_entry = $entries[0];
 | 
			
		||||
   if ( defined($t_entry)  and ($t_entry == 0 or $t_entry =~ /no/i)) {
 | 
			
		||||
   
 | 
			
		||||
   if ( defined($t_entry)  and ($t_entry eq "0" or $t_entry eq "no" or $t_entry eq "NO")) {
 | 
			
		||||
      # check for  computenodes and servicenodes from the noderange, if so error out
 | 
			
		||||
      my @SN;
 | 
			
		||||
      my @CN;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user