Repository: karaf Updated Branches: refs/heads/karaf-2.x 71bd2c545 -> 6d88fd32b
[KARAF-2914]JAAS JDBCBackingEngineFactory: Wrong user query from the configuration (cherry picked from commit 732e9bd17fa1dc046aa9575040ec9d3a7c924171) Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/6d88fd32 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/6d88fd32 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/6d88fd32 Branch: refs/heads/karaf-2.x Commit: 6d88fd32b745e60785567379743484bd5efe1f4c Parents: 71bd2c5 Author: Freeman Fang <[email protected]> Authored: Wed Apr 16 10:07:47 2014 +0800 Committer: Freeman Fang <[email protected]> Committed: Wed Apr 16 10:09:58 2014 +0800 ---------------------------------------------------------------------- .../apache/karaf/jaas/modules/jdbc/JDBCBackingEngineFactory.java | 2 +- .../java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/6d88fd32/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngineFactory.java ---------------------------------------------------------------------- diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngineFactory.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngineFactory.java index e863d5f..5631d1b 100644 --- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngineFactory.java +++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngineFactory.java @@ -45,7 +45,7 @@ public class JDBCBackingEngineFactory implements BackingEngineFactory { String deleteRoleStatement = (String) options.get(JDBCLoginModule.DELETE_ROLE_STATEMENT); String deleteAllUserRolesStatement = (String) options.get(JDBCLoginModule.DELETE_ROLES_STATEMENT); String deleteUserStatement = (String) options.get(JDBCLoginModule.DELETE_USER_STATEMENT); - String selectUsersQuery = (String) options.get(JDBCLoginModule.PASSWORD_QUERY); + String selectUsersQuery = (String) options.get(JDBCLoginModule.USER_QUERY); String selectRolesQuery = (String) options.get(JDBCLoginModule.ROLE_QUERY); try { http://git-wip-us.apache.org/repos/asf/karaf/blob/6d88fd32/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java ---------------------------------------------------------------------- diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java index b6c9d02..4377104 100644 --- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java +++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java @@ -41,6 +41,7 @@ public class JDBCLoginModule extends AbstractKarafLoginModule { private final Logger logger = LoggerFactory.getLogger(PropertiesLoginModule.class); public static final String PASSWORD_QUERY = "query.password"; + public static final String USER_QUERY = "query.user"; public static final String ROLE_QUERY = "query.role"; public static final String INSERT_USER_STATEMENT = "insert.user"; public static final String INSERT_ROLE_STATEMENT = "insert.role";
