Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 157923 Details for
Bug 245665
dsalib still relies on server root
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
CVS Diffs - Second Pass
diffs.txt (text/plain), 21.76 KB, created by
Nathan Kinder
on 2007-06-26 17:51:14 UTC
(
hide
)
Description:
CVS Diffs - Second Pass
Filename:
MIME Type:
Creator:
Nathan Kinder
Created:
2007-06-26 17:51:14 UTC
Size:
21.76 KB
patch
obsolete
>Index: Makefile.am >=================================================================== >RCS file: /cvs/dirsec/adminserver/Makefile.am,v >retrieving revision 1.17 >diff -u -5 -t -r1.17 Makefile.am >--- Makefile.am 25 Jun 2007 23:23:10 -0000 1.17 >+++ Makefile.am 26 Jun 2007 17:37:37 -0000 >@@ -80,10 +80,11 @@ > modnssbindir = @modnssbindir@ > ldifdir = $(datadir)@ldifdir@ > admmoddir = $(libdir)@admmoddir@ > infdir = $(datadir)@infdir@ > perldir = $(libdir)@perldir@ >+dslibdir = @dslibdir@ > > libbase_a_SOURCES = lib/base/file.cpp lib/base/nscperror.c \ > lib/base/system.cpp lib/base/nscputil.cpp > > libsi18n_a_SOURCES = lib/libsi18n/coreres.c lib/libsi18n/getlang.c \ >@@ -106,11 +107,11 @@ > -DCMDBINDIR=\"$(cmdbindir)\" -DMANUALDIR=\"$(manualdir)\" \ > -DCONFIGDIR=\"$(configdir)\" -DSECURITYDIR=\"$(securitydir)\" \ > -DLOGDIR=\"$(logdir)\" -DHTTPD=\"$(HTTPD)\" -DDEFAULT_HTTPDUSER=\"$(httpduser)\" \ > -DPIDFILE=\"$(pidfile)\" -DDATADIR=\"$(datadir)\" -DLDIFDIR=\"$(ldifdir)\" \ > -DBUILD_NUM=$(BUILDNUM) -DINFDIR=\"$(infdir)\" -DCGIBINDIR=\"$(cgibindir)\" \ >- -DINSTCONFIGDIR=\"$(instconfigdir)\" >+ -DINSTCONFIGDIR=\"$(instconfigdir)\" -DDSLIBDIR=\"$(dslibdir)\" > > lib_LTLIBRARIES = libds-admin-serv.la > > noinst_LIBRARIES = libdsa.a > >Index: configure.ac >=================================================================== >RCS file: /cvs/dirsec/adminserver/configure.ac,v >retrieving revision 1.11 >diff -u -5 -t -r1.11 configure.ac >--- configure.ac 22 Jun 2007 01:34:18 -0000 1.11 >+++ configure.ac 26 Jun 2007 17:37:46 -0000 >@@ -204,10 +204,27 @@ > dnl this value is expanded out in Makefile.am > instconfigdir='$(sysconfdir)/$(PACKAGE_BASE_NAME)' > ]) > AC_SUBST(instconfigdir) > >+# check for --with-dslibdir >+AC_MSG_CHECKING(for --with-dslibdir) >+AC_ARG_WITH(dslibdir, >+ AS_HELP_STRING([--with-dslibdir=/path], >+ [Directory Server library directory (default $libdir/$PACKAGE_BASE_NAME)]), >+[ >+ if test $withval = yes ; then >+ AC_ERROR([Please specify a full path with --with-dslibdir]) >+ fi >+ dslibdir="$withval" >+], >+[ >+ dnl this value is expanded out in Makefile.am >+ dslibdir='$(libdir)/$(PACKAGE_BASE_NAME)' >+]) >+AC_SUBST(dslibdir) >+ > # CGI program directory, relative to libdir > cgibindir=/$PACKAGE_BASE_NAME/cgi-bin > > # cmdbindir is just sbindir > #cmdbindir=$libdir/$PKGNAME >Index: admserv/cgi-ds/ds_remove.c >=================================================================== >RCS file: /cvs/dirsec/adminserver/admserv/cgi-ds/ds_remove.c,v >retrieving revision 1.1 >diff -u -5 -t -r1.1 ds_remove.c >--- admserv/cgi-ds/ds_remove.c 13 Jun 2007 01:37:16 -0000 1.1 >+++ admserv/cgi-ds/ds_remove.c 26 Jun 2007 17:37:46 -0000 >@@ -136,11 +136,11 @@ > > int main(int argc, char *argv[]) > { > int status = -1; > char *servername; >- char *installroot; >+ char *instdir; > int isRunning; > #ifndef __LP64__ > #if defined(__hpux) && !defined(__ia64) > _main(); > #endif >@@ -214,27 +214,27 @@ > } > > if (servername) { > char line[1024]; > int busy_retries = 3; /* if busy, retry this many times */ >- installroot = ds_get_install_root(); >+ instdir = ds_get_instance_dir(); > /* We may get busy errors if files are in use when we try > to remove them, so if that happens, sleep for 30 seconds > and try again */ >- status = ds_rm_rf(installroot, rm_rf_err_func, NULL); >+ status = ds_rm_rf(instdir, rm_rf_err_func, NULL); > while (status && try_rm_rf_again && busy_retries) { > PR_snprintf(line, sizeof(line), "Some files or directories in %s are still in use. Will sleep for 30 seconds and try again.", >- installroot); >+ instdir); > ds_show_message(line); > PR_Sleep(PR_SecondsToInterval(30)); > try_rm_rf_again = 0; > --busy_retries; >- status = ds_rm_rf(installroot, rm_rf_err_func, NULL); >+ status = ds_rm_rf(instdir, rm_rf_err_func, NULL); > } > if (status) { > PR_snprintf(line, sizeof(line), "Could not remove %s. Please check log messages and try again.", >- installroot); >+ instdir); > ds_send_error(line, 0); > } > } > #ifdef XP_WIN32 > if (servername) { >Index: admserv/cgi-ds/ds_snmpctrl.c >=================================================================== >RCS file: /cvs/dirsec/adminserver/admserv/cgi-ds/ds_snmpctrl.c,v >retrieving revision 1.1 >diff -u -5 -t -r1.1 ds_snmpctrl.c >--- admserv/cgi-ds/ds_snmpctrl.c 13 Jun 2007 01:37:16 -0000 1.1 >+++ admserv/cgi-ds/ds_snmpctrl.c 26 Jun 2007 17:37:46 -0000 >@@ -128,11 +128,11 @@ > char path[PATH_MAX]; > FILE *fp; > > *pid = -1; > >- SLAPD_ROOT = ds_get_install_root(); >+ SLAPD_ROOT = ds_get_instance_dir(); > PR_snprintf(path, sizeof(path), "%s/logs/%s", SLAPD_ROOT, NSLDAPAGT_PID); > if (!ds_file_exists(path)) { > return(-1); > } > >@@ -277,11 +277,11 @@ > */ > if (!smux_master_is_running()) { > return(-1); > } else { > char *NETSITE_ROOT = getenv("NETSITE_ROOT"); >- char *SLAPD_ROOT = ds_get_install_root(); >+ char *SLAPD_ROOT = ds_get_instance_dir(); > char command[1024]; > > PR_snprintf(command, sizeof(command), "cd %s/%s; ./%s -d %s", NETSITE_ROOT, SUBAGT_PATH, > SUBAGT_NAME, SLAPD_ROOT); > >Index: include/libdsa/dsalib.h >=================================================================== >RCS file: /cvs/dirsec/adminserver/include/libdsa/dsalib.h,v >retrieving revision 1.2 >diff -u -5 -t -r1.2 dsalib.h >--- include/libdsa/dsalib.h 25 Jun 2007 23:23:12 -0000 1.2 >+++ include/libdsa/dsalib.h 26 Jun 2007 17:37:46 -0000 >@@ -176,11 +176,11 @@ > > /* > * Other return values > */ > #define DS_UNKNOWN_ERROR -1 >-#define DS_NO_SERVER_ROOT -10 >+#define DS_NO_INSTANCE_DIR -10 > #define DS_CANNOT_EXEC -11 > #define DS_CANNOT_OPEN_STAT_FILE -12 > #define DS_NULL_PARAMETER -13 > #define DS_SERVER_MUST_BE_DOWN -14 > #define DS_CANNOT_OPEN_BACKUP_FILE -15 >@@ -277,25 +277,23 @@ > #define DS_ROOTDN 11 > #define DS_ROOTPW 12 > #define DS_SUFFIX 13 > #define DS_LOCALUSER 14 > #define DS_BAKDIR 15 >-#define DS_RUNDIR 16 >-#define DS_TMPDIR 17 >-#define DS_CFG_MAX 18 /* MUST be one greater than the last option */ >+#define DS_TMPDIR 16 >+#define DS_CFG_MAX 17 /* MUST be one greater than the last option */ > > /* These control how long we wait for the server to start up or shutdown */ > #define SERVER_START_TIMEOUT 600 /* seconds */ > #define SERVER_STOP_TIMEOUT SERVER_START_TIMEOUT /* same as start timeout */ > > typedef int (*DS_RM_RF_ERR_FUNC)(const char *path, const char *op, void *arg); > > #ifdef __cplusplus > extern "C" { > #endif /* __cplusplus */ >-extern DS_EXPORT_SYMBOL char *ds_get_server_root(); >-extern DS_EXPORT_SYMBOL char *ds_get_install_root(); >+extern DS_EXPORT_SYMBOL char *ds_get_instance_dir(); > extern DS_EXPORT_SYMBOL char *ds_get_admserv_based_root(); > extern DS_EXPORT_SYMBOL void ds_log_debug_message(char *msg); > extern DS_EXPORT_SYMBOL void ds_log_env(char **envp); > extern DS_EXPORT_SYMBOL int ds_get_updown_status(); > extern DS_EXPORT_SYMBOL void ds_print_startstop(int stop); >Index: lib/libdsa/dsalib_conf.c >=================================================================== >RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_conf.c,v >retrieving revision 1.2 >diff -u -5 -t -r1.2 dsalib_conf.c >--- lib/libdsa/dsalib_conf.c 25 Jun 2007 23:23:12 -0000 1.2 >+++ lib/libdsa/dsalib_conf.c 26 Jun 2007 17:37:46 -0000 >@@ -121,11 +121,10 @@ > {"nsslapd-rootdn"}, > {"nsslapd-rootpwstoragescheme"}, > {"nsslapd-suffix"}, > {"nsslapd-localuser"}, > {"nsslapd-bakdir"}, >-{"nsslapd-lockdir"}, > {"nsslapd-tmpdir"}, > {0} > }; > > /* >Index: lib/libdsa/dsalib_db.c >=================================================================== >RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_db.c,v >retrieving revision 1.2 >diff -u -5 -t -r1.2 dsalib_db.c >--- lib/libdsa/dsalib_db.c 25 Jun 2007 23:23:12 -0000 1.2 >+++ lib/libdsa/dsalib_db.c 26 Jun 2007 17:37:46 -0000 >@@ -110,11 +110,11 @@ > ds_bak2db(char *file) > { > char startup_line[BIG_LINE]; > char statfile[PATH_MAX]; > char *tmp_dir; >- char *root; >+ char *instdir; > int haderror = 0; > int error = -1; > int status; > FILE *sf = NULL; > struct stat fstats; >@@ -124,12 +124,12 @@ > } > status = ds_get_updown_status(); > if ( status == DS_SERVER_UP ) { > return DS_SERVER_MUST_BE_DOWN; > } >- if ( (root = ds_get_install_root()) == NULL ) { >- return DS_NO_SERVER_ROOT; >+ if ( (instdir = ds_get_instance_dir()) == NULL ) { >+ return DS_NO_INSTANCE_DIR; > } > > if ( file[strlen(file) - 1] == '\n' ) /* strip out returns */ > file[strlen(file) - 1] = '\0'; > >@@ -143,11 +143,11 @@ > PR_snprintf(statfile, PATH_MAX, "%s%cbak2db.%d", tmp_dir, FILE_SEP, (int)getpid()); > PR_snprintf(startup_line, BIG_LINE, > "%s%cbak2db " > "%s%s%s > " > "%s%s%s 2>&1", >- root, FILE_SEP, >+ instdir, FILE_SEP, > ENQUOTE, file, ENQUOTE, > ENQUOTE, statfile, ENQUOTE ); > alter_startup_line(startup_line); > fflush(0); > error = system(startup_line); >@@ -187,21 +187,21 @@ > ds_db2bak(char *file) > { > char startup_line[BIG_LINE]; > char statfile[PATH_MAX]; > char *tmp_dir; >- char *root; >+ char *instdir; > int haderror = 0; > int error = -1; > FILE *sf = NULL; > int lite = 0; > #ifdef XP_WIN32 > time_t ltime; > #endif > >- if ( (root = ds_get_install_root()) == NULL ) { >- return DS_NO_SERVER_ROOT; >+ if ( (instdir = ds_get_instance_dir()) == NULL ) { >+ return DS_NO_INSTANCE_DIR; > } > > if ( (file == NULL) || (strlen(file) == 0) ) > file = NULL; > >@@ -243,11 +243,11 @@ > > PR_snprintf(startup_line, sizeof(startup_line), > "%s%cdb2bak " > "%s%s%s > " > "%s%s%s 2>&1", >- root, FILE_SEP, >+ instdir, FILE_SEP, > ENQUOTE, > (file == NULL) ? "" : file, > ENQUOTE, > ENQUOTE, statfile, ENQUOTE); > >@@ -345,26 +345,24 @@ > */ > DS_EXPORT_SYMBOL int > ds_vlvindex(char **backendList, char **vlvList) > { > char startup_line[BIG_LINE]; >- char *root; >- char *instroot; >+ char *instdir; > char **vlvc = NULL; > > >- root = ds_get_server_root(); >- instroot = ds_get_install_root(); >- if ( (root == NULL) || (instroot == NULL) ) { >- return DS_NO_SERVER_ROOT; >+ instdir = ds_get_instance_dir(); >+ if ( instdir == NULL ) { >+ return DS_NO_INSTANCE_DIR; > } > >- PR_snprintf(startup_line, sizeof(startup_line), "%s/bin/slapd/server/%s db2index " >+ PR_snprintf(startup_line, sizeof(startup_line), "%s/%s db2index " > "-D %s%s/%s " > "-n %s ", >- root, SLAPD_NAME, >- ENQUOTE, instroot, ENQUOTE, >+ CMDBINDIR, SLAPD_NAME, >+ ENQUOTE, instdir, ENQUOTE, > backendList[0]); > > > /* Create vlv TAG */ > vlvc=vlvList; >@@ -383,25 +381,23 @@ > */ > DS_EXPORT_SYMBOL int > ds_addindex(char **attrList, char *backendName) > { > char startup_line[BIG_LINE]; >- char *root; >- char *instroot; >+ char *instdir; > >- root = ds_get_server_root(); >- instroot = ds_get_install_root(); >+ instdir = ds_get_instance_dir(); > >- if ( (root == NULL) || (instroot == NULL) ) { >- return DS_NO_SERVER_ROOT; >+ if ( instdir == NULL ) { >+ return DS_NO_INSTANCE_DIR; > } > >- PR_snprintf(startup_line, sizeof(startup_line), "%s/bin/slapd/server/%s db2index " >+ PR_snprintf(startup_line, sizeof(startup_line), "%s/%s db2index " > "-D %s%s%s " > "-n %s", >- root, SLAPD_NAME, >- ENQUOTE, instroot, ENQUOTE, >+ CMDBINDIR, SLAPD_NAME, >+ ENQUOTE, instdir, ENQUOTE, > backendName); > > while( *attrList != NULL ) { > PR_snprintf( startup_line, sizeof(startup_line), "%s -t %s", startup_line, *attrList ); > attrList++; >Index: lib/libdsa/dsalib_ldif.c >=================================================================== >RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_ldif.c,v >retrieving revision 1.1 >diff -u -5 -t -r1.1 dsalib_ldif.c >--- lib/libdsa/dsalib_ldif.c 13 Jun 2007 01:37:17 -0000 1.1 >+++ lib/libdsa/dsalib_ldif.c 26 Jun 2007 17:37:46 -0000 >@@ -152,11 +152,11 @@ > */ > static int > importldif(char *file, int preserve, char *backend, char *subtree) > { > char startup_line[BIG_LINE]; >- char *root; >+ char *instdir; > int haderror = 0; > int i = 0, error = -1; > int status; > struct stat fstats; > char errbuf[ BIG_LINE ]; >@@ -176,15 +176,15 @@ > #ifdef DEBUG_CGI > fprintf(stderr, "importldif: server is not down\n"); > #endif /* DEBUG_CGI */ > return DS_SERVER_MUST_BE_DOWN; > } >- if ( (root = ds_get_install_root()) == NULL ) { >+ if ( (instdir = ds_get_instance_dir()) == NULL ) { > #ifdef DEBUG_CGI >- fprintf(stderr, "importldif: could not get server root\n"); >+ fprintf(stderr, "importldif: could not get instance directory\n"); > #endif /* DEBUG_CGI */ >- return DS_NO_SERVER_ROOT; >+ return DS_NO_INSTANCE_DIR; > } > > if ( file[strlen(file) - 1] == '\n' ) /* strip out returns */ > file[strlen(file) - 1] = '\0'; > >@@ -201,25 +201,25 @@ > return DS_IS_A_DIRECTORY; > } > > if ( preserve ) { > PR_snprintf(startup_line, BIG_LINE, "%s%cldif2db%s -i %s%s%s", >- root, FILE_SEP, SCRIPT_SUFFIX, >+ instdir, FILE_SEP, SCRIPT_SUFFIX, > ENQUOTE, file, ENQUOTE); > } else if (backend) { > PR_snprintf(startup_line, BIG_LINE, "%s%cldif2db%s -n %s%s%s -i %s%s%s", >- root, FILE_SEP, SCRIPT_SUFFIX, >+ instdir, FILE_SEP, SCRIPT_SUFFIX, > ENQUOTE, backend, ENQUOTE, > ENQUOTE, file, ENQUOTE); > } else if (subtree) { > PR_snprintf(startup_line, BIG_LINE, "%s%cldif2db%s -s %s%s%s -i %s%s%s", >- root, FILE_SEP, SCRIPT_SUFFIX, >+ instdir, FILE_SEP, SCRIPT_SUFFIX, > ENQUOTE, subtree, ENQUOTE, > ENQUOTE, file, ENQUOTE); > } else { > PR_snprintf(startup_line, BIG_LINE, "%s%cldif2db%s -i %s%s%s -noconfig", >- root, FILE_SEP, SCRIPT_SUFFIX, >+ instdir, FILE_SEP, SCRIPT_SUFFIX, > ENQUOTE, file, ENQUOTE); > } > alter_startup_line(startup_line); > fflush(stdout); > #ifdef DEBUG_CGI >@@ -309,17 +309,17 @@ > char startup_line[BIG_LINE]; > char statfile[PATH_MAX]; > char outfile[PATH_MAX]; > char scriptfile[PATH_MAX]; > char *tmp_dir; >- char *root; >+ char *instdir; > int haderror = 0; > int error = -1; > FILE *sf = NULL; > >- if ( (root = ds_get_install_root()) == NULL ) { >- return DS_NO_SERVER_ROOT; >+ if ( (instdir = ds_get_instance_dir()) == NULL ) { >+ return DS_NO_INSTANCE_DIR; > } > > if ( (file == NULL) || (strlen(file) == 0) ) > file = NULL; > >@@ -341,11 +341,11 @@ > if ( file == NULL ) > *outfile = 0; > else > PL_strncpyz( outfile, file, sizeof(outfile) ); > >- PR_snprintf(scriptfile, PATH_MAX, "%s%cdb2ldif", root, FILE_SEP); >+ PR_snprintf(scriptfile, PATH_MAX, "%s%cdb2ldif", instdir, FILE_SEP); > > PATH_FOR_PLATFORM( outfile ); > PATH_FOR_PLATFORM( scriptfile ); > > if ( subtree == NULL ) { >Index: lib/libdsa/dsalib_location.c >=================================================================== >RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_location.c,v >retrieving revision 1.2 >diff -u -5 -t -r1.2 dsalib_location.c >--- lib/libdsa/dsalib_location.c 25 Jun 2007 23:23:12 -0000 1.2 >+++ lib/libdsa/dsalib_location.c 26 Jun 2007 17:37:46 -0000 >@@ -49,48 +49,25 @@ > #include <stdlib.h> > #include "nspr.h" > #include "plstr.h" > > /* >- * Returns the server root. Info is >- * returned in a static area. The caller must copy it >- * for reuse if needed. >- */ >-DS_EXPORT_SYMBOL char * >-ds_get_server_root() >-{ >- char *root; >- >- if ( (root = getenv("NETSITE_ROOT")) == NULL ) >- return(NULL); >- >- /* WIN32: Needed to take care of embedded space, */ >- /* otherwise system() call fails */ >- root = ds_makeshort( root ); >- >- return root; >-} >- >-/* >- * Returns the install location of the server. Info is >- * returned in a static area. The caller must copy it >- * for reuse if needed. >+ * Returns the instance directory path of the server. >+ * Info is returned in a static area. The caller must >+ * copy it for reuse if needed. > */ > DS_EXPORT_SYMBOL char * >-ds_get_install_root() >+ds_get_instance_dir() > { >- char *root; > char *ds_name; >- static char install_root[PATH_MAX]; >+ static char instance_dir[PATH_MAX]; > >- if ( (root = ds_get_server_root()) == NULL ) >- return(NULL); > if ( (ds_name = ds_get_server_name()) == NULL ) > return(NULL); > >- PR_snprintf(install_root, sizeof(install_root), "%s/%s", root, ds_name); >- return(install_root); >+ PR_snprintf(instance_dir, sizeof(instance_dir), "%s/%s", DSLIBDIR, ds_name); >+ return(instance_dir); > } > > /* > * Returns the config file location of the server. Info is > * returned in a static area. The caller must copy it >@@ -134,13 +111,13 @@ > ds_get_run_dir() > { > char *rundir; > > if (rundir = getenv("DS_RUN_DIR")) { >- return rundir; >+ return (rundir); > } else { >- return ds_get_config_value(DS_RUNDIR); >+ return (PIDDIR);; > } > } > > /* > * set run_dir to environment variable DS_RUN_DIR >@@ -229,10 +206,13 @@ > return(NULL); > PR_snprintf(install_root, sizeof(install_root), "%s/%s", root, ds_name); > return(install_root); > } > >+/* >+ * Returns the Directory Server instance name. >+ */ > DS_EXPORT_SYMBOL char * > ds_get_server_name() > { > if( getenv("SERVER_NAMES") ) > return( getenv("SERVER_NAMES") ); >Index: lib/libdsa/dsalib_updown.c >=================================================================== >RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_updown.c,v >retrieving revision 1.2 >diff -u -5 -t -r1.2 dsalib_updown.c >--- lib/libdsa/dsalib_updown.c 25 Jun 2007 23:23:12 -0000 1.2 >+++ lib/libdsa/dsalib_updown.c 26 Jun 2007 17:37:46 -0000 >@@ -154,11 +154,11 @@ > that that information be passed in. This is very useful for starting > the server during installation, because we already have all of the > configuration information in memory, we don't need to read it in > */ > DS_EXPORT_SYMBOL int >-ds_bring_up_server_install(int verbose, char *root, char *errorlog) >+ds_bring_up_server_install(int verbose, char *instdir, char *errorlog) > { > #if !defined( XP_WIN32 ) > char startup_line[BIG_LINE]; > char statfile[PATH_MAX]; > char *tmp_dir; >@@ -172,11 +172,11 @@ > char *serverStartupString = "slapd started."; > > status = ds_get_updown_status(); > if ( status == DS_SERVER_UP ) > return(DS_SERVER_ALREADY_UP); >- if (!root || !errorlog) >+ if (!instdir || !errorlog) > return(DS_SERVER_UNKNOWN); > > if (verbose) { > ds_send_status("starting up server ..."); > cur_size = ds_get_file_size(errorlog); >@@ -185,11 +185,11 @@ > #if !defined( XP_WIN32 ) > tmp_dir = ds_get_tmp_dir(); > PR_snprintf(statfile, PATH_MAX, "%s%cstartup.%d", tmp_dir, FILE_SEP, (int)getpid()); > > PR_snprintf(startup_line, BIG_LINE, "%s%c%s > %s 2>&1", >- root, FILE_SEP, START_SCRIPT, statfile); >+ instdir, FILE_SEP, START_SCRIPT, statfile); > alter_startup_line(startup_line); > error = system(startup_line); > if (error == -1) > error = DS_SERVER_DOWN; /* could not start server */ > else >@@ -302,25 +302,24 @@ > */ > > DS_EXPORT_SYMBOL int > ds_bring_up_server(int verbose) > { >- char *root; >+ char *instdir; > int status; >- char *errorlog; >+ char *errorlog; > status = ds_get_updown_status(); > if ( status == DS_SERVER_UP ) > return(DS_SERVER_ALREADY_UP); >- /* NGK - Need to eliminate root */ >- if ( (root = ds_get_install_root()) == NULL ) >+ if ( (instdir = ds_get_instance_dir()) == NULL ) > return(DS_SERVER_UNKNOWN); > > errorlog = ds_get_config_value(DS_ERRORLOG); > if ( errorlog == NULL ) { > errorlog = ds_get_errors_name(); /* fallback */ > } >- return ds_bring_up_server_install(verbose, root, errorlog); >+ return ds_bring_up_server_install(verbose, instdir, errorlog); > } > > DS_EXPORT_SYMBOL int > ds_bring_down_server() > { >@@ -528,11 +527,11 @@ > > int > StartNetscapeProgram() > { > char line[BIG_LINE], cmd[BIG_LINE]; >- char *tmp = ds_get_install_root(); >+ char *tmp = ds_get_instance_dir(); > > CHAR ErrorString[512]; > STARTUPINFO siStartInfo; > PROCESS_INFORMATION piProcInfo; > FILE *CmdFile;
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=157923">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 245665
:
157833
|
157834
| 157923 |
157931