On Mon, 2007-05-21 at 07:49 -0600, Richard Megginson wrote: > Andrew Bartlett wrote: > > Anyway, for my own amusement, I'll post a patch (probably untested on > > win32) to make this a little easier on the eyes, and perhaps even easier > > on new programmers to the codebase. > > > > Thoughts? > > > FILE_PATHSEP is used throughout fedora ds code . . . Yes and no. It seems confined mainly to the admin code (I presume the rest is isolated by NSPR?). Attached is the patch I made up, for create_instance at least. For the moment, It includes the schema work (because the two overlap), but I'll redo this once the schema work is in the tree. Some feedback from a windows system would be useful. Andrew Bartlett -- Andrew Bartlett http://samba.org/~abartlet/ Authentication Developer, Samba Team http://samba.org Samba Developer, Red Hat Inc. http://redhat.com
? ldap/admin/src/.deps
? ldap/admin/src/.dirstamp
? ldap/admin/src/ds_newinst.pl
? ldap/admin/src/migrateTo11
? ldap/admin/src/scripts/template-bak2db
? ldap/admin/src/scripts/template-bak2db.pl
? ldap/admin/src/scripts/template-cl-dump.pl
? ldap/admin/src/scripts/template-db2bak
? ldap/admin/src/scripts/template-db2bak.pl
? ldap/admin/src/scripts/template-db2index
? ldap/admin/src/scripts/template-db2index.pl
? ldap/admin/src/scripts/template-db2ldif
? ldap/admin/src/scripts/template-db2ldif.pl
? ldap/admin/src/scripts/template-ldif2db
? ldap/admin/src/scripts/template-ldif2db.pl
? ldap/admin/src/scripts/template-ldif2ldap
? ldap/admin/src/scripts/template-monitor
? ldap/admin/src/scripts/template-ns-accountstatus.pl
? ldap/admin/src/scripts/template-ns-activate.pl
? ldap/admin/src/scripts/template-ns-inactivate.pl
? ldap/admin/src/scripts/template-ns-newpwpolicy.pl
? ldap/admin/src/scripts/template-repl-monitor.pl
? ldap/admin/src/scripts/template-restoreconfig
? ldap/admin/src/scripts/template-saveconfig
? ldap/admin/src/scripts/template-start-slapd
? ldap/admin/src/scripts/template-stop-slapd
? ldap/admin/src/scripts/template-suffix2instance
? ldap/admin/src/scripts/template-verify-db.pl
? ldap/admin/src/scripts/template-vlvindex
Index: ldap/admin/src/create_instance.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
retrieving revision 1.56
diff -u -r1.56 create_instance.c
--- ldap/admin/src/create_instance.c 16 May 2007 19:45:26 -0000 1.56
+++ ldap/admin/src/create_instance.c 23 May 2007 23:11:52 -0000
@@ -300,6 +300,7 @@
conf->upgradingServer = 0;
conf->start_server = "1";
+ conf->install_full_schema = "1";
conf->admin_domain = NULL;
conf->config_ldap_url = NULL;
conf->user_ldap_url = NULL;
@@ -652,7 +653,7 @@
char *shell = "/bin/sh";
va_list args;
- PR_snprintf(fn, sizeof(fn), "%s%c%s", s_root, FILE_PATHSEP, name);
+ PR_snprintf(fn, sizeof(fn), "%s/%s", s_root, name);
if(!(f = fopen(fn, "w")))
return make_error("Could not write to %s (%s).", fn, ds_system_errmsg());
va_start(args, fmt);
@@ -710,19 +711,18 @@
}
#if defined (IS_FHS_OPT)
- PR_snprintf(ofn, sizeof(ofn), "%s%cscript-templates%ctemplate-%s",
- cf->datadir, FILE_PATHSEP, FILE_PATHSEP, name);
+ PR_snprintf(ofn, sizeof(ofn), "%s/script-templates/template-%s",
+ cf->datadir, name);
#else
- PR_snprintf(ofn, sizeof(ofn), "%s%c%s%cscript-templates%ctemplate-%s",
- cf->datadir, FILE_PATHSEP, cf->package_name,
- FILE_PATHSEP, FILE_PATHSEP, name);
+ PR_snprintf(ofn, sizeof(ofn), "%s/%s/script-templates/template-%s",
+ cf->datadir, cf->package_name,
+ name);
#endif
- PR_snprintf(fn, sizeof(fn), "%s%c%s", cs_path, FILE_PATHSEP, name);
+ PR_snprintf(fn, sizeof(fn), "%s/%s", cs_path, name);
create_instance_mkdir(cs_path, NEWDIR_MODE);
#ifdef USE_NSPERL
- PR_snprintf(myperl, sizeof(myperl), "!%s%cbin%cslapd%cadmin%cbin%cperl",
- cf->prefix, FILE_PATHSEP, FILE_PATHSEP,
- FILE_PATHSEP, FILE_PATHSEP, FILE_PATHSEP);
+ PR_snprintf(myperl, sizeof(myperl), "!%s/bin/slapd/admin/bin/perl",
+ cf->prefix);
#else
strcpy(myperl, "!/usr/bin/env perl");
#endif
@@ -869,11 +869,11 @@
DWORD sizeof_value_data_buffer;
/* MLM - Adding ACL directories authdb and authdb/default */
- PR_snprintf(subdir, sizeof(subdir), "%s%cauthdb", sroot, FILE_PATHSEP);
+ PR_snprintf(subdir, sizeof(subdir), "%s/authdb", sroot);
if( (create_instance_mkdir(subdir, NEWDIR_MODE)) )
return make_error("mkdir %s failed (%s)", subdir, ds_system_errmsg());
- PR_snprintf(subdir, sizeof(subdir), "%s%cauthdb%cdefault", sroot, FILE_PATHSEP, FILE_PATHSEP);
+ PR_snprintf(subdir, sizeof(subdir), "%s/authdb/default", sroot);
if( (create_instance_mkdir(subdir, NEWDIR_MODE)) )
return make_error("mkdir %s failed (%s)", subdir, ds_system_errmsg());
@@ -987,8 +987,8 @@
char subdir[PATH_SIZE];
/* Create slapd-nickname directory */
- PR_snprintf(subdir, sizeof(subdir), "%s%c"PRODUCT_NAME"-%s",
- sroot, FILE_PATHSEP, cf->servid);
+ PR_snprintf(subdir, sizeof(subdir), "%s/"PRODUCT_NAME"-%s",
+ sroot, cf->servid);
#ifdef XP_UNIX
t = gen_script(cf->inst_dir, RESTART_SCRIPT,
"\n"
@@ -1150,8 +1150,8 @@
#if defined (BUILD_PRESENCE)
/* Create config_dir/presence directory */
- PR_snprintf(line, sizeof(line), "%s%cpresence",
- cf->config_dir, FILE_PATHSEP);
+ PR_snprintf(line, sizeof(line), "%s/presence",
+ cf->config_dir);
if( (create_instance_mkdir(line, NEWDIR_MODE)) )
return make_error("mkdir %s failed (%s)", line, ds_system_errmsg());
#endif
@@ -1286,7 +1286,19 @@
#endif /* XP_WIN32 */
while(1) {
- t = strchr(t, FILE_PATHSEP);
+ char *t1;
+ t1 = strchr(t, '/');
+ if (FILE_PATHSEP == '\\') {
+ char *t2;
+ t2 = strchr(t, '/');
+ if (t1 < t2) {
+ t = t1;
+ } else {
+ t = t2;
+ }
+ } else {
+ t = t1;
+ }
if(t) *t = '\0';
if(stat(dir, &fi) == -1) {
@@ -1299,7 +1311,7 @@
}
if(t)
{
- *t = FILE_PATHSEP;
+ *t = '/';
LDAP_UTF8INC(t);
}
else break;
@@ -1641,8 +1653,8 @@
PR_snprintf(fullname, sizeof(fullname), "%s/%s", src_dir, d->name);
if(PR_SUCCESS != PR_Access(fullname, PR_ACCESS_EXISTS))
continue;
- PR_snprintf(src_file, sizeof(src_file), "%s%c%s", src_dir, FILE_PATHSEP, d->name);
- PR_snprintf(dest_file, sizeof(dest_file), "%s%c%s", dest_dir, FILE_PATHSEP, d->name);
+ PR_snprintf(src_file, sizeof(src_file), "%s/%s", src_dir, d->name);
+ PR_snprintf(dest_file, sizeof(dest_file), "%s/%s", dest_dir, d->name);
if(is_a_dir(src_dir, d->name)) {
char *sub_src_dir = strdup(src_file);
char *sub_dest_dir = strdup(dest_file);
@@ -1717,7 +1729,7 @@
#ifdef DSML
/* create subdir <a_server>/dsml */
- PR_snprintf(subdir, sizeof(subdir), "%s%cdsml", cs_path, FILE_PATHSEP);
+ PR_snprintf(subdir, sizeof(subdir), "%s/dsml", cs_path);
if( (t = create_instance_mkdir_p("dsml dir", subdir, NEWDIR_MODE, pw)) )
return(t);
#endif
@@ -1726,23 +1738,23 @@
return(t);
/* Create slapd-nickname/confbak directory */
- PR_snprintf(subdir, sizeof(subdir), "%s%cconfbak", cf->config_dir, FILE_PATHSEP);
+ PR_snprintf(subdir, sizeof(subdir), "%s/confbak", cf->config_dir);
if( (t=create_instance_mkdir_p("config bak dir", subdir, NEWDIR_MODE, pw)) )
return(t);
#ifdef DSGW
/* create subdir <server_root>/dsgw/context */
- PR_snprintf(subdir, sizeof(subdir), "%s%cclients", sroot, FILE_PATHSEP);
+ PR_snprintf(subdir, sizeof(subdir), "%s/clients", sroot);
if (is_a_dir(subdir, "dsgw")) { /* only create dsgw stuff if we are installing it */
- PR_snprintf(subdir, sizeof(subdir), "%s%cclients%cdsgw%ccontext", sroot, FILE_PATHSEP,FILE_PATHSEP,FILE_PATHSEP);
+ PR_snprintf(subdir, sizeof(subdir), "%s/clients/dsgw/context", sroot);
if( (t = create_instance_mkdir_p("dsgw context dir", subdir, NEWDIR_MODE, pw)) )
return(t);
}
/* create subdir <prefix>/bin/slapd/authck */
/* dsgw cookie dir */
- PR_snprintf(subdir, sizeof(subdir), "%s%cbin%cslapd%cauthck",
- cf->prefix, FILE_PATHSEP, FILE_PATHSEP, FILE_PATHSEP);
+ PR_snprintf(subdir, sizeof(subdir), "%s/bin/slapd/authck",
+ cf->prefix);
if( (t = create_instance_mkdir_p("authck dir", subdir, NEWDIR_MODE, pw)) )
return(t);
#endif
@@ -2651,8 +2663,8 @@
struct passwd *pw = getpwnam(cf->servuser);
char *prefix = cf->prefix;
- PR_snprintf(fn, sizeof(fn), "%s%c%s",
- cf->config_dir, FILE_PATHSEP, DS_CONFIG_FILE);
+ PR_snprintf(fn, sizeof(fn), "%s/%s",
+ cf->config_dir, DS_CONFIG_FILE);
if(!(f = fopen(fn, "w")))
return make_error("Can't write to %s (%s)",
cf->config_dir, ds_system_errmsg());
@@ -3494,24 +3506,24 @@
fclose (f);
- PR_snprintf(src, sizeof(src), "%s%c%s",
- cf->config_dir, FILE_PATHSEP, DS_CONFIG_FILE);
- PR_snprintf(dest, sizeof(dest), "%s%c%s",
- cf->config_dir, FILE_PATHSEP, DS_ORIGCONFIG_FILE);
+ PR_snprintf(src, sizeof(src), "%s/%s",
+ cf->config_dir, DS_CONFIG_FILE);
+ PR_snprintf(dest, sizeof(dest), "%s/%s",
+ cf->config_dir, DS_ORIGCONFIG_FILE);
create_instance_copy(src, dest, 0600, 0 );
/* install certmap.conf at <configdir> */
- PR_snprintf(src, sizeof(src), "%s%c%s%c/config/certmap.conf",
- cf->sysconfdir, FILE_PATHSEP, cf->package_name, FILE_PATHSEP);
+ PR_snprintf(src, sizeof(src), "%s/%s//config/certmap.conf",
+ cf->sysconfdir, cf->package_name);
PR_snprintf(dest, sizeof(dest), "%s/certmap.conf", cf->config_dir);
create_instance_copy(src, dest, 0600, 0 );
/* generate <confdir>/slapd-collations.conf */
- PR_snprintf(src, sizeof(src), "%s%c%s%c/config/%s-collations.conf",
- cf->sysconfdir, FILE_PATHSEP, cf->package_name,
- FILE_PATHSEP, PRODUCT_NAME);
- PR_snprintf(dest, sizeof(dest), "%s%c%s-collations.conf",
- cf->config_dir, FILE_PATHSEP, PRODUCT_NAME);
+ PR_snprintf(src, sizeof(src), "%s/%s//config/%s-collations.conf",
+ cf->sysconfdir, cf->package_name,
+ PRODUCT_NAME);
+ PR_snprintf(dest, sizeof(dest), "%s/%s-collations.conf",
+ cf->config_dir, PRODUCT_NAME);
if (!(srcf = fopen(src, "r"))) {
return make_error("Can't read from %s (%s)", src, ds_system_errmsg());
}
@@ -3530,17 +3542,30 @@
fclose(srcf);
fclose(f);
- /*
- * <sysconfdir>/PACKAGE_NAME/schema to schema_dir
- */
- PR_snprintf(src, sizeof(src), "%s%c%s%cschema",
- cf->sysconfdir, FILE_PATHSEP, cf->package_name, FILE_PATHSEP);
- if (NULL != (t = ds_copy_group_files_using_mode_owner(src, cf->schema_dir, 0, NEWFILE_MODE, pw)))
- return t;
-
+ if (cf->install_full_schema) {
+ /*
+ * <sysconfdir>/PACKAGE_NAME/schema to schema_dir
+ */
+ PR_snprintf(src, sizeof(src), "%s/%s/schema",
+ cf->sysconfdir, cf->package_name);
+ if (NULL != (t = ds_copy_group_files_using_mode_owner(src, cf->schema_dir, 0, NEWFILE_MODE, pw)))
+ return t;
+ } else {
+ PR_snprintf(src, sizeof(src), "%s/%s/schema/00core.ldif",
+ cf->sysconfdir, cf->package_name);
+ PR_snprintf(dest, sizeof(dest), "%s/00core.ldif",
+ cf->schema_dir);
+ if( (t = create_instance_copy(src, dest, NEWFILE_MODE, 0 )) ) {
+ return t;
+ } else {
+ if (pw) {
+ chownfile(pw, dest);
+ }
+ }
+ }
#if defined (BUILD_PRESENCE)
- PR_snprintf(src, sizeof(src), "%s%c%s%c/config/presence",
- cf->sysconfdir, FILE_PATHSEP, cf->package_name, FILE_PATHSEP);
+ PR_snprintf(src, sizeof(src), "%s/%s//config/presence",
+ cf->sysconfdir, cf->package_name);
PR_snprintf(dest, sizeof(dest), "%s/presence", cf->config_dir);
if (t = ds_copy_group_files(src, dest, 0))
return t;
@@ -3607,8 +3632,7 @@
* copying the rest from NS-HOME/dsgw/config/dsgw.tmpl
*/
- PR_snprintf(dest, sizeof(dest), "%s%cclients%cdsgw%ccontext%c%s.conf", sroot, FILE_PATHSEP,FILE_PATHSEP,
- FILE_PATHSEP, FILE_PATHSEP, ctxt);
+ PR_snprintf(dest, sizeof(dest), "%s/clients/dsgw/context/%s.conf", sroot, ctxt);
/* If the config file already exists, just return success */
if (create_instance_exists(dest, PR_FILE_FILE)) {
@@ -3636,18 +3660,18 @@
if (t != cf->suffix) free(t);
- fprintf(f, "securitypath\t\"%s%calias%c%s-cert.db\"\n\n", cf->cert_dir, FILE_PATHSEP, FILE_PATHSEP, ctxt );
+ fprintf(f, "securitypath\t\"%s%calias%c%s-cert.db\"\n\n", cf->cert_dir, ctxt );
fprintf(f, "# The url base to the orgchart application.\n#No link from the DSGW to the orgchart will appear in the UI if this configuration line is commented out.\n");
fprintf(f, "url-orgchart-base\thttp://%s:%s/clients/orgchart/bin/org?context=%s&data=\n\n";, cf->servname, cf->adminport ? cf->adminport : "80", ctxt);
/* copy in template */
if (conf_type == GW_CONF) {
- PR_snprintf(src, sizeof(src), "%s%cclients%cdsgw%cconfig%cdsgw.tmpl",
- sroot, FILE_PATHSEP, FILE_PATHSEP, FILE_PATHSEP, FILE_PATHSEP);
+ PR_snprintf(src, sizeof(src), "%s/clients/dsgw/config/dsgw.tmpl",
+ sroot);
} else if (conf_type == PB_CONF) {
- PR_snprintf(src, sizeof(src), "%s%cclients%cdsgw%cpbconfig%cpb.tmpl",
- sroot, FILE_PATHSEP,FILE_PATHSEP, FILE_PATHSEP, FILE_PATHSEP);
+ PR_snprintf(src, sizeof(src), "%s/clients/dsgw/pbconfig/pb.tmpl",
+ sroot);
} else {
/*This should never, ever happen if this function is called correctly*/
fclose(f);
@@ -3684,8 +3708,7 @@
}
#endif
- PR_snprintf(defaultconf, sizeof(defaultconf), "%s%cclients%cdsgw%ccontext%cdefault.conf", sroot,
- FILE_PATHSEP,FILE_PATHSEP, FILE_PATHSEP, FILE_PATHSEP);
+ PR_snprintf(defaultconf, sizeof(defaultconf), "%s/clients/dsgw/context/default.conf", sroot);
create_instance_copy(dest, defaultconf, NEWFILE_MODE, 0 );
chownfile (pw, defaultconf);
@@ -3720,10 +3743,8 @@
* install-specific config. file lines at the start of file, and then
* copying the rest from NS-HOME/clients/orgchart/config.tmpl
*/
- PR_snprintf(dest, sizeof(dest), "%s%cclients%corgchart%cconfig.txt", sroot, FILE_PATHSEP,
- FILE_PATHSEP, FILE_PATHSEP );
- PR_snprintf(src, sizeof(src), "%s%cclients%corgchart%cconfig.tmpl", sroot, FILE_PATHSEP,
- FILE_PATHSEP, FILE_PATHSEP);
+ PR_snprintf(dest, sizeof(dest), "%s/clients/orgchart/config.txt", sroot);
+ PR_snprintf(src, sizeof(src), "%s/clients/orgchart/config.tmpl", sroot);
/* If the config file already exists, just return success */
if (create_instance_exists(dest, PR_FILE_FILE)) {
@@ -3790,10 +3811,10 @@
char dir[PATH_SIZE];
FILE *f;
- PR_snprintf(dir, sizeof(dir), "%s%cconfig%cpresence",
- cs_path, FILE_PATHSEP, FILE_PATHSEP);
- PR_snprintf(fn, sizeof(fn), "%s%c%s",
- dir, FILE_PATHSEP, PRESENCE_LDIF);
+ PR_snprintf(dir, sizeof(dir), "%s/config/presence",
+ cs_path);
+ PR_snprintf(fn, sizeof(fn), "%s/%s",
+ dir, PRESENCE_LDIF);
if(!(f = fopen(fn, "w")))
return make_error("Could not write to %s (%s).", fn, ds_system_errmsg());
@@ -3870,21 +3891,21 @@
char precmd[PATH_SIZE];
precmd[0] = 0;
- PR_snprintf(tools, sizeof(tools), "%s%cshared%cbin",
- cf->prefix, FILE_PATHSEP, FILE_PATHSEP);
+ PR_snprintf(tools, sizeof(tools), "%s/shared/bin",
+ cf->prefix);
#ifdef XP_UNIX
PR_snprintf(precmd, sizeof(precmd), "cd %s;", tools);
#endif
- PR_snprintf(cmd, sizeof(cmd), "%s%s%cldapmodify -q -p %d -b -D \"%s\" -w \"%s\" "
- "-f %s%s%cconfig%cpresence%c%s%s",
+ PR_snprintf(cmd, sizeof(cmd), "%s%s/ldapmodify -q -p %d -b -D \"%s\" -w \"%s\" "
+ "-f %s%s/config/presence/%s%s",
precmd,
- tools, FILE_PATHSEP,
+ tools,
atoi(cf->servport),
cf->rootdn,
cf->rootpw,
- ENQUOTE, cs_path, FILE_PATHSEP, FILE_PATHSEP, FILE_PATHSEP,
+ ENQUOTE, cs_path,
PRESENCE_LDIF, ENQUOTE);
return ds_exec_and_report( cmd );
}
@@ -3993,29 +4014,26 @@
#ifdef DSML
/* new code for dsml sample files */
PR_snprintf(src, sizeof(src),
- "%s%cbin%c"PRODUCT_NAME"%cinstall%cdsml%cExample.dsml",
- cf->prefix, FILE_PATHSEP, FILE_PATHSEP, FILE_PATHSEP,
- FILE_PATHSEP, FILE_PATHSEP);
- PR_snprintf(dest, sizeof(dest), "%s%cdsml%cExample.dsml",
- bogus, FILE_PATHSEP, FILE_PATHSEP);
+ "%s/bin/"PRODUCT_NAME"/install/dsml/Example.dsml",
+ cf->prefix);
+ PR_snprintf(dest, sizeof(dest), "%s/dsml/Example.dsml",
+ bogus);
create_instance_copy(src, dest, NEWFILE_MODE, 1);
chownfile (pw, dest);
PR_snprintf(src, sizeof(src),
- "%s%cbin%c"PRODUCT_NAME"%cinstall%cdsml%cExample-roles.dsml",
- cf->prefix, FILE_PATHSEP, FILE_PATHSEP, FILE_PATHSEP,
- FILE_PATHSEP, FILE_PATHSEP);
- PR_snprintf(dest, sizeof(dest), "%s%cdsml%cExample-roles.dsml",
- bogus, FILE_PATHSEP, FILE_PATHSEP);
+ "%s/bin/"PRODUCT_NAME"/install/dsml/Example-roles.dsml",
+ cf->prefix);
+ PR_snprintf(dest, sizeof(dest), "%s/dsml/Example-roles.dsml",
+ bogus);
create_instance_copy(src, dest, NEWFILE_MODE, 1);
chownfile (pw, dest);
PR_snprintf(src, sizeof(src),
- "%s%cbin%c"PRODUCT_NAME"%cinstall%cdsml%cEuropean.dsml",
- sroot, FILE_PATHSEP, FILE_PATHSEP, FILE_PATHSEP,
- FILE_PATHSEP, FILE_PATHSEP);
- PR_snprintf(dest, sizeof(dest), "%s%cdsml%cEuropean.dsml",
- bogus, FILE_PATHSEP, FILE_PATHSEP);
+ "%s/bin/"PRODUCT_NAME"/install/dsml/European.dsml",
+ sroot);
+ PR_snprintf(dest, sizeof(dest), "%s/dsml/European.dsml",
+ bogus);
create_instance_copy(src, dest, NEWFILE_MODE, 1);
chownfile (pw, dest);
#endif
@@ -4064,7 +4082,7 @@
if (getenv("USE_DEBUGGER"))
verbose = 0;
/* error log file */
- PR_snprintf(errorlog, sizeof(errorlog), "%s%cerrors", cf->log_dir, FILE_PATHSEP);
+ PR_snprintf(errorlog, sizeof(errorlog), "%s/errors", cf->log_dir);
start_status = ds_bring_up_server_install(verbose, cf->inst_dir, errorlog);
if (start_status != DS_SERVER_UP)
@@ -4293,7 +4311,7 @@
} else if (FILE_PATHSEP == *defaultval) {
rstr = PR_smprintf("%s%s", prefix, defaultval);
} else {
- rstr = PR_smprintf("%s%c%s", prefix, FILE_PATHSEP, defaultval);
+ rstr = PR_smprintf("%s/%s", prefix, defaultval);
}
} else {
if (NULL == temp) {
@@ -4301,7 +4319,7 @@
} else if (FILE_PATHSEP == *temp) {
rstr = PR_smprintf("%s%s", prefix, temp);
} else {
- rstr = PR_smprintf("%s%c%s", prefix, FILE_PATHSEP, temp);
+ rstr = PR_smprintf("%s/%s", prefix, temp);
}
}
} else {
@@ -4385,10 +4403,10 @@
}
#if defined (IS_FHS_OPT)
- cf->sroot = PR_smprintf("%sopt%c%s", prefix, FILE_PATHSEP, cf->package_name);
+ cf->sroot = PR_smprintf("%sopt/%s", prefix, cf->package_name);
#else
- cf->sroot = PR_smprintf("%s%s%c%s",
- prefix, LIBDIR, FILE_PATHSEP, cf->package_name);
+ cf->sroot = PR_smprintf("%s%s/%s",
+ prefix, LIBDIR, cf->package_name);
#endif
temp = ds_a_get_cgi_var("sasl_path", NULL, NULL);
@@ -4402,14 +4420,14 @@
and always set it in the conf file. */
else
{
- cf->sasl_path = PR_smprintf("%s%s%csasl2", prefix, LIBDIR, FILE_PATHSEP);
+ cf->sasl_path = PR_smprintf("%s%s/sasl2", prefix, LIBDIR);
}
#endif
#if defined (IS_FHS_OPT)
- cf->plugin_dir = PR_smprintf("%s%s%cplugins", prefix, LIBDIR, FILE_PATHSEP);
+ cf->plugin_dir = PR_smprintf("%s%s/plugins", prefix, LIBDIR);
#else
- cf->plugin_dir = PR_smprintf("%s%cplugins", cf->sroot, FILE_PATHSEP);
+ cf->plugin_dir = PR_smprintf("%s/plugins", cf->sroot);
#endif
if (!(cf->servname = ds_a_get_cgi_var("servname", "Server Name",
@@ -4490,6 +4508,7 @@
return 1;
}
cf->start_server = ds_a_get_cgi_var("start_server", NULL, NULL);
+ cf->install_full_schema = ds_a_get_cgi_var("install_full_schema", NULL, NULL);
cf->secserv = ds_a_get_cgi_var("secserv", NULL, NULL);
if (cf->secserv && strcmp(cf->secserv, "off"))
cf->secservport = ds_a_get_cgi_var("secservport", NULL, NULL);
@@ -4592,17 +4611,17 @@
temp = ds_a_get_cgi_var("inst_dir", NULL, NULL);
if (NULL == temp) {
- cf->inst_dir = PR_smprintf("%s%c%s-%s",
- cf->sroot, FILE_PATHSEP, PRODUCT_NAME, cf->servid);
+ cf->inst_dir = PR_smprintf("%s/%s-%s",
+ cf->sroot, PRODUCT_NAME, cf->servid);
} else {
cf->inst_dir = PL_strdup(temp);
}
temp = ds_a_get_cgi_var("config_dir", NULL, NULL);
if (NULL == temp) {
- cf->config_dir = PR_smprintf("%s%c%s%c%s-%s",
- cf->sysconfdir, FILE_PATHSEP,
- cf->package_name, FILE_PATHSEP,
+ cf->config_dir = PR_smprintf("%s/%s/%s-%s",
+ cf->sysconfdir,
+ cf->package_name,
PRODUCT_NAME, cf->servid);
} else {
cf->config_dir = PL_strdup(temp);
@@ -4613,10 +4632,10 @@
cf->schema_dir = ds_a_get_cgi_var("schema_dir", NULL, NULL);
temp = ds_a_get_cgi_var("schema_dir", NULL, NULL);
if (NULL == temp) {
- cf->schema_dir = PR_smprintf("%s%c%s%c%s-%s%cschema",
- cf->sysconfdir, FILE_PATHSEP,
- cf->package_name, FILE_PATHSEP,
- PRODUCT_NAME, cf->servid, FILE_PATHSEP);
+ cf->schema_dir = PR_smprintf("%s/%s/%s-%s/schema",
+ cf->sysconfdir,
+ cf->package_name,
+ PRODUCT_NAME, cf->servid);
} else {
cf->schema_dir = PL_strdup(temp);
}
@@ -4624,14 +4643,14 @@
temp = ds_a_get_cgi_var("lock_dir", NULL, NULL);
if (NULL == temp) {
#if defined (IS_FHS_OPT)
- cf->lock_dir = PR_smprintf("%s%c%s%c%s-%s%clock",
- cf->localstatedir, FILE_PATHSEP,
- cf->package_name, FILE_PATHSEP,
- PRODUCT_NAME, cf->servid, FILE_PATHSEP);
+ cf->lock_dir = PR_smprintf("%s/%s/%s-%s/lock",
+ cf->localstatedir,
+ cf->package_name,
+ PRODUCT_NAME, cf->servid);
#else
- cf->lock_dir = PR_smprintf("%s%clock%c%s%c%s-%s",
- cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
- cf->package_name, FILE_PATHSEP,
+ cf->lock_dir = PR_smprintf("%s/lock/%s/%s-%s",
+ cf->localstatedir,
+ cf->package_name,
PRODUCT_NAME, cf->servid);
#endif
} else {
@@ -4641,14 +4660,14 @@
temp = ds_a_get_cgi_var("log_dir", NULL, NULL);
if (NULL == temp) {
#if defined (IS_FHS_OPT)
- cf->log_dir = PR_smprintf("%s%c%s%c%s-%s%clog",
- cf->localstatedir, FILE_PATHSEP,
- cf->package_name, FILE_PATHSEP,
- PRODUCT_NAME, cf->servid, FILE_PATHSEP);
+ cf->log_dir = PR_smprintf("%s/%s/%s-%s/log",
+ cf->localstatedir,
+ cf->package_name,
+ PRODUCT_NAME, cf->servid);
#else
- cf->log_dir = PR_smprintf("%s%clog%c%s%c%s-%s",
- cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
- cf->package_name, FILE_PATHSEP,
+ cf->log_dir = PR_smprintf("%s/log/%s/%s-%s",
+ cf->localstatedir,
+ cf->package_name,
PRODUCT_NAME, cf->servid);
#endif
} else {
@@ -4658,13 +4677,13 @@
temp = ds_a_get_cgi_var("run_dir", NULL, NULL);
if (NULL == temp) {
#if defined (IS_FHS_OPT)
- cf->run_dir = PR_smprintf("%s%c%s%c%s-%s%crun",
- cf->localstatedir, FILE_PATHSEP,
- cf->package_name, FILE_PATHSEP,
- PRODUCT_NAME, cf->servid, FILE_PATHSEP);
+ cf->run_dir = PR_smprintf("%s/%s/%s-%s/run",
+ cf->localstatedir,
+ cf->package_name,
+ PRODUCT_NAME, cf->servid);
#else
- cf->run_dir = PR_smprintf("%s%crun%c%s",
- cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
+ cf->run_dir = PR_smprintf("%s/run/%s",
+ cf->localstatedir,
cf->package_name);
#endif
} else {
@@ -4676,15 +4695,15 @@
temp = ds_a_get_cgi_var("db_dir", NULL, NULL);
if (NULL == temp) {
#if defined (IS_FHS_OPT)
- cf->db_dir = PR_smprintf("%s%c%s%c%s-%s%cdb",
- cf->localstatedir, FILE_PATHSEP,
- cf->package_name, FILE_PATHSEP,
- PRODUCT_NAME, cf->servid, FILE_PATHSEP);
+ cf->db_dir = PR_smprintf("%s/%s/%s-%s/db",
+ cf->localstatedir,
+ cf->package_name,
+ PRODUCT_NAME, cf->servid);
#else
- cf->db_dir = PR_smprintf("%s%clib%c%s%c%s-%s%cdb",
- cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
- cf->package_name, FILE_PATHSEP,
- PRODUCT_NAME, cf->servid, FILE_PATHSEP);
+ cf->db_dir = PR_smprintf("%s/lib/%s/%s-%s/db",
+ cf->localstatedir,
+ cf->package_name,
+ PRODUCT_NAME, cf->servid);
#endif
} else {
cf->db_dir = PL_strdup(temp);
@@ -4693,15 +4712,15 @@
temp = ds_a_get_cgi_var("bak_dir", NULL, NULL);
if (NULL == temp) {
#if defined (IS_FHS_OPT)
- cf->bak_dir = PR_smprintf("%s%c%s%c%s-%s%cbak",
- cf->localstatedir, FILE_PATHSEP,
- cf->package_name, FILE_PATHSEP,
- PRODUCT_NAME, cf->servid, FILE_PATHSEP);
+ cf->bak_dir = PR_smprintf("%s/%s/%s-%s/bak",
+ cf->localstatedir,
+ cf->package_name,
+ PRODUCT_NAME, cf->servid);
#else
- cf->bak_dir = PR_smprintf("%s%clib%c%s%c%s-%s%cbak",
- cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
- cf->package_name, FILE_PATHSEP,
- PRODUCT_NAME, cf->servid, FILE_PATHSEP);
+ cf->bak_dir = PR_smprintf("%s/lib/%s/%s-%s/bak",
+ cf->localstatedir,
+ cf->package_name,
+ PRODUCT_NAME, cf->servid);
#endif
} else {
cf->bak_dir = PL_strdup(temp);
@@ -4712,11 +4731,11 @@
temp = ds_a_get_cgi_var("ldif_dir", NULL, NULL);
if (NULL == temp) {
#if defined (IS_FHS_OPT)
- cf->ldif_dir = PR_smprintf("%s%cldif",
- cf->datadir, FILE_PATHSEP);
+ cf->ldif_dir = PR_smprintf("%s/ldif",
+ cf->datadir);
#else
- cf->ldif_dir = PR_smprintf("%s%c%s%cldif",
- cf->datadir, FILE_PATHSEP, cf->package_name, FILE_PATHSEP);
+ cf->ldif_dir = PR_smprintf("%s/%s/ldif",
+ cf->datadir, cf->package_name);
#endif
} else {
cf->ldif_dir = PL_strdup(temp);
@@ -4725,14 +4744,14 @@
temp = ds_a_get_cgi_var("tmp_dir", NULL, NULL);
if (NULL == temp) {
#if defined (IS_FHS_OPT)
- cf->tmp_dir = PR_smprintf("%s%c%s%c%s-%s%ctmp",
- cf->localstatedir, FILE_PATHSEP,
- cf->package_name, FILE_PATHSEP,
- PRODUCT_NAME, cf->servid, FILE_PATHSEP);
+ cf->tmp_dir = PR_smprintf("%s/%s/%s-%s/tmp",
+ cf->localstatedir,
+ cf->package_name,
+ PRODUCT_NAME, cf->servid);
#else
- cf->tmp_dir = PR_smprintf("%s%ctmp%c%s%c%s-%s",
- cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
- cf->package_name, FILE_PATHSEP,
+ cf->tmp_dir = PR_smprintf("%s/tmp/%s/%s-%s",
+ cf->localstatedir,
+ cf->package_name,
PRODUCT_NAME, cf->servid);
#endif
} else {
Index: ldap/admin/src/create_instance.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.h,v
retrieving revision 1.16
diff -u -r1.16 create_instance.h
--- ldap/admin/src/create_instance.h 1 Mar 2007 03:34:23 -0000 1.16
+++ ldap/admin/src/create_instance.h 23 May 2007 23:11:52 -0000
@@ -185,6 +185,7 @@
#if defined(ENABLE_LDAPI)
char *ldapifilepath;
#endif
+ char *install_full_schema;
} server_config_s;
Attachment:
signature.asc
Description: This is a digitally signed message part
-- Fedora-directory-devel mailing list Fedora-directory-devel@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/fedora-directory-devel
