Attachment 153468 Details for Bug 236612 – Additional Diffs

[patch] Additional Diffs

diffs.txt (text/plain), 12.44 KB, created by Nathan Kinder on 2007-04-25 23:13:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan Kinder

Created: 2007-04-25 23:13:15 UTC

Size: 12.44 KB

patch

obsolete

>Index: config.h.in
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/config.h.in,v
>retrieving revision 1.5
>diff -u -5 -t -r1.5 config.h.in
>--- config.h.in	22 Feb 2007 23:59:13 -0000	1.5
>+++ config.h.in	25 Apr 2007 22:59:57 -0000
>@@ -239,10 +239,13 @@
> #undef HPUX11_23
> 
> /* Use FHS layout */
> #undef IS_FHS
> 
>+/* Use FHS optional layout */
>+#undef IS_FHS_OPT
>+
> /* LDAP debug flag */
> #undef LDAP_DEBUG
> 
> /* Don't use smartheap */
> #undef LDAP_DONT_USE_SMARTHEAP
>Index: configure.ac
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/configure.ac,v
>retrieving revision 1.26
>diff -u -5 -t -r1.26 configure.ac
>--- configure.ac	24 Apr 2007 18:02:15 -0000	1.26
>+++ configure.ac	25 Apr 2007 23:00:06 -0000
>@@ -129,45 +129,44 @@
> # installation paths - by default, we store everything
> # under the prefix.  The with-fhs option will use /usr,
> # /etc, and /var.  The with-fhs-opt option will use the
> # prefix, but it's sysconfdir and localstatedir will be
> # /etc/opt, and /var/opt.
>-if test "$with_fhs" = "yes"; then
>-  ac_default_prefix=/usr
>-  prefix=$ac_default_prefix
>-  exec_prefix=$prefix
>-dnl as opposed to the default /usr/etc
>-  sysconfdir='/etc'
>-dnl as opposed to the default /usr/var
>-  localstatedir='/var'
>+if test "$with_fhs_opt" = "yes"; then
>+  # Override sysconfdir and localstatedir if FHS optional
>+  # package was requested.
>+  sysconfdir='/etc/opt'
>+  localstatedir='/var/opt'
>   # relative to datadir
>-  sampledatadir=/$PACKAGE_NAME/data
>+  sampledatadir=/data
>   # relative to datadir
>-  scripttemplatedir=/$PACKAGE_NAME/script-templates
>+  scripttemplatedir=/script-templates
>   # relative to libdir
>-  serverdir=/$PACKAGE_NAME
>+  serverdir=
>   # relative to libdir
>-  serverplugindir=/$PACKAGE_NAME/plugins
>+  serverplugindir=/plugins
> else
>-  if test "$with_fhs_opt" = "yes"; then
>-    # Override sysconfdir and localstatedir if FHS optional
>-    # package was requested.
>-    sysconfdir='/etc/opt'
>-    localstatedir='/var/opt'
>+  if test "$with_fhs" = "yes"; then
>+    ac_default_prefix=/usr
>+    prefix=$ac_default_prefix
>+    exec_prefix=$prefix
>+    dnl as opposed to the default /usr/etc
>+    sysconfdir='/etc'
>+    dnl as opposed to the default /usr/var
>+    localstatedir='/var'
>   fi
>-  # Paths for default layout
>   # relative to datadir
>-  sampledatadir=/data
>+  sampledatadir=/$PACKAGE_NAME/data
>   # relative to datadir
>-  scripttemplatedir=/script-templates
>+  scripttemplatedir=/$PACKAGE_NAME/script-templates
>   # relative to libdir
>-  serverdir=
>+  serverdir=/$PACKAGE_NAME
>   # relative to libdir
>-  serverplugindir=/plugins
>+  serverplugindir=/$PACKAGE_NAME/plugins
> fi
> 
>-# Shared paths for both FHS and default layouts
>+# Shared paths for all layouts
> # relative to sysconfdir
> configdir=/$PACKAGE_NAME/config
> # relative to sysconfdir
> propertydir=/$PACKAGE_NAME/property
> # relative to sysconfdir
>Index: ldap/admin/src/create_instance.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
>retrieving revision 1.54
>diff -u -5 -t -r1.54 create_instance.c
>--- ldap/admin/src/create_instance.c	24 Apr 2007 18:02:15 -0000	1.54
>+++ ldap/admin/src/create_instance.c	25 Apr 2007 23:00:12 -0000
>@@ -707,17 +707,17 @@
>     if (PR_FAILURE == PR_Access(cs_path, PR_ACCESS_EXISTS)) {
>         printf("Notice: %s does not exist, skipping %s . . .\n", cs_path, name);
>         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);
> #ifdef USE_NSPERL
>     PR_snprintf(myperl, sizeof(myperl), "!%s%cbin%cslapd%cadmin%cbin%cperl",
>@@ -4369,15 +4369,15 @@
>         cf->prefix = PL_strdup(prefix); /* value of NETSITE_ROOT */
>     } else {
>         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);
>     if (NULL != temp) {
>         /* if sasl_path is given, we set it in the conf file regardless of
>@@ -4391,14 +4391,14 @@
>     {
>         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
>+#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",
>                                           "Please give a hostname for your server.")))
>     {
>@@ -4608,87 +4608,87 @@
>         cf->schema_dir = PL_strdup(temp);
>     }
> 
>     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);
>     }
> 
>     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);
>     }
> 
>     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);
>     }
>     /* set run dir to the environment variable DS_RUN_DIR */
>     ds_set_run_dir(cf->run_dir);
> 
>     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
>     } 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,
>+#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
>     } else {
>         cf->bak_dir = PL_strdup(temp);
>@@ -4696,33 +4696,33 @@
>     /* set bak dir to the environment variable DS_BAK_DIR */
>     ds_set_bak_dir(cf->bak_dir);
> 
>     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);
>     }
> 
>     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);
>     }
>     /* set tmp dir to the environment variable DS_TMP_DIR */
>Index: m4/fhs.m4
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/m4/fhs.m4,v
>retrieving revision 1.2
>diff -u -5 -t -r1.2 fhs.m4
>--- m4/fhs.m4	24 Apr 2007 18:02:21 -0000	1.2
>+++ m4/fhs.m4	25 Apr 2007 23:00:13 -0000
>@@ -40,8 +40,12 @@
>   with_fhs_opt=yes
>   AC_MSG_RESULT(yes)
> ],
> AC_MSG_RESULT(no))
> 
>+if test "$with_fhs_opt" = "yes"; then
>+  AC_DEFINE([IS_FHS_OPT], [1], [Use FHS optional layout])
>+fi
>+
> if test "$with_fhs" = "yes" -a "$with_fhs_opt" = "yes"; then
>   AC_MSG_ERROR([Can't set both --with-fhs and --with-fhs-opt.  Please only use one of these options.])
> fi

Actions: View | Diff

Attachments on bug 236612: 152711 | 152861 | 153468