[Fedora-directory-commits] ldapserver/ldap/admin/src create_instance.c, 1.54, 1.55
Nathan Kinder (nkinder)
fedora-directory-commits at redhat.com
Thu Apr 26 02:37:56 UTC 2007
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16117/ldap/admin/src
Modified Files:
create_instance.c
Log Message:
Resolves: 236612
Summary: Modified the with-fhs and with-fhs-opt configure options
Index: create_instance.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- create_instance.c 24 Apr 2007 18:02:15 -0000 1.54
+++ create_instance.c 26 Apr 2007 02:37:49 -0000 1.55
@@ -709,13 +709,13 @@
return NULL;
}
-#if defined (IS_FHS)
+#if defined (IS_FHS_OPT)
+ PR_snprintf(ofn, sizeof(ofn), "%s%cscript-templates%ctemplate-%s",
+ cf->datadir, FILE_PATHSEP, FILE_PATHSEP, 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);
-#else
- PR_snprintf(ofn, sizeof(ofn), "%s%cscript-templates%ctemplate-%s",
- cf->datadir, FILE_PATHSEP, FILE_PATHSEP, name);
#endif
PR_snprintf(fn, sizeof(fn), "%s%c%s", cs_path, FILE_PATHSEP, name);
create_instance_mkdir(cs_path, NEWDIR_MODE);
@@ -4371,11 +4371,11 @@
prefix = cf->prefix = PL_strdup("/");
}
-#if defined (IS_FHS)
+#if defined (IS_FHS_OPT)
+ cf->sroot = PR_smprintf("%sopt%c%s", prefix, FILE_PATHSEP, cf->package_name);
+#else
cf->sroot = PR_smprintf("%s%s%c%s",
prefix, LIBDIR, FILE_PATHSEP, cf->package_name);
-#else
- cf->sroot = PR_smprintf("%sopt%c%s", prefix, FILE_PATHSEP, cf->package_name);
#endif
temp = ds_a_get_cgi_var("sasl_path", NULL, NULL);
@@ -4393,10 +4393,10 @@
}
#endif
-#if defined (IS_FHS)
- cf->plugin_dir = PR_smprintf("%s%cplugins", cf->sroot, FILE_PATHSEP);
-#else
+#if defined (IS_FHS_OPT)
cf->plugin_dir = PR_smprintf("%s%s%cplugins", prefix, LIBDIR, FILE_PATHSEP);
+#else
+ cf->plugin_dir = PR_smprintf("%s%cplugins", cf->sroot, FILE_PATHSEP);
#endif
if (!(cf->servname = ds_a_get_cgi_var("servname", "Server Name",
@@ -4610,16 +4610,16 @@
temp = ds_a_get_cgi_var("lock_dir", NULL, NULL);
if (NULL == temp) {
-#if defined (IS_FHS)
- cf->lock_dir = PR_smprintf("%s%clock%c%s%c%s-%s",
- cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
- cf->package_name, FILE_PATHSEP,
- PRODUCT_NAME, cf->servid);
-#else
+#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);
+#else
+ cf->lock_dir = PR_smprintf("%s%clock%c%s%c%s-%s",
+ cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
+ cf->package_name, FILE_PATHSEP,
+ PRODUCT_NAME, cf->servid);
#endif
} else {
cf->lock_dir = PL_strdup(temp);
@@ -4627,16 +4627,16 @@
temp = ds_a_get_cgi_var("log_dir", NULL, NULL);
if (NULL == temp) {
-#if defined (IS_FHS)
- cf->log_dir = PR_smprintf("%s%clog%c%s%c%s-%s",
- cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
- cf->package_name, FILE_PATHSEP,
- PRODUCT_NAME, cf->servid);
-#else
+#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);
+#else
+ cf->log_dir = PR_smprintf("%s%clog%c%s%c%s-%s",
+ cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
+ cf->package_name, FILE_PATHSEP,
+ PRODUCT_NAME, cf->servid);
#endif
} else {
cf->log_dir = PL_strdup(temp);
@@ -4644,15 +4644,15 @@
temp = ds_a_get_cgi_var("run_dir", NULL, NULL);
if (NULL == temp) {
-#if defined (IS_FHS)
- cf->run_dir = PR_smprintf("%s%crun%c%s",
- cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
- cf->package_name);
-#else
+#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);
+#else
+ cf->run_dir = PR_smprintf("%s%crun%c%s",
+ cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
+ cf->package_name);
#endif
} else {
cf->run_dir = PL_strdup(temp);
@@ -4662,14 +4662,14 @@
temp = ds_a_get_cgi_var("db_dir", NULL, NULL);
if (NULL == temp) {
-#if defined (IS_FHS)
- cf->db_dir = PR_smprintf("%s%clib%c%s%c%s-%s%cdb",
- cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
+#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);
#else
- cf->db_dir = PR_smprintf("%s%c%s%c%s-%s%cdb",
- cf->localstatedir, FILE_PATHSEP,
+ 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);
#endif
@@ -4679,14 +4679,14 @@
temp = ds_a_get_cgi_var("bak_dir", NULL, NULL);
if (NULL == temp) {
-#if defined (IS_FHS)
- cf->bak_dir = PR_smprintf("%s%clib%c%s%c%s-%s%cbak",
- cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
+#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);
#else
- cf->bak_dir = PR_smprintf("%s%c%s%c%s-%s%cbak",
- cf->localstatedir, FILE_PATHSEP,
+ 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);
#endif
@@ -4698,12 +4698,12 @@
temp = ds_a_get_cgi_var("ldif_dir", NULL, NULL);
if (NULL == temp) {
-#if defined (IS_FHS)
- cf->ldif_dir = PR_smprintf("%s%c%s%cldif",
- cf->datadir, FILE_PATHSEP, cf->package_name, FILE_PATHSEP);
-#else
+#if defined (IS_FHS_OPT)
cf->ldif_dir = PR_smprintf("%s%cldif",
cf->datadir, FILE_PATHSEP);
+#else
+ cf->ldif_dir = PR_smprintf("%s%c%s%cldif",
+ cf->datadir, FILE_PATHSEP, cf->package_name, FILE_PATHSEP);
#endif
} else {
cf->ldif_dir = PL_strdup(temp);
@@ -4711,16 +4711,16 @@
temp = ds_a_get_cgi_var("tmp_dir", NULL, NULL);
if (NULL == temp) {
-#if defined (IS_FHS)
- cf->tmp_dir = PR_smprintf("%s%ctmp%c%s%c%s-%s",
- cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
- cf->package_name, FILE_PATHSEP,
- PRODUCT_NAME, cf->servid);
-#else
+#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);
+#else
+ cf->tmp_dir = PR_smprintf("%s%ctmp%c%s%c%s-%s",
+ cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
+ cf->package_name, FILE_PATHSEP,
+ PRODUCT_NAME, cf->servid);
#endif
} else {
cf->tmp_dir = PL_strdup(temp);
More information about the Fedora-directory-commits
mailing list