3 files changed, 11 insertions, 26 deletions
diff --git a/src/YalpAuth/YalpPGSqlAuth/PGSqlAuth.java b/src/YalpAuth/YalpPGSqlAuth/PGSqlAuth.java
index 6b6dd56..ba88ad4 100644
--- a/src/YalpAuth/YalpPGSqlAuth/PGSqlAuth.java
+++ b/src/YalpAuth/YalpPGSqlAuth/PGSqlAuth.java
@@ -92,16 +92,10 @@ public class PGSqlAuth {
 			NameComponent path[] = ncRef.to_name(name);
 			ncRef.rebind(path, authPlugin);
 
+			PluginInfoHolder tmp = new PluginInfoHolder(pluginInfo);
 			srvCon.ping(err);
 			System.out.println(err.value.descr);
-
-			PluginInfoHolder tmp = new PluginInfoHolder(pluginInfo);
-			MediaType ms[] = new MediaType[1];
-			ms[0] = MediaType.OTHER;
-			AccessInfo ai = new AccessInfo("", "", "", "", AccessType.UNKNOWN_INFO);
-			tmp.value.supportedTypes = ms;
-			tmp.value.access = ai;
-			srvCon.registerAuthPlugin(authPlugin, tmp, err);
+			srvCon.registerAuthPlugin(authPlugin, tmp, err );
 			pluginInfo = tmp.value;
 
 			if(err.value.code != YalpErrorCode.OK)
diff --git a/src/YalpAuth/YalpPGSqlAuth/YalpAuthPluginImpl.java b/src/YalpAuth/YalpPGSqlAuth/YalpAuthPluginImpl.java
index 3124845..d7c7a21 100644
--- a/src/YalpAuth/YalpPGSqlAuth/YalpAuthPluginImpl.java
+++ b/src/YalpAuth/YalpPGSqlAuth/YalpAuthPluginImpl.java
@@ -93,40 +93,31 @@ public class YalpAuthPluginImpl extends AuthPluginInterfacePOA{
 		YalpError error = new YalpError ("auth ok", YalpErrorCode.OK,
 			YalpErrorLevel.ERROR_LEVEL_INFO, "authentication module working");
 
-		try {
-			String query = "select * from \"Users\" where \"name\" = '"+username+"' and \"passwd\" = '"+passwd+"';";
-
-			ResultSet result = stat.executeQuery(query);
+		try{
+			ResultSet result=stat.executeQuery("select * from \"user\" where \"username\" = '"+username+"' and \"passwd\" = '"+passwd+"';");
 
 			if (result.next()){
-				if (result.getInt(1)>1)
+				if (result.getBoolean(5)==true)
 				{
-					user.value = new YalpUser
-						(666, username, "real name", AccessRights.ADMIN);
+					user.value.level = AccessRights.ADMIN;
 					err.value = error;
 					return;
 				}
 				else
 				{
-					user.value = new YalpUser
-						(666, username, "real name", AccessRights.USER);
+					user.value.level = AccessRights.USER;
 					err.value = error;
 					return;
 				}
 			}
 			else
 			{
-					user.value = new YalpUser
-						(666, username, "real name", AccessRights.DENY);
+				user.value.level = AccessRights.DENY;
 				err.value = error;
 				return;
 			}
-
-		} catch (SQLException e){
-			System.out.println("SQL ExceptioN!\n");
-			e.printStackTrace();
-			user.value = new YalpUser
-				(666, username, "real name", AccessRights.DENY);
+		}catch (SQLException e){
+			user.value.level = AccessRights.DENY;
 			error.code = YalpErrorCode.ERROR_SQL;
 			error.msg = "failed to send auth request to pgsql db";
 			error.level = YalpErrorLevel.ERROR_LEVEL_ERROR;
diff --git a/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java b/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java
index d497c3d..676fe3c 100644
--- a/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java
+++ b/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java
@@ -22,7 +22,7 @@ import YalpInterfaces.*;
  */
 
 public class YalpPGSqlAuth {
-	private YalpAuthPluginImpl con;
+	private YalpAuthInterfaceImpl con;
 	private DatabaseDefines config;
 
 	public static void main(String[] args)