Remove non working SSH1 checkbox.
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 12 Mar 2010 19:58:46 +0000 (20:58 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 14 Mar 2010 10:39:58 +0000 (11:39 +0100)
html/cgi-bin/remote.cgi
src/misc-progs/sshctrl.c

index 4d6eb19..9737b07 100644 (file)
@@ -37,7 +37,6 @@ my $counter = 0;
 &Header::showhttpheaders();
 
 $remotesettings{'ENABLE_SSH'} = 'off';
-$remotesettings{'ENABLE_SSH_PORTOCOL1'} = 'off';
 $remotesettings{'ENABLE_SSH_PORTFW'} = 'off';
 $remotesettings{'ACTION'} = '';
 &Header::getcgihash(\%remotesettings);
@@ -65,15 +64,6 @@ if ( (($remotesettings{'ACTION'} eq $Lang::tr{'save'}) || ($remotesettings{'ACTI
                &General::log($Lang::tr{'ssh is disabled'});
                unlink "${General::swroot}/remote/enablessh";
        }
-
-       if ($remotesettings{'ENABLE_SSH_PORTOCOL1'} eq 'on')
-       {
-               &General::log($Lang::tr{'ssh1 enabled'});
-       }
-       else
-       {
-               &General::log($Lang::tr{'ssh1 disabled'});
-       }
        
        if ($remotesettings{'SSH_PORT'} eq 'on')
        {
@@ -111,9 +101,6 @@ else {
 $checked{'ENABLE_SSH'}{'off'} = '';
 $checked{'ENABLE_SSH'}{'on'} = '';
 $checked{'ENABLE_SSH'}{$remotesettings{'ENABLE_SSH'}} = "checked='checked'";
-$checked{'ENABLE_SSH_PORTOCOL1'}{'off'} = '';
-$checked{'ENABLE_SSH_PORTOCOL1'}{'on'} = '';
-$checked{'ENABLE_SSH_PORTOCOL1'}{$remotesettings{'ENABLE_SSH_PORTOCOL1'}} = "checked='checked'";
 $checked{'ENABLE_SSH_PORTFW'}{'off'} = '';
 $checked{'ENABLE_SSH_PORTFW'}{'on'} = '';
 $checked{'ENABLE_SSH_PORTFW'}{$remotesettings{'ENABLE_SSH_PORTFW'}} = "checked='checked'";
@@ -146,11 +133,6 @@ print <<END
        <td><input type='checkbox' name='ENABLE_SSH' $checked{'ENABLE_SSH'}{'on'} /></td>
        <td class='base' colspan='2'>$Lang::tr{'ssh access'}</td>
 </tr>
-<tr>
-       <td>&nbsp;</td>
-       <td><input type='checkbox' name='ENABLE_SSH_PORTOCOL1' $checked{'ENABLE_SSH_PORTOCOL1'}{'on'} /></td>
-       <td width='100%' class='base'>$Lang::tr{'ssh1 support'}</td>
-</tr>
 <tr>
        <td>&nbsp;</td>
        <td><input type='checkbox' name='ENABLE_SSH_PORTFW' $checked{'ENABLE_SSH_PORTFW'}{'on'} /></td>
index 0bdc583..3007497 100644 (file)
@@ -54,10 +54,7 @@ int main(int argc, char *argv[])
                                                exit(1);
                                }
 
-                               if(findkey(kv, "ENABLE_SSH_PROTOCOL1", buffer) && !strcmp(buffer,"on"))
-                                               strlcat(command, "s/^Protocol .*$/Protocol 2,1/;", STRING_SIZE - 1 );
-                               else
-                                               strlcat(command, "s/^Protocol .*$/Protocol 2/;", STRING_SIZE - 1 );
+                               strlcat(command, "s/^Protocol .*$/Protocol 2/;", STRING_SIZE - 1 );
 
                                if(findkey(kv, "ENABLE_SSH_KEYS", buffer) && !strcmp(buffer,"off"))
                                                strlcat(command, "s/^RSAAuthentication .*$/RSAAuthentication no/;"              "s/^PubkeyAuthentication .*$/PubkeyAuthentication no/;", STRING_SIZE - 1 );