[Fedora-directory-commits] ldapserver/ldap/admin/src create_instance.c, 1.53, 1.54
Nathan Kinder (nkinder)
fedora-directory-commits at redhat.com
Tue Apr 24 18:02:23 UTC 2007
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19382/ldap/admin/src
Modified Files:
create_instance.c
Log Message:
Resolves: 236612
Summary: Added a configure option for FHS optional software layout style.
Index: create_instance.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- create_instance.c 3 Apr 2007 23:07:43 -0000 1.53
+++ create_instance.c 24 Apr 2007 18:02:15 -0000 1.54
@@ -709,9 +709,14 @@
return NULL;
}
+#if defined (IS_FHS)
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);
#ifdef USE_NSPERL
@@ -4366,8 +4371,13 @@
prefix = cf->prefix = PL_strdup("/");
}
+#if defined (IS_FHS)
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);
if (NULL != temp) {
/* if sasl_path is given, we set it in the conf file regardless of
@@ -4382,7 +4392,12 @@
cf->sasl_path = PR_smprintf("%s%s%csasl2", prefix, LIBDIR, FILE_PATHSEP);
}
#endif
+
+#if defined (IS_FHS)
cf->plugin_dir = PR_smprintf("%s%cplugins", cf->sroot, FILE_PATHSEP);
+#else
+ cf->plugin_dir = PR_smprintf("%s%s%cplugins", prefix, LIBDIR, FILE_PATHSEP);
+#endif
if (!(cf->servname = ds_a_get_cgi_var("servname", "Server Name",
"Please give a hostname for your server.")))
@@ -4595,29 +4610,50 @@
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
+ 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);
+#endif
} else {
cf->lock_dir = PL_strdup(temp);
}
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
+ 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);
+#endif
} else {
cf->log_dir = PL_strdup(temp);
}
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
+ 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);
+#endif
} else {
cf->run_dir = PL_strdup(temp);
}
@@ -4626,20 +4662,34 @@
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,
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->package_name, FILE_PATHSEP,
+ PRODUCT_NAME, cf->servid, FILE_PATHSEP);
+#endif
} else {
cf->db_dir = PL_strdup(temp);
}
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,
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->package_name, FILE_PATHSEP,
+ PRODUCT_NAME, cf->servid, FILE_PATHSEP);
+#endif
} else {
cf->bak_dir = PL_strdup(temp);
}
@@ -4648,18 +4698,30 @@
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
+ cf->ldif_dir = PR_smprintf("%s%cldif",
+ cf->datadir, FILE_PATHSEP);
+#endif
} else {
cf->ldif_dir = PL_strdup(temp);
}
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
+ 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);
+#endif
} else {
cf->tmp_dir = PL_strdup(temp);
}
More information about the Fedora-directory-commits
mailing list