This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via 701b39d86e73ac50c5ee9593ded41656a4b5a26a (commit) from 842ed1fd21551de2332a86274b069b963c701eb3 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 701b39d86e73ac50c5ee9593ded41656a4b5a26a Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Mar 12 20:58:46 2010 +0100

Remove non working SSH1 checkbox.

-----------------------------------------------------------------------

Summary of changes: html/cgi-bin/remote.cgi | 18 ------------------ src/misc-progs/sshctrl.c | 5 +---- 2 files changed, 1 insertions(+), 22 deletions(-)

Difference in files: diff --git a/html/cgi-bin/remote.cgi b/html/cgi-bin/remote.cgi index 4d6eb19..9737b07 100644 --- a/html/cgi-bin/remote.cgi +++ b/html/cgi-bin/remote.cgi @@ -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'"; @@ -148,11 +135,6 @@ print <<END </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> <td width='100%' class='base'>$Lang::tr{'ssh portfw'}</td> </tr> diff --git a/src/misc-progs/sshctrl.c b/src/misc-progs/sshctrl.c index 0bdc583..3007497 100644 --- a/src/misc-progs/sshctrl.c +++ b/src/misc-progs/sshctrl.c @@ -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 );

hooks/post-receive -- IPFire 2.x development tree