[GATE-181] Fixed stupid error with permissions checking.

Changed condition returns to be more appropriate.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk/src/plugins/gateway@7080 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/wildfire/gateway/BaseTransport.java

@@ -614,7 +614,7 @@ public abstract class BaseTransport implements Component, RosterEventListener {
                     // User does not have permission to register with transport.
                     // We want to allow them to change settings if they are already registered.
                     IQ result = IQ.createResultIQ(packet);
-                    result.setError(Condition.bad_request);
+                    result.setError(Condition.forbidden);
                     reply.add(result);
                     Message em = new Message();
                     em.setType(Message.Type.error);
@@ -675,7 +675,7 @@ public abstract class BaseTransport implements Component, RosterEventListener {
                     catch (UserNotFoundException e) {
                         Log.error("Someone attempted to register with the gateway who is not registered with the server: " + from);
                         IQ eresult = IQ.createResultIQ(packet);
-                        eresult.setError(Condition.bad_request);
+                        eresult.setError(Condition.forbidden);
                         reply.add(eresult);
                         Message em = new Message();
                         em.setType(Message.Type.error);
@@ -687,7 +687,7 @@ public abstract class BaseTransport implements Component, RosterEventListener {
                     catch (IllegalAccessException e) {
                         Log.error("Someone who is not a user of this server tried to register with the transport: "+from);
                         IQ eresult = IQ.createResultIQ(packet);
-                        eresult.setError(Condition.not_allowed);
+                        eresult.setError(Condition.forbidden);
                         reply.add(eresult);
                         Message em = new Message();
                         em.setType(Message.Type.error);
@@ -730,7 +730,7 @@ public abstract class BaseTransport implements Component, RosterEventListener {
                 if (!registered && !permissionManager.hasAccess(from)) {
                     // User does not have permission to register with transport.
                     // We want to allow them to change settings if they are already registered.
-                    result.setError(Condition.bad_request);
+                    result.setError(Condition.forbidden);
                     reply.add(result);
                     Message em = new Message();
                     em.setType(Message.Type.error);

src/java/org/jivesoftware/wildfire/gateway/PermissionManager.java

@@ -97,7 +97,7 @@ public class PermissionManager {
             pstmt.setString(2, jid.getNode());
             rs = pstmt.executeQuery();
             rs.next();
-            return (rs.getInt(1) > 1);
+            return (rs.getInt(1) > 0);
         }
         catch (SQLException sqle) {
             Log.error(sqle);