geos_one/CASA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Finished modifications to allow CASA-auth-token to build under

Browse Source 
autobuild.
This commit is contained in:
Juan Carlos Luciani
2006-06-27 16:15:30 +00:00
parent 17bb9006f4
commit d79d97b8d3
14 changed files with 337 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
CASA-auth-token/server/ApacheSupport/2.2/linux/Makefile.am
View File

@@ -33,10 +33,11 @@ DIST_SUBDIRS =
ROOT = ../../../..
CASAINCLUDE = ../../../../../CASA/include
LIBDIR = $(ROOT)/$(LIB)
APACHEROOT = ../../../../../../apache2.2
APACHEINCLUDE = /usr/include/apache2
APACHELIB = /usr/lib/apache2
APRINCLUDE = /usr/include/apr-1
APRLIB = /usr/lib/apr-1
# handle Mono secondary dependencies
export MONO_PATH := $(MONO_PATH)
@@ -50,13 +51,13 @@ MODULE_EXT = so
CFILES = ../mod_authn_casa.c
CSFILES_CSC :=
INCLUDES = -I. -I$(CASAINCLUDE) -I$(ROOT)/include -I$(APACHEROOT)/include
INCLUDES = -I. -I$(ROOT)/include -I$(APACHEINCLUDE) -I$(APRINCLUDE)
RESOURCES =
DEFINES = -Wno-format-extra-args -fno-strict-aliasing
CFLAGS += $(INCLUDES) $(DEFINES) -D_LARGEFILE64_SOURCE
LIBS = -lpthread -lcasa_s_authtoken -lapr-1 -laprutil-1
LDFLAGS = -Bsymbolic -shared -Wl,-soname=$(MODULE_NAME).$(MODULE_EXT) -L$(LIBDIR)/$(TARGET_CFG) -L$(APACHEROOT)/lib -Xlinker -rpath -Xlinker /opt/novell/CASA/lib
LDFLAGS = -Bsymbolic -shared -Wl,-soname=$(MODULE_NAME).$(MODULE_EXT) -L$(LIBDIR)/$(TARGET_CFG) -L$(APACHELIB) -L$(APRLIB) -Xlinker -rpath -Xlinker /opt/novell/CASA/lib
OBJDIR = ./$(TARGET_CFG)/$(LIB)
OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o))

11
CASA-auth-token/server/AuthTokenSvc/Makefile.am
View File

@@ -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

1
CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/CasaIdentityToken.java
View File

@@ -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);

4
CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Krb5Authenticate.java
View File

@@ -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";
}
}
}

4
CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Makefile.am
View File

@@ -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:

4
CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/PwdAuthenticate.java
View File

@@ -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";
}
}
}

2
CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/linux/Makefile.am
View File

@@ -31,7 +31,7 @@ SUBDIRS =
DIST_SUBDIRS =
ROOT = ../../../../../..
ROOT = ../../../../..
CASAINCLUDE = ../../../../../../CASA/include

2
CASA-auth-token/server/PamSupport/linux/Makefile.am
View File

@@ -55,7 +55,7 @@ DEFINES = -Wno-format-extra-args -fno-strict-aliasing
CFLAGS += $(INCLUDES) $(DEFINES)
LIBS = -lpthread -lpam -lcasa_s_authtoken
LDFLAGS = -Bsymbolic -shared -Wl,-soname=$(MODULE_NAME).$(MODULE_EXT) -L$(LIBDIR)/$(TARGET_CFG) -Xlinker -rpath
LDFLAGS = -Bsymbolic -shared -Wl,-soname=$(MODULE_NAME).$(MODULE_EXT) -L$(LIBDIR)/$(TARGET_CFG)
OBJDIR = ./$(TARGET_CFG)/$(LIB)
OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o))