Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 147570 Details for
Bug 227618
FHS: move exes to _bindir; move ns-slapd to _sbindir
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
diffs
cvsdiffs (text/plain), 59.66 KB, created by
Rich Megginson
on 2007-02-07 17:05:10 UTC
(
hide
)
Description:
diffs
Filename:
MIME Type:
Creator:
Rich Megginson
Created:
2007-02-07 17:05:10 UTC
Size:
59.66 KB
patch
obsolete
>Index: ldapserver/Makefile.am >=================================================================== >RCS file: /cvs/dirsec/ldapserver/Makefile.am,v >retrieving revision 1.20 >diff -u -8 -r1.20 Makefile.am >--- ldapserver/Makefile.am 6 Feb 2007 15:51:22 -0000 1.20 >+++ ldapserver/Makefile.am 7 Feb 2007 16:53:34 -0000 >@@ -15,17 +15,19 @@ > # the values are quoted for the shell command, and the value expands to a quoted string > # value in the header file e.g. > # #define LOCALSTATEDIR "/var" > # without the quotes, it would be > # #define LOCALSTATEDIR /var > # which would be an error > PATH_DEFINES = -DLOCALSTATEDIR="\"$(localstatedir)\"" -DSYSCONFDIR="\"$(sysconfdir)\"" \ > -DLIBDIR="\"$(libdir)\"" -DBINDIR="\"$(bindir)\"" \ >- -DDATADIR="\"$(datadir)\"" -DDOCDIR="\"$(docdir)\"" >+ -DDATADIR="\"$(datadir)\"" -DDOCDIR="\"$(docdir)\"" \ >+ -DSBINDIR="\"$(sbindir)\"" >+ > AM_CPPFLAGS = $(DEBUG_DEFINES) $(DS_DEFINES) $(DS_INCLUDES) $(PATH_DEFINES) > PLUGIN_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@ > > #------------------------ > # Linker Flags > #------------------------ > NSPR_LINK = @nspr_lib@ -lplc4 -lplds4 -lnspr4 > NSS_LINK = @nss_lib@ -lssl3 -lnss3 -lsoftokn3 >@@ -63,25 +65,25 @@ > schemadir = $(sysconfdir)@schemadir@ > serverdir = $(libdir)@serverdir@ > serverplugindir = $(libdir)@serverplugindir@ > 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 >+sbin_PROGRAMS = ns-slapd > >-bin_PROGRAMS = infadd-bin ldclt-bin rsearch-bin >+bin_PROGRAMS = infadd-bin ldclt-bin rsearch-bin dbscan-bin ds_newinst-bin \ >+ dsktune-bin ldap-agent-bin ldif-bin migratecred-bin mmldif-bin pwdhash-bin > >-server_LTLIBRARIES = libslapd.la libback-ldbm.la libds_admin.la libns-dshttpd.la >+server_LTLIBRARIES = libslapd.la libds_admin.la libns-dshttpd.la > >-serverplugin_LTLIBRARIES = libacl-plugin.la libattr-unique-plugin.la libchainingdb-plugin.la \ >- libcos-plugin.la libdes-plugin.la libdistrib-plugin.la \ >+serverplugin_LTLIBRARIES = libback-ldbm.la libacl-plugin.la libattr-unique-plugin.la \ >+ libchainingdb-plugin.la libcos-plugin.la libdes-plugin.la libdistrib-plugin.la \ > libhttp-client-plugin.la libcollation-plugin.la libpam-passthru-plugin.la \ > libpassthru-plugin.la libpresence-plugin.la libpwdstorage-plugin.la \ > libreferint-plugin.la libreplication-plugin.la libretrocl-plugin.la \ > libroles-plugin.la libstatechange-plugin.la libsyntax-plugin.la \ > libviews-plugin.la libdna-plugin.la > > nodist_property_DATA = ns-slapd.properties > >@@ -124,19 +126,18 @@ > $(srcdir)/ldap/schema/50ns-value.ldif \ > $(srcdir)/ldap/schema/50ns-web.ldif \ > $(srcdir)/ldap/schema/60pam-plugin.ldif \ > $(srcdir)/ldap/schema/99user.ldif > > bin_SCRIPTS = $(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl \ > wrappers/infadd \ > wrappers/ldclt \ >- wrappers/rsearch >- >-server_SCRIPTS = wrappers/dbscan \ >+ wrappers/rsearch \ >+ wrappers/dbscan \ > wrappers/dsktune \ > wrappers/ds_newinst \ > wrappers/ldap-agent \ > wrappers/ldif \ > wrappers/migratecred \ > wrappers/mmldif \ > wrappers/pwdhash \ > $(srcdir)/ldap/admin/src/logconv.pl \ >@@ -396,17 +397,17 @@ > $(libavl_a_SOURCES) > > libslapd_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @db_inc@ @svrcore_inc@ > libslapd_la_LIBADD = $(LDAPSDK_LINK) $(NSS_LINK) $(NSPR_LINK) > > > #//////////////////////////////////////////////////////////////// > # >-# Backend Plugins >+# Plugins > # > #//////////////////////////////////////////////////////////////// > #------------------------ > # libback-ldbm > #------------------------ > libback_ldbm_la_SOURCES = ldap/servers/slapd/back-ldbm/ancestorid.c \ > ldap/servers/slapd/back-ldbm/archive.c \ > ldap/servers/slapd/back-ldbm/backentry.c \ >@@ -463,23 +464,18 @@ > ldap/servers/slapd/back-ldbm/uniqueid2entry.c \ > ldap/servers/slapd/back-ldbm/upgrade.c \ > ldap/servers/slapd/back-ldbm/vlv.c \ > ldap/servers/slapd/back-ldbm/vlv_key.c \ > ldap/servers/slapd/back-ldbm/vlv_srch.c > > libback_ldbm_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @db_inc@ > libback_ldbm_la_LIBADD = libslapd.la $(DB_LINK) >+libback_ldbm_la_LDFLAGS = -avoid-version > >- >-#//////////////////////////////////////////////////////////////// >-# >-# Plugins >-# >-#//////////////////////////////////////////////////////////////// > #------------------------ > # libacl-plugin > #------------------------ > libacl_plugin_la_SOURCES = ldap/servers/plugins/acl/acl.c \ > ldap/servers/plugins/acl/acl_ext.c \ > ldap/servers/plugins/acl/aclanom.c \ > ldap/servers/plugins/acl/acleffectiverights.c \ > ldap/servers/plugins/acl/aclgroup.c \ >@@ -488,25 +484,27 @@ > ldap/servers/plugins/acl/acllist.c \ > ldap/servers/plugins/acl/aclparse.c \ > ldap/servers/plugins/acl/aclplugin.c \ > ldap/servers/plugins/acl/aclproxy.c \ > ldap/servers/plugins/acl/aclutil.c > > libacl_plugin_la_CPPFLAGS = -I$(srcdir)/include/libaccess $(PLUGIN_CPPFLAGS) > libacl_plugin_la_LIBADD = libns-dshttpd.la >+libacl_plugin_la_LDFLAGS = -avoid-version > > #------------------------ > # libattr-unique-plugin > #------------------------ > libattr_unique_plugin_la_SOURCES = ldap/servers/plugins/uiduniq/7bit.c \ > ldap/servers/plugins/uiduniq/uid.c \ > ldap/servers/plugins/shared/utils.c > > libattr_unique_plugin_la_CPPFLAGS = -I$(srcdir)/ldap/servers/plugins/shared $(PLUGIN_CPPFLAGS) >+libattr_unique_plugin_la_LDFLAGS = -avoid-version > > #------------------------ > # libchainingdb-plugin > #------------------------ > libchainingdb_plugin_la_SOURCES = ldap/servers/plugins/chainingdb/cb_abandon.c \ > ldap/servers/plugins/chainingdb/cb_acl.c \ > ldap/servers/plugins/chainingdb/cb_add.c \ > ldap/servers/plugins/chainingdb/cb_bind.c \ >@@ -528,108 +526,119 @@ > ldap/servers/plugins/chainingdb/cb_size.c \ > ldap/servers/plugins/chainingdb/cb_start.c \ > ldap/servers/plugins/chainingdb/cb_temp.c \ > ldap/servers/plugins/chainingdb/cb_test.c \ > ldap/servers/plugins/chainingdb/cb_unbind.c \ > ldap/servers/plugins/chainingdb/cb_utils.c > > libchainingdb_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) >+libchainingdb_plugin_la_LDFLAGS = -avoid-version > > #------------------------ > # libcos-plugin > #------------------------ > libcos_plugin_la_SOURCES = ldap/servers/plugins/cos/cos.c \ > ldap/servers/plugins/cos/cos_cache.c > > libcos_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) >+libcos_plugin_la_LDFLAGS = -avoid-version > > #------------------------ > # libdes-plugin > #----------------------- > libdes_plugin_la_SOURCES = ldap/servers/plugins/rever/des.c \ > ldap/servers/plugins/rever/rever.c > > libdes_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @svrcore_inc@ >+libdes_plugin_la_LDFLAGS = -avoid-version > > #------------------------ > # libdistrib-plugin > #------------------------ > libdistrib_plugin_la_SOURCES = ldap/servers/plugins/distrib/distrib.c > > libdistrib_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) >+libdistrib_plugin_la_LDFLAGS = -avoid-version > > #------------------------ > # libhttp-client-plugin > #------------------------ > libhttp_client_plugin_la_SOURCES = ldap/servers/plugins/http/http_client.c \ > ldap/servers/plugins/http/http_impl.c > > libhttp_client_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) >+libhttp_client_plugin_la_LDFLAGS = -avoid-version > > #------------------------ > # libcollation-plugin > #------------------------ > libcollation_plugin_la_SOURCES = ldap/servers/plugins/collation/collate.c \ > ldap/servers/plugins/collation/config.c \ > ldap/servers/plugins/collation/orfilter.c > > libcollation_plugin_la_CPPFLAGS = @icu_inc@ $(PLUGIN_CPPFLAGS) > libcollation_plugin_la_LIBADD = $(ICU_LINK) >+libcollation_plugin_la_LDFLAGS = -avoid-version > > #------------------------ > # libpam-passthru-plugin > #------------------------ > libpam_passthru_plugin_la_SOURCES = ldap/servers/plugins/pam_passthru/pam_ptconfig.c \ > ldap/servers/plugins/pam_passthru/pam_ptdebug.c \ > ldap/servers/plugins/pam_passthru/pam_ptimpl.c \ > ldap/servers/plugins/pam_passthru/pam_ptpreop.c > > libpam_passthru_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) > libpam_passthru_plugin_la_LIBADD = $(PAM_LINK) >+libpam_passthru_plugin_la_LDFLAGS = -avoid-version > > #------------------------ > # libpassthru-plugin > #------------------------ > libpassthru_plugin_la_SOURCES = ldap/servers/plugins/passthru/ptbind.c \ > ldap/servers/plugins/passthru/ptconfig.c \ > ldap/servers/plugins/passthru/ptconn.c \ > ldap/servers/plugins/passthru/ptdebug.c \ > ldap/servers/plugins/passthru/ptpreop.c \ > ldap/servers/plugins/passthru/ptutil.c > > libpassthru_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) >+libpassthru_plugin_la_LDFLAGS = -avoid-version > > #------------------------ > # libpresence-plugin > #------------------------ > libpresence_plugin_la_SOURCES = ldap/servers/plugins/presence/presence.c > > libpresence_plugin_la_CPPFLAGS = -I$(srcdir)/ldap/servers/plugins/http $(PLUGIN_CPPFLAGS) >+libpresence_plugin_la_LDFLAGS = -avoid-version > > #------------------------ > # libpwdstorage-plugin > #------------------------ > libpwdstorage_plugin_la_SOURCES = ldap/servers/plugins/pwdstorage/clear_pwd.c \ > ldap/servers/plugins/pwdstorage/crypt_pwd.c \ > ldap/servers/plugins/pwdstorage/md5_pwd.c \ > ldap/servers/plugins/pwdstorage/md5c.c \ > ldap/servers/plugins/pwdstorage/ns-mta-md5_pwd.c \ > ldap/servers/plugins/pwdstorage/pwd_init.c \ > ldap/servers/plugins/pwdstorage/sha_pwd.c \ > ldap/servers/plugins/pwdstorage/ssha_pwd.c > > libpwdstorage_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) >+libpwdstorage_plugin_la_LDFLAGS = -avoid-version > > #------------------------ > # libreferint-plugin > #------------------------ > libreferint_plugin_la_SOURCES = ldap/servers/plugins/referint/referint.c > > libreferint_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) >+libreferint_plugin_la_LDFLAGS = -avoid-version > > #------------------------ > # libreplication-plugin > #------------------------ > libreplication_plugin_la_SOURCES = ldap/servers/plugins/replication/cl5_api.c \ > ldap/servers/plugins/replication/cl5_clcache.c \ > ldap/servers/plugins/replication/cl5_config.c \ > ldap/servers/plugins/replication/cl5_init.c \ >@@ -681,43 +690,47 @@ > ldap/servers/plugins/replication/windows_connection.c \ > ldap/servers/plugins/replication/windows_inc_protocol.c \ > ldap/servers/plugins/replication/windows_private.c \ > ldap/servers/plugins/replication/windows_protocol_util.c \ > ldap/servers/plugins/replication/windows_tot_protocol.c > > libreplication_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @icu_inc@ @db_inc@ > libreplication_plugin_la_LIBADD = $(ICU_LINK) $(DB_LINK) >+libreplication_plugin_la_LDFLAGS = -avoid-version > > #------------------------ > # libretrocl-plugin > #------------------------ > libretrocl_plugin_la_SOURCES = ldap/servers/plugins/retrocl/retrocl.c \ > ldap/servers/plugins/retrocl/retrocl_cn.c \ > ldap/servers/plugins/retrocl/retrocl_create.c \ > ldap/servers/plugins/retrocl/retrocl_po.c \ > ldap/servers/plugins/retrocl/retrocl_rootdse.c \ > ldap/servers/plugins/retrocl/retrocl_trim.c > > libretrocl_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) >+libretrocl_plugin_la_LDFLAGS = -avoid-version > > #------------------------ > # libroles-plugin > #------------------------ > libroles_plugin_la_SOURCES = ldap/servers/plugins/roles/roles_cache.c \ > ldap/servers/plugins/roles/roles_plugin.c > > libroles_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) >+libroles_plugin_la_LDFLAGS = -avoid-version > > #------------------------ > # libstatechange-plugin > #------------------------ > libstatechange_plugin_la_SOURCES = ldap/servers/plugins/statechange/statechange.c > > libstatechange_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) >+libstatechange_plugin_la_LDFLAGS = -avoid-version > > #------------------------ > # libsyntax-plugin > #------------------------ > libsyntax_plugin_la_SOURCES = ldap/servers/plugins/syntaxes/bin.c \ > ldap/servers/plugins/syntaxes/ces.c \ > ldap/servers/plugins/syntaxes/cis.c \ > ldap/servers/plugins/syntaxes/debug.c \ >@@ -725,30 +738,33 @@ > ldap/servers/plugins/syntaxes/int.c \ > ldap/servers/plugins/syntaxes/phonetic.c \ > ldap/servers/plugins/syntaxes/sicis.c \ > ldap/servers/plugins/syntaxes/string.c \ > ldap/servers/plugins/syntaxes/tel.c \ > ldap/servers/plugins/syntaxes/value.c > > libsyntax_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) >+libsyntax_plugin_la_LDFLAGS = -avoid-version > > #------------------------ > # libviews-plugin > #------------------------ > libviews_plugin_la_SOURCES = ldap/servers/plugins/views/views.c > > libviews_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) >+libviews_plugin_la_LDFLAGS = -avoid-version > > #------------------------ > # libdna-plugin > #------------------------ > libdna_plugin_la_SOURCES = ldap/servers/plugins/dna/dna.c > > libdna_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) >+libdna_plugin_la_LDFLAGS = -avoid-version > > > #//////////////////////////////////////////////////////////////// > # > # Programs > # > #//////////////////////////////////////////////////////////////// > #------------------------ >@@ -906,16 +922,17 @@ > # these are for the config files and scripts that we need to generate and replace > # the paths and other tokens with the real values set during configure/make > # note that we cannot just use AC_OUTPUT to do this for us, since it will do things like this: > # LD_LIBRARY_PATH = ${prefix}/lib/fedora-ds > # i.e. it literally copies in '${prefix}' rather than expanding it out - we want this instead: > # LD_LIBRARY_PATH = /usr/lib/fedora-ds > fixupcmd = sed \ > -e 's,@bindir\@,$(bindir),g' \ >+ -e 's,@sbindir\@,$(sbindir),g' \ > -e 's,@libdir\@,$(libdir),g' \ > -e 's,@nspr_libdir\@,$(nspr_libdir),g' \ > -e 's,@nss_libdir\@,$(nss_libdir),g' \ > -e 's,@ldapsdk_libdir\@,$(ldapsdk_libdir),g' \ > -e 's,@ldapsdk_bindir\@,$(ldapsdk_bindir),g' \ > -e 's,@db_libdir\@,$(db_libdir),g' \ > -e 's,@db_bindir\@,$(db_bindir),g' \ > -e 's,@sasl_libdir\@,$(sasl_libdir),g' \ >Index: ldapserver/ldap/admin/src/create_instance.c >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v >retrieving revision 1.41 >diff -u -8 -r1.41 create_instance.c >--- ldapserver/ldap/admin/src/create_instance.c 26 Jan 2007 20:00:40 -0000 1.41 >+++ ldapserver/ldap/admin/src/create_instance.c 7 Feb 2007 16:53:38 -0000 >@@ -307,16 +307,17 @@ > conf->use_existing_config_ds = 0; > conf->use_existing_user_ds = 0; > conf->consumerdn = NULL; > conf->disable_schema_checking = NULL; > conf->install_ldif_file = NULL; > > conf->bak_dir = NULL; > conf->config_dir = NULL; >+ conf->sbindir = NULL; > conf->datadir = NULL; > conf->db_dir = NULL; > conf->docdir = NULL; > conf->inst_dir = NULL; > conf->ldif_dir = NULL; > conf->lock_dir = NULL; > conf->log_dir = NULL; > conf->plugin_dir = NULL; >@@ -695,17 +696,17 @@ > return NULL; > } > > char *gen_script_auto(char *s_root, char *cs_path, > char *name, server_config_s *cf) > { > char myperl[PATH_SIZE]; > char fn[PATH_SIZE], ofn[PATH_SIZE]; >- const char *table[16][2]; >+ const char *table[17][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->datadir, FILE_PATHSEP, cf->brand_ds, >@@ -751,17 +752,19 @@ > table[11][0] = "SERVER-DIR"; > table[11][1] = cf->sroot; > table[12][0] = "CONFIG-DIR"; > table[12][1] = cf->config_dir; > table[13][0] = "RUN-DIR"; > table[13][1] = cf->run_dir; > table[14][0] = "PRODUCT-NAME"; > table[14][1] = PRODUCT_NAME; >- table[15][0] = table[15][1] = NULL; >+ table[15][0] = "SERVERBIN-DIR"; >+ table[15][1] = cf->sbindir; >+ table[16][0] = table[16][1] = NULL; > > if (generate_script(ofn, fn, NEWSCRIPT_MODE, table) != 0) { > return make_error("Could not write %s to %s (%s).", ofn, fn, > ds_system_errmsg()); > } > > return NULL; > } >@@ -3214,17 +3217,17 @@ > #endif /* NO PAM FOR WINDOWS */ > #endif /* BUILD_PAM_PASSTHRU */ > > fprintf(f, "dn: cn=ldbm database,cn=plugins,cn=config\n"); > fprintf(f, "objectclass: top\n"); > fprintf(f, "objectclass: nsSlapdPlugin\n"); > fprintf(f, "objectclass: extensibleObject\n"); > fprintf(f, "cn: ldbm database\n"); >- fprintf(f, "nsslapd-pluginpath: %s/libback-ldbm%s\n", cf->sroot, shared_lib); >+ fprintf(f, "nsslapd-pluginpath: %s/libback-ldbm%s\n", cf->plugin_dir, shared_lib); > fprintf(f, "nsslapd-plugininitfunc: ldbm_back_init\n"); > fprintf(f, "nsslapd-plugintype: database\n"); > fprintf(f, "nsslapd-pluginenabled: on\n"); > fprintf(f, "nsslapd-plugin-depends-on-type: Syntax\n"); > fprintf(f, "nsslapd-plugin-depends-on-type: matchingRule\n"); > fprintf(f, "\n"); > > if (strlen(cf->suffix) == 0){ >@@ -4224,16 +4227,17 @@ > /* ------ Parse the results of a form and create a server from them ------- */ > /* > * FHS description > * cf->prefix: %{_prefix} > * cf->sroot: %{_libdir}/BRAND_DS > * cf->localstatedir: %{_localstatedir} > * cf->sysconfdir: %{_sysconfdir} > * cf->bindir: %{_bindir} >+ * cf->sbindir: %{_sbindir} > * cf->datadir: %{_datadir} > * cf->docdir: %{_docdir} > * cf->inst_dir: <sroot>/slapd-<servid> > * cf->config_dir: <localstatedir>/lib/BRAND_DS/slapd-<servid> > * cf->schema_dir: <localstatedir>/lib/BRAND_DS/slapd-<servid>/schema > * cf->lock_dir: <localstatedir>/lock/BRAND_DS/slapd-<servid> > * cf->log_dir: <localstatedir>/log/BRAND_DS/slapd-<servid> > * cf->run_dir: <localstatedir>/run/BRAND_DS (slapd-instance.pid slapd-instance.startpid files) >@@ -4456,16 +4460,17 @@ > > cf->adminport = ds_a_get_cgi_var("adminport", NULL, NULL); > > cf->install_ldif_file = ds_a_get_cgi_var("install_ldif_file", NULL, NULL); > > cf->localstatedir = set_path_attribute("localstatedir", LOCALSTATEDIR, prefix); > cf->sysconfdir = set_path_attribute("sysconfdir", SYSCONFDIR, prefix); > cf->bindir = set_path_attribute("bindir", BINDIR, prefix); >+ cf->sbindir = set_path_attribute("sbindir", SBINDIR, prefix); > cf->datadir = set_path_attribute("datadir", DATADIR, prefix); > cf->docdir = set_path_attribute("docdir", DOCDIR, prefix); > > 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); > } else { >Index: ldapserver/ldap/admin/src/create_instance.h >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.h,v >retrieving revision 1.13 >diff -u -8 -r1.13 create_instance.h >--- ldapserver/ldap/admin/src/create_instance.h 15 Nov 2006 17:17:39 -0000 1.13 >+++ ldapserver/ldap/admin/src/create_instance.h 7 Feb 2007 16:53:38 -0000 >@@ -69,52 +69,60 @@ > #endif > #if defined (IS_FHS) > #ifndef LIBDIR > #define LIBDIR "/usr/lib" > #endif > #ifndef BINDIR > #define BINDIR "/usr/bin" > #endif >+#ifndef SBINDIR >+#define SBINDIR "/usr/sbin" >+#endif > #ifndef DATADIR > #define DATADIR "/usr/share" > #endif > #ifndef DOCDIR > #define DOCDIR "/usr/doc" > #endif > #else /* RPM */ > #ifndef LIBDIR > #define LIBDIR "/lib" > #endif > #ifndef BINDIR > #define BINDIR "/bin" > #endif >+#ifndef SBINDIR >+#define SBINDIR "/sbin" >+#endif > #ifndef DATADIR > #define DATADIR "/share" > #endif > #ifndef DOCDIR > #define DOCDIR "/doc" > #endif > #endif /* IS_FHS */ > #else /* Windows */ > #define PRODUCT_NAME "slapd" > #define PRODUCT_BIN "slapd" > #define LOCALSTATEDIR "\\var" > #define SYSCONFDIR "\\etc" > #define LIBDIR "\\usr\\lib" > #define BINDIR "\\usr\\bin" >+#define SBINDIR "\\usr\\sbin" > #define DATADIR "\\usr\\share" > #define DOCDIR "\\usr\\doc" > #endif > > typedef struct { > char *sroot; /* _libdir */ > char *localstatedir; > char *sysconfdir; > char *bindir; >+ char *sbindir; > char *datadir; > char *docdir; > > char *brand_ds; > char *lang; > > char *servname; > char *bindaddr; >Index: ldapserver/ldap/admin/src/ds_newinst.pl >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_newinst.pl,v >retrieving revision 1.11 >diff -u -8 -r1.11 ds_newinst.pl >--- ldapserver/ldap/admin/src/ds_newinst.pl 10 Nov 2006 04:24:25 -0000 1.11 >+++ ldapserver/ldap/admin/src/ds_newinst.pl 7 Feb 2007 16:53:38 -0000 >@@ -185,16 +185,17 @@ > $cgiargs{"db_dir"} = $table{"slapd"}->{"db_dir"}; > $cgiargs{"bak_dir"} = $table{"slapd"}->{"bak_dir"}; > $cgiargs{"ldif_dir"} = $table{"slapd"}->{"ldif_dir"}; > $cgiargs{"tmp_dir"} = $table{"slapd"}->{"tmp_dir"}; > $cgiargs{"cert_dir"} = $table{"slapd"}->{"cert_dir"}; > $cgiargs{"localstatedir"} = $table{"slapd"}->{"localstatedir"}; > $cgiargs{"sysconfdir"} = $table{"slapd"}->{"sysconfdir"}; > $cgiargs{"bindir"} = $table{"slapd"}->{"bindir"}; >+$cgiargs{"sbindir"} = $table{"slapd"}->{"sbindir"}; > $cgiargs{"datadir"} = $table{"slapd"}->{"datadir"}; > $cgiargs{"docdir"} = $table{"slapd"}->{"docdir"}; > $cgiargs{"inst_dir"} = $table{"slapd"}->{"inst_dir"}; > $cgiargs{"config_dir"} = $table{"slapd"}->{"config_dir"}; > $cgiargs{"schema_dir"} = $table{"slapd"}->{"schema_dir"}; > $cgiargs{"sasl_path"} = $table{"slapd"}->{"sasl_path"}; > > # port number for Admin Server - used to configure some web apps >@@ -248,19 +249,23 @@ > > # if for some reason you do not want the server started after instance creation > # the following line can be commented out - NOTE that if you are creating the > # Configuration DS, it will be started anyway > $cgiargs{start_server} = 1; > > my $sroot = $cgiargs{sroot}; > >+my $prog = "/usr/bin/ds_newinst"; >+if (! -x $prog) { >+ $prog = "/usr/lib/$brand_ds/ds_newinst"; >+} >+ > my $rc = &cgiFake($sroot, $verbose, >- $prefix . "/usr/lib/$brand_ds/ds_newinst", >- \%cgiargs); >+ $prog, \%cgiargs); > > if (!$rc) { > print "Success! Your new directory server instance was created\n"; > } else { > print "Error: Could not create new directory server instance\n"; > } > > sub printhash { >Index: ldapserver/ldap/admin/src/ds_newinst.pl.in >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_newinst.pl.in,v >retrieving revision 1.1 >diff -u -8 -r1.1 ds_newinst.pl.in >--- ldapserver/ldap/admin/src/ds_newinst.pl.in 13 Nov 2006 23:45:44 -0000 1.1 >+++ ldapserver/ldap/admin/src/ds_newinst.pl.in 7 Feb 2007 16:53:38 -0000 >@@ -185,16 +185,17 @@ > $cgiargs{"db_dir"} = $table{"slapd"}->{"db_dir"}; > $cgiargs{"bak_dir"} = $table{"slapd"}->{"bak_dir"}; > $cgiargs{"ldif_dir"} = $table{"slapd"}->{"ldif_dir"}; > $cgiargs{"tmp_dir"} = $table{"slapd"}->{"tmp_dir"}; > $cgiargs{"cert_dir"} = $table{"slapd"}->{"cert_dir"}; > $cgiargs{"localstatedir"} = $table{"slapd"}->{"localstatedir"}; > $cgiargs{"sysconfdir"} = $table{"slapd"}->{"sysconfdir"}; > $cgiargs{"bindir"} = $table{"slapd"}->{"bindir"}; >+$cgiargs{"sbindir"} = $table{"slapd"}->{"sbindir"}; > $cgiargs{"datadir"} = $table{"slapd"}->{"datadir"}; > $cgiargs{"docdir"} = $table{"slapd"}->{"docdir"}; > $cgiargs{"inst_dir"} = $table{"slapd"}->{"inst_dir"}; > $cgiargs{"config_dir"} = $table{"slapd"}->{"config_dir"}; > $cgiargs{"schema_dir"} = $table{"slapd"}->{"schema_dir"}; > $cgiargs{"sasl_path"} = $table{"slapd"}->{"sasl_path"}; > > # port number for Admin Server - used to configure some web apps >@@ -248,19 +249,23 @@ > > # if for some reason you do not want the server started after instance creation > # the following line can be commented out - NOTE that if you are creating the > # Configuration DS, it will be started anyway > $cgiargs{start_server} = 1; > > my $sroot = $cgiargs{sroot}; > >+my $prog = "@bindir@/ds_newinst"; >+if (! -x $prog) { >+ $prog = "@libdir@/$brand_ds/ds_newinst"; >+} >+ > my $rc = &cgiFake($sroot, $verbose, >- "@libdir@/$brand_ds/ds_newinst", >- \%cgiargs); >+ $prog, \%cgiargs); > > if (!$rc) { > print "Success! Your new directory server instance was created\n"; > } else { > print "Error: Could not create new directory server instance\n"; > } > > sub printhash { >Index: ldapserver/ldap/admin/src/scripts/template-bak2db >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-bak2db,v >retrieving revision 1.1 >diff -u -8 -r1.1 template-bak2db >--- ldapserver/ldap/admin/src/scripts/template-bak2db 27 Oct 2006 16:45:18 -0000 1.1 >+++ ldapserver/ldap/admin/src/scripts/template-bak2db 7 Feb 2007 16:53:38 -0000 >@@ -1,14 +1,14 @@ > #!/bin/sh > > prefix="{{DS-ROOT}}" >-LD_LIBRARY_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec >+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec > export LD_LIBRARY_PATH >-SHLIB_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec >+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec > export SHLIB_PATH > > if [ $# -lt 1 ] || [ $# -gt 3 ] > then > echo "Usage: bak2db archivedir [-n backendname]" > exit 1 > else > archivedir=$1 >@@ -25,15 +25,15 @@ > if [ 1 = `expr $archivedir : "\/"` ] > then > archivedir=$archivedir > else > # relative > archivedir=`pwd`/$archivedir > fi > >-cd {{SERVER-DIR}} >+cd {{SERVERBIN-DIR}} > if [ "$#" -eq 2 ] > then > ./ns-slapd archive2db -D {{CONFIG-DIR}} -a $archivedir -n $bename > else > ./ns-slapd archive2db -D {{CONFIG-DIR}} -a $archivedir > fi >Index: ldapserver/ldap/admin/src/scripts/template-bak2db.in >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-bak2db.in,v >retrieving revision 1.3 >diff -u -8 -r1.3 template-bak2db.in >--- ldapserver/ldap/admin/src/scripts/template-bak2db.in 28 Nov 2006 17:13:48 -0000 1.3 >+++ ldapserver/ldap/admin/src/scripts/template-bak2db.in 7 Feb 2007 16:53:38 -0000 >@@ -1,15 +1,15 @@ > #!/bin/sh > > prefix="{{DS-ROOT}}" > if [ "$prefix" = "/" ] ; then > prefix="" > fi >-LD_LIBRARY_PATH=$prefix@nss_libdir@:$prefix@libdir@ >+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@ > if [ -n "$prefix" ] ; then > LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@" > fi > export LD_LIBRARY_PATH > SHLIB_PATH=$LD_LIBRARY_PATH > export SHLIB_PATH > > if [ $# -lt 1 ] || [ $# -gt 3 ] >@@ -31,15 +31,15 @@ > if [ 1 = `expr $archivedir : "\/"` ] > then > archivedir=$archivedir > else > # relative > archivedir=`pwd`/$archivedir > fi > >-cd {{SERVER-DIR}} >+cd {{SERVERBIN-DIR}} > if [ "$#" -eq 2 ] > then > ./ns-slapd archive2db -D {{CONFIG-DIR}} -a $archivedir -n $bename > else > ./ns-slapd archive2db -D {{CONFIG-DIR}} -a $archivedir > fi >Index: ldapserver/ldap/admin/src/scripts/template-db2bak >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2bak,v >retrieving revision 1.1 >diff -u -8 -r1.1 template-db2bak >--- ldapserver/ldap/admin/src/scripts/template-db2bak 27 Oct 2006 16:45:18 -0000 1.1 >+++ ldapserver/ldap/admin/src/scripts/template-db2bak 7 Feb 2007 16:53:38 -0000 >@@ -1,17 +1,17 @@ > #!/bin/sh > > prefix="{{DS-ROOT}}" >-LD_LIBRARY_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec >+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec > export LD_LIBRARY_PATH >-SHLIB_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec >+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec > export SHLIB_PATH > >-cd {{SERVER-DIR}} >+cd {{SERVERBIN-DIR}} > if [ "$#" -eq 1 ] > then > bak_dir=$1 > else > bak_dir={{BAK-DIR}}/`date +%Y_%m_%d_%H_%M_%S` > fi > > ./ns-slapd db2archive -D {{CONFIG-DIR}} -a $bak_dir >Index: ldapserver/ldap/admin/src/scripts/template-db2bak.in >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2bak.in,v >retrieving revision 1.3 >diff -u -8 -r1.3 template-db2bak.in >--- ldapserver/ldap/admin/src/scripts/template-db2bak.in 28 Nov 2006 17:13:48 -0000 1.3 >+++ ldapserver/ldap/admin/src/scripts/template-db2bak.in 7 Feb 2007 16:53:38 -0000 >@@ -1,23 +1,23 @@ > #!/bin/sh > > prefix="{{DS-ROOT}}" > if [ "$prefix" = "/" ] ; then > prefix="" > fi >-LD_LIBRARY_PATH=$prefix@nss_libdir@:$prefix@libdir@ >+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@ > if [ -n "$prefix" ] ; then > LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@" > fi > export LD_LIBRARY_PATH > SHLIB_PATH=$LD_LIBRARY_PATH > export SHLIB_PATH > >-cd {{SERVER-DIR}} >+cd {{SERVERBIN-DIR}} > if [ "$#" -eq 1 ] > then > bak_dir=$1 > else > bak_dir={{BAK-DIR}}/`date +%Y_%m_%d_%H_%M_%S` > fi > > ./ns-slapd db2archive -D {{CONFIG-DIR}} -a $bak_dir >Index: ldapserver/ldap/admin/src/scripts/template-db2index >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2index,v >retrieving revision 1.1 >diff -u -8 -r1.1 template-db2index >--- ldapserver/ldap/admin/src/scripts/template-db2index 27 Oct 2006 16:45:18 -0000 1.1 >+++ ldapserver/ldap/admin/src/scripts/template-db2index 7 Feb 2007 16:53:38 -0000 >@@ -1,17 +1,17 @@ > #!/bin/sh > > prefix="{{DS-ROOT}}" >-LD_LIBRARY_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec >+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec > export LD_LIBRARY_PATH >-SHLIB_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec >+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec > export SHLIB_PATH > >-cd {{SERVER-DIR}} >+cd {{SERVERBIN-DIR}} > if [ $# -eq 0 ] > then > bak_dir={{BAK-DIR}}/reindex_`date +%Y_%m_%d_%H_%M_%S` > ./ns-slapd upgradedb -D {{CONFIG-DIR}} -f -a "$bak_dir" > elif [ $# -lt 4 ] > then > echo "Usage: db2index [-n backend_instance | {-s includesuffix}* -t attribute[:indextypes[:matchingrules]] -T vlvattribute]" > exit 1 >Index: ldapserver/ldap/admin/src/scripts/template-db2index.in >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2index.in,v >retrieving revision 1.3 >diff -u -8 -r1.3 template-db2index.in >--- ldapserver/ldap/admin/src/scripts/template-db2index.in 28 Nov 2006 17:13:48 -0000 1.3 >+++ ldapserver/ldap/admin/src/scripts/template-db2index.in 7 Feb 2007 16:53:38 -0000 >@@ -1,23 +1,23 @@ > #!/bin/sh > > prefix="{{DS-ROOT}}" > if [ "$prefix" = "/" ] ; then > prefix="" > fi >-LD_LIBRARY_PATH=$prefix@nss_libdir@:$prefix@libdir@ >+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@ > if [ -n "$prefix" ] ; then > LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@" > fi > export LD_LIBRARY_PATH > SHLIB_PATH=$LD_LIBRARY_PATH > export SHLIB_PATH > >-cd {{SERVER-DIR}} >+cd {{SERVERBIN-DIR}} > if [ $# -eq 0 ] > then > bak_dir={{BAK-DIR}}/reindex_`date +%Y_%m_%d_%H_%M_%S` > ./ns-slapd upgradedb -D {{CONFIG-DIR}} -f -a "$bak_dir" > elif [ $# -lt 4 ] > then > echo "Usage: db2index [-n backend_instance | {-s includesuffix}* -t attribute[:indextypes[:matchingrules]] -T vlvattribute]" > exit 1 >Index: ldapserver/ldap/admin/src/scripts/template-db2ldif >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2ldif,v >retrieving revision 1.1 >diff -u -8 -r1.1 template-db2ldif >--- ldapserver/ldap/admin/src/scripts/template-db2ldif 27 Oct 2006 16:45:18 -0000 1.1 >+++ ldapserver/ldap/admin/src/scripts/template-db2ldif 7 Feb 2007 16:53:38 -0000 >@@ -1,17 +1,17 @@ > #!/bin/sh > > prefix="{{DS-ROOT}}" >-LD_LIBRARY_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec >+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec > export LD_LIBRARY_PATH >-SHLIB_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec >+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec > export SHLIB_PATH > >-cd {{SERVER-DIR}} >+cd {{SERVERBIN-DIR}} > if [ "$#" -lt 2 ]; > then > echo "Usage: db2ldif {-n backend_instance}* | {-s includesuffix}*" > echo " [{-x excludesuffix}*] [-a outputfile]" > echo " [-N] [-r] [-C] [-u] [-U] [-m] [-M] [-1]" > echo "Note: either \"-n backend_instance\" or \"-s includesuffix\" is required." > exit 1 > fi >Index: ldapserver/ldap/admin/src/scripts/template-db2ldif.in >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2ldif.in,v >retrieving revision 1.3 >diff -u -8 -r1.3 template-db2ldif.in >--- ldapserver/ldap/admin/src/scripts/template-db2ldif.in 28 Nov 2006 17:13:48 -0000 1.3 >+++ ldapserver/ldap/admin/src/scripts/template-db2ldif.in 7 Feb 2007 16:53:38 -0000 >@@ -1,23 +1,23 @@ > #!/bin/sh > > prefix="{{DS-ROOT}}" > if [ "$prefix" = "/" ] ; then > prefix="" > fi >-LD_LIBRARY_PATH=$prefix@nss_libdir@:$prefix@libdir@ >+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@ > if [ -n "$prefix" ] ; then > LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@" > fi > export LD_LIBRARY_PATH > SHLIB_PATH=$LD_LIBRARY_PATH > export SHLIB_PATH > >-cd {{SERVER-DIR}} >+cd {{SERVERBIN-DIR}} > if [ "$#" -lt 2 ]; > then > echo "Usage: db2ldif {-n backend_instance}* | {-s includesuffix}*" > echo " [{-x excludesuffix}*] [-a outputfile]" > echo " [-N] [-r] [-C] [-u] [-U] [-m] [-M] [-1]" > echo "Note: either \"-n backend_instance\" or \"-s includesuffix\" is required." > exit 1 > fi >@@ -32,16 +32,16 @@ > elif [ $set_ldif -eq 1 ]; > then > ldif_file=$arg > set_ldif=2 > fi > done > if [ $ldif_file = "mydummy" ] > then >- ldif_file={{LDIF-DIR}}/laputa-`date +%Y_%m_%d_%H%M%S`.ldif >+ ldif_file={{LDIF-DIR}}/`date +%Y_%m_%d_%H%M%S`.ldif > fi > if [ $set_ldif -eq 2 ] > then > ./ns-slapd db2ldif -D {{CONFIG-DIR}} "$@" > else > ./ns-slapd db2ldif -D {{CONFIG-DIR}} -a $ldif_file "$@" > fi >Index: ldapserver/ldap/admin/src/scripts/template-ldif2db >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-ldif2db,v >retrieving revision 1.1 >diff -u -8 -r1.1 template-ldif2db >--- ldapserver/ldap/admin/src/scripts/template-ldif2db 27 Oct 2006 16:45:18 -0000 1.1 >+++ ldapserver/ldap/admin/src/scripts/template-ldif2db 7 Feb 2007 16:53:38 -0000 >@@ -1,17 +1,17 @@ > #!/bin/sh > > prefix="{{DS-ROOT}}" >-LD_LIBRARY_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec >+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec > export LD_LIBRARY_PATH >-SHLIB_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec >+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec > export SHLIB_PATH > >-cd {{SERVER-DIR}} >+cd {{SERVERBIN-DIR}} > if [ $# -lt 4 ] > then > echo "Usage: ldif2db -n backend_instance | {-s includesuffix}* [{-x excludesuffix}*]" > echo " {-i ldiffile}* [-O]" > echo "Note: either \"-n backend_instance\" or \"-s includesuffix\" and \"-i ldiffile\" are required." > exit 1 > fi > >Index: ldapserver/ldap/admin/src/scripts/template-ldif2db.in >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-ldif2db.in,v >retrieving revision 1.3 >diff -u -8 -r1.3 template-ldif2db.in >--- ldapserver/ldap/admin/src/scripts/template-ldif2db.in 28 Nov 2006 17:13:48 -0000 1.3 >+++ ldapserver/ldap/admin/src/scripts/template-ldif2db.in 7 Feb 2007 16:53:38 -0000 >@@ -1,23 +1,23 @@ > #!/bin/sh > > prefix="{{DS-ROOT}}" > if [ "$prefix" = "/" ] ; then > prefix="" > fi >-LD_LIBRARY_PATH=$prefix@nss_libdir@:$prefix@libdir@ >+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@ > if [ -n "$prefix" ] ; then > LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@" > fi > export LD_LIBRARY_PATH > SHLIB_PATH=$LD_LIBRARY_PATH > export SHLIB_PATH > >-cd {{SERVER-DIR}} >+cd {{SERVERBIN-DIR}} > if [ $# -lt 4 ] > then > echo "Usage: ldif2db -n backend_instance | {-s includesuffix}* [{-x excludesuffix}*]" > echo " {-i ldiffile}* [-O]" > echo "Note: either \"-n backend_instance\" or \"-s includesuffix\" and \"-i ldiffile\" are required." > exit 1 > fi > >Index: ldapserver/ldap/admin/src/scripts/template-restoreconfig >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-restoreconfig,v >retrieving revision 1.1 >diff -u -8 -r1.1 template-restoreconfig >--- ldapserver/ldap/admin/src/scripts/template-restoreconfig 27 Oct 2006 16:45:18 -0000 1.1 >+++ ldapserver/ldap/admin/src/scripts/template-restoreconfig 7 Feb 2007 16:53:38 -0000 >@@ -1,17 +1,17 @@ > #!/bin/sh > > prefix="{{DS-ROOT}}" >-LD_LIBRARY_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec >+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec > export LD_LIBRARY_PATH >-SHLIB_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec >+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec > export SHLIB_PATH > >-cd {{SERVER-DIR}} >+cd {{SERVERBIN-DIR}} > conf_ldif=`ls -1t {{BAK-DIR}}/{{SERV-ID}}-*.ldif | head -1` > if [ -z "$conf_ldif" ] > then > echo No configuration to restore in {{BAK-DIR}} ; exit 1 > fi > echo Restoring $conf_ldif > ./ns-slapd ldif2db -D {{CONFIG-DIR}} -i $conf_ldif -n NetscapeRoot 2>&1 > exit $? >Index: ldapserver/ldap/admin/src/scripts/template-restoreconfig.in >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-restoreconfig.in,v >retrieving revision 1.3 >diff -u -8 -r1.3 template-restoreconfig.in >--- ldapserver/ldap/admin/src/scripts/template-restoreconfig.in 28 Nov 2006 17:13:48 -0000 1.3 >+++ ldapserver/ldap/admin/src/scripts/template-restoreconfig.in 7 Feb 2007 16:53:38 -0000 >@@ -1,17 +1,17 @@ > #!/bin/sh > > prefix="{{DS-ROOT}}" >-LD_LIBRARY_PATH=$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ >+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ > export LD_LIBRARY_PATH >-SHLIB_PATH=$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ >+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ > export SHLIB_PATH > >-cd {{SERVER-DIR}} >+cd {{SERVERBIN-DIR}} > conf_ldif=`ls -1t {{BAK-DIR}}/{{SERV-ID}}-*.ldif | head -1` > if [ -z "$conf_ldif" ] > then > echo No configuration to restore in {{BAK-DIR}} ; exit 1 > fi > echo Restoring $conf_ldif > ./ns-slapd ldif2db -D {{CONFIG-DIR}} -i $conf_ldif -n NetscapeRoot 2>&1 > exit $? >Index: ldapserver/ldap/admin/src/scripts/template-saveconfig >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-saveconfig,v >retrieving revision 1.1 >diff -u -8 -r1.1 template-saveconfig >--- ldapserver/ldap/admin/src/scripts/template-saveconfig 27 Oct 2006 16:45:18 -0000 1.1 >+++ ldapserver/ldap/admin/src/scripts/template-saveconfig 7 Feb 2007 16:53:38 -0000 >@@ -1,17 +1,17 @@ > #!/bin/sh > > prefix="{{DS-ROOT}}" >-LD_LIBRARY_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec >+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec > export LD_LIBRARY_PATH >-SHLIB_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec >+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec > export SHLIB_PATH > >-cd {{SERVER-DIR}} >+cd {{SERVERBIN-DIR}} > echo saving configuration ... > conf_ldif={{BAK-DIR}}/{{SERV-ID}}-`date +%Y_%m_%d_%H%M%S`.ldif > ./ns-slapd db2ldif -N -D {{CONFIG-DIR}} -s "o=NetscapeRoot" -a $conf_ldif -n NetscapeRoot 2>&1 > if [ "$?" -ge 1 ] > then > echo Error occurred while saving configuration > exit 1 > fi >Index: ldapserver/ldap/admin/src/scripts/template-saveconfig.in >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-saveconfig.in,v >retrieving revision 1.3 >diff -u -8 -r1.3 template-saveconfig.in >--- ldapserver/ldap/admin/src/scripts/template-saveconfig.in 28 Nov 2006 17:13:48 -0000 1.3 >+++ ldapserver/ldap/admin/src/scripts/template-saveconfig.in 7 Feb 2007 16:53:38 -0000 >@@ -1,17 +1,17 @@ > #!/bin/sh > > prefix="{{DS-ROOT}}" >-LD_LIBRARY_PATH=$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ >+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ > export LD_LIBRARY_PATH >-SHLIB_PATH=$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ >+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ > export SHLIB_PATH > >-cd {{SERVER-DIR}} >+cd {{SERVERBIN-DIR}} > echo saving configuration ... > conf_ldif={{BAK-DIR}}/{{SERV-ID}}-`date +%Y_%m_%d_%H%M%S`.ldif > ./ns-slapd db2ldif -N -D {{CONFIG-DIR}} -s "o=NetscapeRoot" -a $conf_ldif -n NetscapeRoot 2>&1 > if [ "$?" -ge 1 ] > then > echo Error occurred while saving configuration > exit 1 > fi >Index: ldapserver/ldap/admin/src/scripts/template-start-slapd >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-start-slapd,v >retrieving revision 1.2 >diff -u -8 -r1.2 template-start-slapd >--- ldapserver/ldap/admin/src/scripts/template-start-slapd 5 Feb 2007 22:30:12 -0000 1.2 >+++ ldapserver/ldap/admin/src/scripts/template-start-slapd 7 Feb 2007 16:53:38 -0000 >@@ -1,24 +1,22 @@ > #!/bin/sh > > prefix="{{DS-ROOT}}" >-LD_LIBRARY_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec >+LD_LIBRARY_PATH=$prefix{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec > export LD_LIBRARY_PATH >-SHLIB_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec >+SHLIB_PATH=$prefix{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec > export SHLIB_PATH > > # Script that starts the ns-slapd server. > # Exit status can be: > # 0: Server started successfully > # 1: Server could not be started > # 2: Server already running > >-NETSITE_ROOT={{SERVER-DIR}} >-export NETSITE_ROOT > DS_CONFIG_DIR={{CONFIG-DIR}} > export DS_CONFIG_DIR > PIDFILE={{RUN-DIR}}/{{PRODUCT-NAME}}-{{SERV-ID}}.pid > STARTPIDFILE={{RUN-DIR}}/{{PRODUCT-NAME}}-{{SERV-ID}}.startpid > if test -f $STARTPIDFILE ; then > PID=`cat $STARTPIDFILE` > if kill -0 $PID > /dev/null 2>&1 ; then > echo There is an ns-slapd process already running: $PID >@@ -31,17 +29,17 @@ > PID=`cat $PIDFILE` > if kill -0 $PID > /dev/null 2>&1 ; then > echo There is an ns-slapd running: $PID > exit 2; > else > rm -f $PIDFILE > fi > fi >-cd {{SERVER-DIR}}; ./ns-slapd -D {{CONFIG-DIR}} -i $PIDFILE -w $STARTPIDFILE "$@" >+cd {{SERVERBIN-DIR}}; ./ns-slapd -D {{CONFIG-DIR}} -i $PIDFILE -w $STARTPIDFILE "$@" > if [ $? -ne 0 ]; then > exit 1 > fi > > loop_counter=1 > # wait for 10 seconds for the start pid file to appear > max_count=10 > while test $loop_counter -le $max_count; do >Index: ldapserver/ldap/admin/src/scripts/template-start-slapd.in >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-start-slapd.in,v >retrieving revision 1.5 >diff -u -8 -r1.5 template-start-slapd.in >--- ldapserver/ldap/admin/src/scripts/template-start-slapd.in 6 Feb 2007 21:44:09 -0000 1.5 >+++ ldapserver/ldap/admin/src/scripts/template-start-slapd.in 7 Feb 2007 16:53:39 -0000 >@@ -1,24 +1,22 @@ > #!/bin/sh > > prefix="{{DS-ROOT}}" >-LD_LIBRARY_PATH=$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ >+LD_LIBRARY_PATH=$prefix{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ > export LD_LIBRARY_PATH >-SHLIB_PATH=$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ >+SHLIB_PATH=$prefix{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ > export SHLIB_PATH > > # Script that starts the ns-slapd server. > # Exit status can be: > # 0: Server started successfully > # 1: Server could not be started > # 2: Server already running > >-NETSITE_ROOT={{SERVER-DIR}} >-export NETSITE_ROOT > DS_CONFIG_DIR={{CONFIG-DIR}} > export DS_CONFIG_DIR > PIDFILE={{RUN-DIR}}/{{PRODUCT-NAME}}-{{SERV-ID}}.pid > STARTPIDFILE={{RUN-DIR}}/{{PRODUCT-NAME}}-{{SERV-ID}}.startpid > if test -f $STARTPIDFILE ; then > PID=`cat $STARTPIDFILE` > if kill -0 $PID > /dev/null 2>&1 ; then > echo There is an ns-slapd process already running: $PID >@@ -31,17 +29,17 @@ > PID=`cat $PIDFILE` > if kill -0 $PID > /dev/null 2>&1 ; then > echo There is an ns-slapd running: $PID > exit 2; > else > rm -f $PIDFILE > fi > fi >-cd {{SERVER-DIR}}; ./ns-slapd -D {{CONFIG-DIR}} -i $PIDFILE -w $STARTPIDFILE "$@" >+cd {{SERVERBIN-DIR}}; ./ns-slapd -D {{CONFIG-DIR}} -i $PIDFILE -w $STARTPIDFILE "$@" > if [ $? -ne 0 ]; then > exit 1 > fi > > loop_counter=1 > # wait for 10 seconds for the start pid file to appear > max_count=10 > while test $loop_counter -le $max_count; do >Index: ldapserver/ldap/admin/src/scripts/template-stop-slapd >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-stop-slapd,v >retrieving revision 1.2 >diff -u -8 -r1.2 template-stop-slapd >--- ldapserver/ldap/admin/src/scripts/template-stop-slapd 5 Feb 2007 22:30:12 -0000 1.2 >+++ ldapserver/ldap/admin/src/scripts/template-stop-slapd 7 Feb 2007 16:53:39 -0000 >@@ -1,16 +1,10 @@ > #!/bin/sh > >-prefix="{{DS-ROOT}}" >-LD_LIBRARY_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec >-export LD_LIBRARY_PATH >-SHLIB_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec >-export SHLIB_PATH >- > # Script that stops the ns-slapd server. > # Exit status can be: > # 0: Server stopped successfully > # 1: Server could not be stopped > # 2: Server was not running > > PIDFILE={{RUN-DIR}}/{{PRODUCT-NAME}}-{{SERV-ID}}.pid > if test ! -f $PIDFILE ; then >Index: ldapserver/ldap/admin/src/scripts/template-stop-slapd.in >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-stop-slapd.in,v >retrieving revision 1.5 >diff -u -8 -r1.5 template-stop-slapd.in >--- ldapserver/ldap/admin/src/scripts/template-stop-slapd.in 6 Feb 2007 21:44:09 -0000 1.5 >+++ ldapserver/ldap/admin/src/scripts/template-stop-slapd.in 7 Feb 2007 16:53:39 -0000 >@@ -1,16 +1,10 @@ > #!/bin/sh > >-prefix="{{DS-ROOT}}" >-LD_LIBRARY_PATH=$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ >-export LD_LIBRARY_PATH >-SHLIB_PATH=$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ >-export SHLIB_PATH >- > # Script that stops the ns-slapd server. > # Exit status can be: > # 0: Server stopped successfully > # 1: Server could not be stopped > # 2: Server was not running > > PIDFILE={{RUN-DIR}}/{{PRODUCT-NAME}}-{{SERV-ID}}.pid > if test ! -f $PIDFILE ; then >Index: ldapserver/ldap/admin/src/scripts/template-suffix2instance >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-suffix2instance,v >retrieving revision 1.1 >diff -u -8 -r1.1 template-suffix2instance >--- ldapserver/ldap/admin/src/scripts/template-suffix2instance 27 Oct 2006 16:45:18 -0000 1.1 >+++ ldapserver/ldap/admin/src/scripts/template-suffix2instance 7 Feb 2007 16:53:39 -0000 >@@ -1,16 +1,16 @@ > #!/bin/sh > > prefix="{{DS-ROOT}}" >-LD_LIBRARY_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec >+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec > export LD_LIBRARY_PATH >-SHLIB_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec >+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec > export SHLIB_PATH > >-cd {{SERVER-DIR}} >+cd {{SERVERBIN-DIR}} > if [ $# -lt 2 ] > then > echo Usage: suffix2instance {-s includesuffix}* > exit 1 > fi > > ./ns-slapd suffix2instance -D {{CONFIG-DIR}} "$@" 2>&1 >Index: ldapserver/ldap/admin/src/scripts/template-suffix2instance.in >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-suffix2instance.in,v >retrieving revision 1.3 >diff -u -8 -r1.3 template-suffix2instance.in >--- ldapserver/ldap/admin/src/scripts/template-suffix2instance.in 28 Nov 2006 17:13:48 -0000 1.3 >+++ ldapserver/ldap/admin/src/scripts/template-suffix2instance.in 7 Feb 2007 16:53:39 -0000 >@@ -1,16 +1,16 @@ > #!/bin/sh > > prefix="{{DS-ROOT}}" >-LD_LIBRARY_PATH=$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ >+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ > export LD_LIBRARY_PATH >-SHLIB_PATH=$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ >+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ > export SHLIB_PATH > >-cd {{SERVER-DIR}} >+cd {{SERVERBIN-DIR}} > if [ $# -lt 2 ] > then > echo Usage: suffix2instance {-s includesuffix}* > exit 1 > fi > > ./ns-slapd suffix2instance -D {{CONFIG-DIR}} "$@" 2>&1 >Index: ldapserver/ldap/admin/src/scripts/template-upgradedb.in >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-upgradedb.in,v >retrieving revision 1.3 >diff -u -8 -r1.3 template-upgradedb.in >--- ldapserver/ldap/admin/src/scripts/template-upgradedb.in 28 Nov 2006 17:13:48 -0000 1.3 >+++ ldapserver/ldap/admin/src/scripts/template-upgradedb.in 7 Feb 2007 16:53:39 -0000 >@@ -1,17 +1,17 @@ > #!/bin/sh > > prefix="{{DS-ROOT}}" >-LD_LIBRARY_PATH=$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ >+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ > export LD_LIBRARY_PATH >-SHLIB_PATH=$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ >+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ > export SHLIB_PATH > >-cd {{SERVER-DIR}} >+cd {{SERVERBIN-DIR}} > if [ "$#" -eq 1 ] > then > bak_dir=$1 > else > bak_dir={{BAK-DIR}}/upgradedb_`date +%Y_%m_%d_%H_%M_%S` > fi > > echo upgrade index files ... >Index: ldapserver/ldap/admin/src/scripts/template-vlvindex >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-vlvindex,v >retrieving revision 1.1 >diff -u -8 -r1.1 template-vlvindex >--- ldapserver/ldap/admin/src/scripts/template-vlvindex 27 Oct 2006 16:45:18 -0000 1.1 >+++ ldapserver/ldap/admin/src/scripts/template-vlvindex 7 Feb 2007 16:53:39 -0000 >@@ -1,17 +1,17 @@ > #!/bin/sh > > prefix="{{DS-ROOT}}" >-LD_LIBRARY_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec >+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec > export LD_LIBRARY_PATH >-SHLIB_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec >+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec > export SHLIB_PATH > >-cd {{SERVER-DIR}} >+cd {{SERVERBIN-DIR}} > if [ $# -lt 4 ] > then > echo "Usage: vlvindex -n backend_instance | {-s includesuffix}* -T attribute" > echo Note: either \"-n backend_instance\" or \"-s includesuffix\" are required. > exit 1 > fi > > ./ns-slapd db2index -D {{CONFIG-DIR}} "$@" >Index: ldapserver/ldap/admin/src/scripts/template-vlvindex.in >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-vlvindex.in,v >retrieving revision 1.3 >diff -u -8 -r1.3 template-vlvindex.in >--- ldapserver/ldap/admin/src/scripts/template-vlvindex.in 28 Nov 2006 17:13:48 -0000 1.3 >+++ ldapserver/ldap/admin/src/scripts/template-vlvindex.in 7 Feb 2007 16:53:39 -0000 >@@ -1,17 +1,17 @@ > #!/bin/sh > > prefix="{{DS-ROOT}}" >-LD_LIBRARY_PATH=$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ >+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ > export LD_LIBRARY_PATH >-SHLIB_PATH=$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ >+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ > export SHLIB_PATH > >-cd {{SERVER-DIR}} >+cd {{SERVERBIN-DIR}} > if [ $# -lt 4 ] > then > echo "Usage: vlvindex -n backend_instance | {-s includesuffix}* -T attribute" > echo Note: either \"-n backend_instance\" or \"-s includesuffix\" are required. > exit 1 > fi > > ./ns-slapd db2index -D {{CONFIG-DIR}} "$@" >Index: ldapserver/wrappers/dbscan.in >=================================================================== >RCS file: /cvs/dirsec/ldapserver/wrappers/dbscan.in,v >retrieving revision 1.2 >diff -u -8 -r1.2 dbscan.in >--- ldapserver/wrappers/dbscan.in 2 Nov 2006 03:11:40 -0000 1.2 >+++ ldapserver/wrappers/dbscan.in 7 Feb 2007 16:53:39 -0000 >@@ -1,16 +1,16 @@ > #!/bin/sh > > ############################################################################### > ## (1) Specify variables used by this script. ## > ############################################################################### > > LIB_DIR=@nspr_libdir@:@db_libdir@ >-BIN_DIR=@serverdir@ >+BIN_DIR=@bindir@ > COMMAND=dbscan-bin > > > ############################################################################### > ## (2) Set the LD_LIBRARY_PATH environment variable to determine the ## > ## search order this command wrapper uses to find shared libraries. ## > ############################################################################### > >Index: ldapserver/wrappers/ds_newinst.in >=================================================================== >RCS file: /cvs/dirsec/ldapserver/wrappers/ds_newinst.in,v >retrieving revision 1.3 >diff -u -8 -r1.3 ds_newinst.in >--- ldapserver/wrappers/ds_newinst.in 29 Jan 2007 18:48:11 -0000 1.3 >+++ ldapserver/wrappers/ds_newinst.in 7 Feb 2007 16:53:39 -0000 >@@ -1,16 +1,16 @@ > #!/bin/sh > > ############################################################################### > ## (1) Specify variables used by this script. ## > ############################################################################### > >-LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@:@serverdir@:@libdir@ >-BIN_DIR=@serverdir@:@bindir@:/usr/bin:/bin >+LIB_DIR=@serverdir@:@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@:@libdir@ >+BIN_DIR=@bindir@:/usr/bin:/bin > COMMAND=ds_newinst-bin > > > ############################################################################### > ## (2) Set the LD_LIBRARY_PATH environment variable to determine the ## > ## search order this command wrapper uses to find shared libraries. ## > ############################################################################### > >Index: ldapserver/wrappers/dsktune.in >=================================================================== >RCS file: /cvs/dirsec/ldapserver/wrappers/dsktune.in,v >retrieving revision 1.2 >diff -u -8 -r1.2 dsktune.in >--- ldapserver/wrappers/dsktune.in 2 Nov 2006 03:11:40 -0000 1.2 >+++ ldapserver/wrappers/dsktune.in 7 Feb 2007 16:53:39 -0000 >@@ -1,16 +1,16 @@ > #!/bin/sh > > ############################################################################### > ## (1) Specify variables used by this script. ## > ############################################################################### > > LIB_DIR= >-BIN_DIR=@serverdir@ >+BIN_DIR=@bindir@ > COMMAND=dsktune-bin > > > ############################################################################### > ## (2) Set the LD_LIBRARY_PATH environment variable to determine the ## > ## search order this command wrapper uses to find shared libraries. ## > ############################################################################### > >Index: ldapserver/wrappers/ldap-agent.in >=================================================================== >RCS file: /cvs/dirsec/ldapserver/wrappers/ldap-agent.in,v >retrieving revision 1.2 >diff -u -8 -r1.2 ldap-agent.in >--- ldapserver/wrappers/ldap-agent.in 2 Nov 2006 03:11:40 -0000 1.2 >+++ ldapserver/wrappers/ldap-agent.in 7 Feb 2007 16:53:39 -0000 >@@ -1,16 +1,16 @@ > #!/bin/sh > > ############################################################################### > ## (1) Specify variables used by this script. ## > ############################################################################### > > LIB_DIR=@netsnmp_libdir@ >-BIN_DIR=@serverdir@ >+BIN_DIR=@bindir@ > COMMAND=ldap-agent-bin > > > ############################################################################### > ## (2) Set the LD_LIBRARY_PATH environment variable to determine the ## > ## search order this command wrapper uses to find shared libraries. ## > ############################################################################### > >Index: ldapserver/wrappers/ldif.in >=================================================================== >RCS file: /cvs/dirsec/ldapserver/wrappers/ldif.in,v >retrieving revision 1.2 >diff -u -8 -r1.2 ldif.in >--- ldapserver/wrappers/ldif.in 2 Nov 2006 03:11:40 -0000 1.2 >+++ ldapserver/wrappers/ldif.in 7 Feb 2007 16:53:39 -0000 >@@ -1,16 +1,16 @@ > #!/bin/sh > > ############################################################################### > ## (1) Specify variables used by this script. ## > ############################################################################### > > LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@ >-BIN_DIR=@serverdir@ >+BIN_DIR=@bindir@ > COMMAND=ldif-bin > > > ############################################################################### > ## (2) Set the LD_LIBRARY_PATH environment variable to determine the ## > ## search order this command wrapper uses to find shared libraries. ## > ############################################################################### > >Index: ldapserver/wrappers/migratecred.in >=================================================================== >RCS file: /cvs/dirsec/ldapserver/wrappers/migratecred.in,v >retrieving revision 1.2 >diff -u -8 -r1.2 migratecred.in >--- ldapserver/wrappers/migratecred.in 2 Nov 2006 03:11:40 -0000 1.2 >+++ ldapserver/wrappers/migratecred.in 7 Feb 2007 16:53:39 -0000 >@@ -1,16 +1,16 @@ > #!/bin/sh > > ############################################################################### > ## (1) Specify variables used by this script. ## > ############################################################################### > >-LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@ >-BIN_DIR=@serverdir@ >+LIB_DIR=@serverdir@:@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@ >+BIN_DIR=@bindir@ > COMMAND=migratecred-bin > > > ############################################################################### > ## (2) Set the LD_LIBRARY_PATH environment variable to determine the ## > ## search order this command wrapper uses to find shared libraries. ## > ############################################################################### > >Index: ldapserver/wrappers/mmldif.in >=================================================================== >RCS file: /cvs/dirsec/ldapserver/wrappers/mmldif.in,v >retrieving revision 1.2 >diff -u -8 -r1.2 mmldif.in >--- ldapserver/wrappers/mmldif.in 2 Nov 2006 03:11:40 -0000 1.2 >+++ ldapserver/wrappers/mmldif.in 7 Feb 2007 16:53:39 -0000 >@@ -1,16 +1,16 @@ > #!/bin/sh > > ############################################################################### > ## (1) Specify variables used by this script. ## > ############################################################################### > >-LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@ >-BIN_DIR=@serverdir@ >+LIB_DIR=@serverdir@:@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@ >+BIN_DIR=@bindir@ > COMMAND=mmldif-bin > > > ############################################################################### > ## (2) Set the LD_LIBRARY_PATH environment variable to determine the ## > ## search order this command wrapper uses to find shared libraries. ## > ############################################################################### > >Index: ldapserver/wrappers/pwdhash.in >=================================================================== >RCS file: /cvs/dirsec/ldapserver/wrappers/pwdhash.in,v >retrieving revision 1.2 >diff -u -8 -r1.2 pwdhash.in >--- ldapserver/wrappers/pwdhash.in 2 Nov 2006 03:11:40 -0000 1.2 >+++ ldapserver/wrappers/pwdhash.in 7 Feb 2007 16:53:39 -0000 >@@ -1,16 +1,16 @@ > #!/bin/sh > > ############################################################################### > ## (1) Specify variables used by this script. ## > ############################################################################### > >-LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@ >-BIN_DIR=@serverdir@ >+LIB_DIR=@serverdir@:@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@ >+BIN_DIR=@bindir@ > COMMAND=pwdhash-bin > > > ############################################################################### > ## (2) Set the LD_LIBRARY_PATH environment variable to determine the ## > ## search order this command wrapper uses to find shared libraries. ## > ############################################################################### >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=147570">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 227618
: 147570 |
147616