Finished modifications to allow CASA-auth-token to build under
autobuild.
This commit is contained in:
@@ -22,14 +22,19 @@
|
||||
SUBDIRS = src
|
||||
DIST_SUBDIRS = src
|
||||
|
||||
EXTRA_DIST =
|
||||
EXTRA_DIST = authtoken.settings \
|
||||
identoken.settings \
|
||||
README \
|
||||
svc.settings \
|
||||
TODO \
|
||||
web.xml
|
||||
|
||||
ROOT = ../..
|
||||
|
||||
LIBDIR = $(ROOT)/$(LIB)
|
||||
|
||||
IDENT_ABSTRACTION_DIR = /home/jluciani/dev-local/bandit/trunk/IdentityAbstraction/build
|
||||
IDENT_ABSTRACTION_DEPENDANCIES_DIR = /home/jluciani/dev-local/bandit/trunk/commons/bin
|
||||
IDENT_ABSTRACTION_DIR = $(ROOT)/bandit/ia
|
||||
IDENT_ABSTRACTION_DEPENDANCIES_DIR = $(ROOT)/bandit/commons
|
||||
|
||||
JAVAROOT = .
|
||||
JAVAC= javac
|
||||
|
||||
@@ -553,7 +553,6 @@ public class CasaIdentityToken implements IdentityToken
|
||||
Hashtable env = new Hashtable();
|
||||
env.put(Context.INITIAL_CONTEXT_FACTORY, "org.bandit.ia.IAInitialCtxFactory");
|
||||
env.put(IAContext.IA_REALM_CONFIG_LOCATION, svcConfig.getSetting(SvcConfig.IdentityAbstractionConfigFile));
|
||||
env.put("java.naming.ldap.attributes.binary", "guid");
|
||||
env.put(IAContext.IA_REALM_SELECTOR, sourceName);
|
||||
|
||||
DirContext ctx = new InitialDirContext(env);
|
||||
|
||||
@@ -225,7 +225,7 @@ public class Krb5Authenticate implements AuthMechanism, Serializable
|
||||
SearchResult sr = (SearchResult)answer.next();
|
||||
if (searchContext.equals(""))
|
||||
{
|
||||
identId = sr.getName();
|
||||
identId = sr.getNameInNamespace();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -254,4 +254,4 @@ public class Krb5Authenticate implements AuthMechanism, Serializable
|
||||
{
|
||||
return "Krb5Authenticate";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -50,7 +50,9 @@ JAVAFILES = ProtoDefs.java \
|
||||
PwdAuthenticate.java \
|
||||
SessionToken.java
|
||||
|
||||
EXTRA_DIST = $(JAVAFILES)
|
||||
EXTRA_DIST = $(JAVAFILES) \
|
||||
Krb5_mechanism.settings \
|
||||
Pwd_mechanism.settings
|
||||
|
||||
.PHONY: package package-clean package-install package-uninstall
|
||||
package package-clean package-install package-uninstall:
|
||||
|
||||
@@ -176,7 +176,7 @@ public class PwdAuthenticate implements AuthMechanism, Serializable
|
||||
env2.put(IAContext.IA_REALM_CONFIG_LOCATION, m_svcConfig.getSetting(SvcConfig.IdentityAbstractionConfigFile));
|
||||
env2.put(IAContext.IA_REALM_SELECTOR, authReqMsg.getRealm());
|
||||
env2.put(Context.SECURITY_AUTHENTICATION, "simple");
|
||||
env2.put(Context.SECURITY_PRINCIPAL, sr.getName());
|
||||
env2.put(Context.SECURITY_PRINCIPAL, sr.getNameInNamespace());
|
||||
env2.put(Context.SECURITY_CREDENTIALS, pwToken.getPassword());
|
||||
|
||||
if ((new InitialDirContext(env2)) != null)
|
||||
@@ -220,4 +220,4 @@ public class PwdAuthenticate implements AuthMechanism, Serializable
|
||||
{
|
||||
return "PwdAuthenticate";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user