--- rpms/e-smith-base/sme8/e-smith-base-4.18.1-add2general.patch	2008/04/27 16:56:42	1.3
+++ rpms/e-smith-base/sme8/e-smith-base-4.18.1-add2general.patch	2008/08/04 20:04:32	1.8
@@ -242,11 +242,10 @@ diff -Nur -x '*.orig' -x '*.rej' e-smith
 +          . $fm->localise("GROUP_ADD")
            . "</a></p>"));
  
--    if ( $numGroups == 0 ) {
-+    if ( $numGROUPS == 0 ) {
+     if ( $numGroups == 0 ) {
          print $q->Tr($q->td(
 -	    '<p><b>' . $fm->localise("NO_GROUPS") . '</p></b>'));
-+	    '<p><b>' . $fm->localise("ACCOUNT_GROUP_NONE") . '</p></b>'));
++	    '<p><b>' . $fm->localise("NO_GROUPS") . '</p></b>'));
  
      }
      else {
@@ -264,7 +263,7 @@ diff -Nur -x '*.orig' -x '*.rej' e-smith
  	off => $self->localise('NO_ACCESS'),
      ); 
  
-@@ -306,14 +306,14 @@
+@@ -306,8 +306,8 @@
      return '' unless $db->get('ftp');
  
      my %options = (
@@ -275,14 +274,6 @@ diff -Nur -x '*.orig' -x '*.rej' e-smith
  	off => $self->localise('NO_ACCESS'),
      ); 
  
-     my %loginOptions = (
--	private => $self->localise('PASSWORD_LOGIN_PRIVATE'),
--	public  => $self->localise('PASSWORD_LOGIN_PUBLIC'),
-+	private => $self->localise('PASSWORD_LOGIN_NETWORKS_ALLOW_LOCAL'),
-+	public  => $self->localise('PASSWORD_LOGIN_NETWORKS_ALLOW_PUBLIC'),
-     );
- 
-     print $q->Tr(
 @@ -721,7 +721,7 @@
  
      unless ( system( "/sbin/e-smith/signal-event", "remoteaccess-update" ) == 0 )
@@ -312,7 +303,7 @@ diff -Nur -x '*.orig' -x '*.rej' e-smith
      unless ($pass1 eq $pass2) {
          $self->{cgi}->param( -name => 'wherenext', -value => 'Password' );
 -        return "PASSWORD_VERIFY_ERROR";
-+        return "PASSWORD_NO_MATCH";
++        return "PASSWORD_VERIFY_ERROR";
      }
      return "OK";
  }
@@ -321,7 +312,7 @@ diff -Nur -x '*.orig' -x '*.rej' e-smith
      unless ($pass1 eq $pass2) {
          $self->{cgi}->param( -name => 'wherenext', -value => 'Password' );
 -        return "SYSTEM_PASSWORD_VERIFY_ERROR";
-+        return "SYSTEM_PASSWORD_NO_MATCH";
++        return "SYSTEM_PASSWORD_VERIFY_ERROR";
      }
      return "OK";
  }
@@ -470,7 +461,7 @@ diff -Nur -x '*.orig' -x '*.rej' e-smith
      {
  	$q->param(-name => 'status_message', 
 -		    -value => 'PASSWORD_CHANGE_FAILURE');
-+		    -value => 'ERROR_PASSWORD_CHANGE');
++		    -value => 'PASSWORD_CHANGE_ERROR');
  	return;
      }
      $acct->set_prop("PasswordSet", "yes");
@@ -488,7 +479,7 @@ diff -Nur -x '*.orig' -x '*.rej' e-smith
      	unless ($pass1 eq $pass2) {
      		$fm->{cgi}->param( -name => 'wherenext', -value => 'Password' );
 -       	 	return "PASSWORD_VERIFY_ERROR";
-+       	 	return "PASSWORD_NO_MATCH";
++       	 	return "PASSWORD_VERIFY_ERROR";
      	}
          return "OK";
  }
@@ -522,3 +513,14 @@ diff -Nur -x '*.orig' -x '*.rej' e-smith
      </page>
      <page name="Done" pre-event="print_status_message()">
      </page>
+--- e-smith-base-4.18.1/root/etc/e-smith/web/functions/remoteaccess.add2general2	2008-07-04 23:13:37.000000000 +0200
++++ e-smith-base-4.18.1/root/etc/e-smith/web/functions/remoteaccess	2008-07-04 23:13:37.000000000 +0200
+@@ -132,7 +132,7 @@
+         
+         <field type="select" 
+             id="sshAccess" 
+-            options=" 'off' => 'NO_ACCESS', 'private' => 'PRIVATE', 'public' => 'PUBLIC'"
++            options=" 'off' => 'NO_ACCESS', 'private' => 'NETWORKS_ALLOW_LOCAL', 'public' => 'NETWORKS_ALLOW_PUBLIC'"
+             value="get_ssh_access()">
+             <label>LABEL_SSH</label>
+             <description>DESC_SSH</description>