--- rpms/e-smith-base/sme8/e-smith-base-4.18.1-add2general.patch	2008/07/04 21:59:38	1.6
+++ rpms/e-smith-base/sme8/e-smith-base-4.18.1-add2general.patch	2008/08/04 20:04:32	1.8
@@ -245,7 +245,7 @@ diff -Nur -x '*.orig' -x '*.rej' e-smith
      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 {
@@ -263,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 = (
@@ -274,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 )
@@ -311,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";
  }
@@ -320,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";
  }
@@ -469,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");
@@ -487,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";
  }