Attachment 146494 Details for Bug 224291 – new diffs

[patch] new diffs

cvsdiffs (text/plain), 3.59 KB, created by Rich Megginson on 2007-01-25 03:29:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-01-25 03:29:19 UTC

Size: 3.59 KB

patch

obsolete

>Index: ldapserver/configure.ac
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/configure.ac,v
>retrieving revision 1.12
>diff -u -8 -r1.12 configure.ac
>--- ldapserver/configure.ac	12 Jan 2007 16:18:15 -0000	1.12
>+++ ldapserver/configure.ac	25 Jan 2007 03:27:52 -0000
>@@ -125,17 +125,17 @@
> # relative to sysconfdir
> propertydir=/fedora-ds/property
> # relative to sysconfdir
> schemadir=/fedora-ds/schema
> # relative to libdir
> serverdir=/fedora-ds
> # relative to libdir
> serverplugindir=/fedora-ds/plugins
>-# relative to sysconfdir
>+# relative to datadir
> scripttemplatedir=/fedora-ds/script-templates
> AC_SUBST(configdir)
> AC_SUBST(sampledatadir)
> AC_SUBST(propertydir)
> AC_SUBST(schemadir)
> AC_SUBST(serverdir)
> AC_SUBST(serverplugindir)
> AC_SUBST(scripttemplatedir)
>Index: ldapserver/Makefile.am
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
>retrieving revision 1.15
>diff -u -8 -r1.15 Makefile.am
>--- ldapserver/Makefile.am	12 Jan 2007 16:18:14 -0000	1.15
>+++ ldapserver/Makefile.am	25 Jan 2007 03:27:52 -0000
>@@ -55,17 +55,17 @@
> # Install Paths
> #------------------------
> configdir = $(sysconfdir)@configdir@
> sampledatadir = $(datadir)@sampledatadir@
> propertydir = $(sysconfdir)@propertydir@
> schemadir = $(sysconfdir)@schemadir@
> serverdir = $(libdir)@serverdir@
> serverplugindir = $(libdir)@serverplugindir@
>-taskdir = $(sysconfdir)@scripttemplatedir@
>+taskdir = $(datadir)@scripttemplatedir@
> 
> #------------------------
> # Build Products
> #------------------------
> server_PROGRAMS = dbscan-bin ds_newinst-bin dsktune-bin ldap-agent-bin ldif-bin \
> 	migratecred-bin mmldif-bin ns-slapd pwdhash-bin
> 
> bin_PROGRAMS = infadd-bin ldclt-bin rsearch-bin
>Index: ldapserver/ldap/admin/src/create_instance.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
>retrieving revision 1.39
>diff -u -8 -r1.39 create_instance.c
>--- ldapserver/ldap/admin/src/create_instance.c	12 Dec 2006 06:39:17 -0000	1.39
>+++ ldapserver/ldap/admin/src/create_instance.c	25 Jan 2007 03:27:56 -0000
>@@ -703,17 +703,17 @@
>     const char *table[16][2];
> 
>     if (PR_FAILURE == PR_Access(cs_path, PR_ACCESS_EXISTS)) {
>         printf("Notice: %s does not exist, skipping %s . . .\n", cs_path, name);
>         return NULL;
>     }
> 
>     PR_snprintf(ofn, sizeof(ofn), "%s%c%s%cscript-templates%ctemplate-%s",
>-            cf->sysconfdir, FILE_PATHSEP, cf->brand_ds,
>+            cf->datadir, FILE_PATHSEP, cf->brand_ds,
>             FILE_PATHSEP, FILE_PATHSEP, name);
>     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",
>             cf->prefix, FILE_PATHSEP, FILE_PATHSEP,
>             FILE_PATHSEP, FILE_PATHSEP, FILE_PATHSEP);
> #else
>@@ -769,17 +769,17 @@
> {
>     char myperl[PATH_SIZE];
>     char fn[PATH_SIZE], ofn[PATH_SIZE];
>     const char *table[16][2];
>     char *fnp = NULL;
>     int fnlen = 0;
> 
>     PR_snprintf(ofn, sizeof(ofn), "%s%c%s%cscript-templates%ctemplate-%s",
>-            cf->sysconfdir, FILE_PATHSEP, cf->brand_ds,
>+            cf->datadir, FILE_PATHSEP, cf->brand_ds,
>             FILE_PATHSEP, FILE_PATHSEP, name);
>     PR_snprintf(fn, sizeof(fn),   "%s%c%s%cbin",
>             cf->sysconfdir, FILE_PATHSEP, cf->brand_ds, FILE_PATHSEP);
>     create_instance_mkdir(fn, NEWDIR_MODE);
>     fnlen = strlen(fn);
>     fnp = fn + fnlen;
>     PR_snprintf(fnp, sizeof(fn) - fnlen,   "%c%s", FILE_PATHSEP, name);
>

Actions: View | Diff

Attachments on bug 224291: 146493 | 146494 | 146578