Continue AuthToken development changes.
This commit is contained in:
		| @@ -40,7 +40,9 @@ ROOT = ../../../.. | ||||
|  | ||||
| LIBDIR = $(ROOT)/$(LIB) | ||||
| BINDIR = $(ROOT)/$(BIN) | ||||
| JAVA_LIBDIR = /usr/lib/jvm/java-1.5.0-sun-1.5.0_07/jre/lib/i386/server | ||||
| #JAVA_LIBDIR = /usr/lib/jvm/java-1.5.0-sun-1.5.0_07/jre/lib/i386/server | ||||
| JAVA_LIBDIR = /usr/lib/jvm/jre-1.5.0-sun/lib/$(HOSTTYPE)/server | ||||
| JAVA_INCDIR = /usr/lib/jvm/java-1.5.0-sun/include | ||||
|  | ||||
| # handle Mono secondary dependencies | ||||
| export MONO_PATH := $(MONO_PATH) | ||||
| @@ -52,18 +54,18 @@ CFILES = | ||||
| CPPFILES = server.cpp | ||||
|  | ||||
| CSFILES_CSC := | ||||
| INCLUDES = -I. -I$(ROOT)/include | ||||
| INCLUDES = -I. -I$(ROOT)/include -I$(JAVA_INCDIR) -I$(JAVA_INCDIR)/linux | ||||
| RESOURCES = | ||||
| DEFINES += -Wno-format-extra-args -fno-strict-aliasing -fshort-wchar  | ||||
| CFLAGS += $(INCLUDES) $(DEFINES) | ||||
| CPPFLAGS += -fPIC $(INCLUDES) $(DEFINES) | ||||
| CPPFLAGS += -fPIC $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) | ||||
| LIBS = -lpthread -lcasa_s_ipc -ljvm | ||||
| LDFLAGS = -L$(LIBDIR)/$(TARGET_CFG) -L$(JAVA_LIBDIR) | ||||
| LDFLAGS = -L$(LIBDIR)/$(TARGET_CFG) -L$(JAVA_LIBDIR) -Xlinker -rpath -Xlinker $(JAVA_LIBDIR) | ||||
|  | ||||
| OBJDIR = ./$(TARGET_CFG)/$(LIB) | ||||
| OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o)) $(addprefix $(OBJDIR)/, $(CPPFILES:%.cpp=%.o)) | ||||
|  | ||||
| EXTRA_DIST = $(CFILES) *.h | ||||
| EXTRA_DIST = $(CFILES) $(CPPFILES) *.h | ||||
|  | ||||
| CUR_DIR := $(shell pwd) | ||||
|  | ||||
|   | ||||
| @@ -36,7 +36,7 @@ | ||||
|  | ||||
| #define MAXFD 64 | ||||
|  | ||||
| #define DOMAIN_SOCKET_FILE_NAME "/var/CASA/authtoken/validate/socket" | ||||
| #define DOMAIN_SOCKET_FILE_NAME "/var/lib/CASA/authtoken/validate/socket" | ||||
|  | ||||
| //===[ Type definitions ]================================================== | ||||
|  | ||||
| @@ -617,7 +617,7 @@ childContinue: | ||||
|    UseSyslog = true; | ||||
|  | ||||
|    // Change the working directory | ||||
|    chdir("/var/CASA/authtoken/validate"); | ||||
|    chdir("/var/lib/CASA/authtoken/validate"); | ||||
|  | ||||
|    // Clear our file mode creation mask | ||||
|    umask(0); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user