RenJuan
/
DRDE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*

This commit is contained in:
Ren RenJuan 2014-01-17 16:51:06 +00:00
parent 318ea42bba
commit 421309132b
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
APIG/client/commander.cpp
View File

@ -237,6 +237,8 @@ void mdCommander::driver() {
thisConfig->terminateRequest = true; thisConfig->terminateRequest = true;
sprintf(work,"kill -9 %d",thisConfig->daemonProcess); sprintf(work,"kill -9 %d",thisConfig->daemonProcess);
system(work); system(work);
sprintf(work,"rm /dev/shm/ausreg-cd-global");
system(work);
goto done; goto done;
} }
continue; continue;

8
AusRegCliever/Makefile
View File

@ -1,6 +1,6 @@
#LOCATION=DEBIAN_7 LOCATION=DEBIAN_7
ARTKENABLED=132 ARTKENABLED=132
LOCATION=DEBIAN_6 #LOCATION=DEBIAN_6
#LOCATION=OSX_10_8 #LOCATION=OSX_10_8
# #
# Add other locations and move target differences into the macros as needed, # Add other locations and move target differences into the macros as needed,
@ -25,12 +25,12 @@ ifeq ($(LOCATION),DEBIAN_6)
ARTKLIB=-L/home/jdaugherty/dnseppus/ACTK1_0/lib ARTKLIB=-L/home/jdaugherty/dnseppus/ACTK1_0/lib
ARTKINCL=-I/home/jdaugherty/dnseppus/ACTK1_0 ARTKINCL=-I/home/jdaugherty/dnseppus/ACTK1_0
endif endif
ifeq ($(LOCATION),OSX_10_8) ifeq ($(LOCATION),OSX_10_8)
ARTKLIB=-L/Users/juand/dnseppus/ACTK1_0/lib ARTKLIB=-L/Users/juand/dnseppus/ACTK1_0/lib
ARTKINCL=-I/Users/juand/dnseppus/ACTK1_0 ARTKINCL=-I/Users/juand/dnseppus/ACTK1_0
endif endif
ifeq ($(LOCATION),DEBIAN_7) ifeq ($(LOCATION),DEBIAN_7)
ifneq ($(ARTKENABLED),0) ifneq ($(ARTKENABLED),0)
XALAN_LIB_DIR = /usr/local/lib XALAN_LIB_DIR = /usr/local/lib
@ -41,6 +41,7 @@ XERCES_LIB = xerces-c
XERCES_INC_DIR = /usr/local/include/xercesc/ XERCES_INC_DIR = /usr/local/include/xercesc/
endif endif
endif endif
ifeq ($(LOCATION),DEBIAN_6) ifeq ($(LOCATION),DEBIAN_6)
XALAN_LIB_DIR = /usr/lib/ XALAN_LIB_DIR = /usr/lib/
XALAN_LIB = xalan-c XALAN_LIB = xalan-c
@ -49,6 +50,7 @@ XERCES_LIB_DIR = /usr/lib/
XERCES_LIB = xerces-c XERCES_LIB = xerces-c
XERCES_INC_DIR = /usr/include/xercesc/ XERCES_INC_DIR = /usr/include/xercesc/
endif endif
ifeq ($(LOCATION),OSX_10_8) ifeq ($(LOCATION),OSX_10_8)
XALAN_LIB_DIR = /opt/local/lib/ XALAN_LIB_DIR = /opt/local/lib/
XALAN_LIB = xalan-c XALAN_LIB = xalan-c

4
AusRegCliever/server/cliever-md.cpp
View File

@ -111,7 +111,7 @@ main(int const argc,
mdOrAC = (strcspn(argv[0],"./") == strlen(argv[0])) ? argv[0] : strrchr(argv[0],'/') + 1; mdOrAC = (strcspn(argv[0],"./") == strlen(argv[0])) ? argv[0] : strrchr(argv[0],'/') + 1;
mdHasEPPTk = strstr(argv[0],"ausreg-md") ? false : true; mdHasEPPTk = strstr(argv[0],"ausreg-md") ? false : true;
thisConfig->tkScenario = 1;
if (argc < 3 || argc > 7) usage(); if (argc < 3 || argc > 7) usage();
@ -147,7 +147,7 @@ main(int const argc,
} }
else else
if (!strncmp(argv[mthParm],"tk=",2)) { if (!strncmp(argv[mthParm],"tk=",2)) {
c = (char *)&argv[mthParm][3]; c = (char *)argv[mthParm]+3;
thisConfig->tkScenario = atoi(c); thisConfig->tkScenario = atoi(c);
} }
else else

4
AusRegCliever/server/masterDaemon.cpp
View File

@ -132,8 +132,8 @@ int masterDaemon::initAusRegTK(void) {
try { try {
theseLogs->logN(0,"Attaching AusRegistry EPP Toolkit 1.3.2 at tkScenario %d.", theseLogs->logN(2,"Attaching AusRegistry EPP Toolkit %d at tkScenario %d.",
thisConfig->tkScenario); ARTKENABLED, thisConfig->tkScenario);
artk = new ausRegEPPTK(); artk = new ausRegEPPTK();
if (!artk->doNothing(cfg)) { if (!artk->doNothing(cfg)) {