You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2014/04/16 04:09:46 UTC
git commit: [KARAF-2914]JAAS JDBCBackingEngineFactory: Wrong user
query from the configuration (cherry picked from commit
732e9bd17fa1dc046aa9575040ec9d3a7c924171)
Repository: karaf
Updated Branches:
refs/heads/karaf-3.0.x bd0a2949f -> 9d51e3730
[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/9d51e373
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/9d51e373
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/9d51e373
Branch: refs/heads/karaf-3.0.x
Commit: 9d51e3730eda4a5cbab27aa566fba6f2a560f7a3
Parents: bd0a294
Author: Freeman Fang <fr...@gmail.com>
Authored: Wed Apr 16 10:07:47 2014 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Wed Apr 16 10:09:35 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/9d51e373/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 ee99641..f6d1e7e 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
@@ -46,7 +46,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/9d51e373/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 87cd799..ea81859 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 static final transient 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";