UPD: clean up/document/beatufy testcases.

[gigi.git] / src / org / cacert / gigi / dbObjects / User.java

diff --git a/src/org/cacert/gigi/dbObjects/User.java b/src/org/cacert/gigi/dbObjects/User.java
index 23636a919382af0a64136587e6f239c30fc80077..412f02ca601f42b6e29b2a0fbcc0425a4548d041 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/User.java
+++ b/src/org/cacert/gigi/dbObjects/User.java
@@ -141,9 +141,7 @@ public class User extends CertificateOwner {
         ps = DatabaseConnection.getInstance().prepare("UPDATE users SET `password`=? WHERE id=?");
         ps.setString(1, PasswordHash.hash(newPass));
         ps.setInt(2, getId());
-        if (ps.executeUpdate() != 1) {
-            throw new GigiApiException("Password update failed.");
-        }
+        ps.executeUpdate();
     }
 
     public void setName(Name name) {
@@ -470,7 +468,7 @@ public class User extends CertificateOwner {
             return getAssurancePoints() > 50 && isInGroup(Group.getByString("codesigning"));
         case 3:
         case 4:
-            return false; // has an orga
+            return getOrganisations().size() > 0;
         default:
             return false;
         }