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 147814 Details for
Bug 160235
Add support for /etc/init scripts
[?]
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), 21.80 KB, created by
Rich Megginson
on 2007-02-09 21:35:28 UTC
(
hide
)
Description:
diffs
Filename:
MIME Type:
Creator:
Rich Megginson
Created:
2007-02-09 21:35:28 UTC
Size:
21.80 KB
patch
obsolete
>Index: ldapserver/Makefile.am >=================================================================== >RCS file: /cvs/dirsec/ldapserver/Makefile.am,v >retrieving revision 1.22 >diff -u -8 -r1.22 Makefile.am >--- ldapserver/Makefile.am 8 Feb 2007 18:40:12 -0000 1.22 >+++ ldapserver/Makefile.am 9 Feb 2007 21:23:09 -0000 >@@ -61,16 +61,17 @@ > #------------------------ > configdir = $(sysconfdir)@configdir@ > sampledatadir = $(datadir)@sampledatadir@ > propertydir = $(sysconfdir)@propertydir@ > schemadir = $(sysconfdir)@schemadir@ > serverdir = $(libdir)@serverdir@ > serverplugindir = $(libdir)@serverplugindir@ > taskdir = $(datadir)@scripttemplatedir@ >+initdir = $(sysconfdir)@initdir@ > > #------------------------ > # Build Products > #------------------------ > sbin_PROGRAMS = ns-slapd > > bin_PROGRAMS = dbscan-bin ds_newinst-bin dsktune-bin infadd-bin ldap-agent-bin \ > ldclt-bin ldif-bin migratecred-bin mmldif-bin pwdhash-bin rsearch-bin >@@ -168,16 +169,18 @@ > ldap/admin/src/scripts/template-ns-newpwpolicy.pl \ > ldap/admin/src/scripts/template-repl-monitor.pl \ > ldap/admin/src/scripts/template-verify-db.pl \ > $(srcdir)/ldap/admin/src/scripts/template-migrate5to7 \ > $(srcdir)/ldap/admin/src/scripts/template-migrate6to7 \ > $(srcdir)/ldap/admin/src/scripts/template-migrateInstance7 \ > $(srcdir)/ldap/admin/src/scripts/template-migrateTo7 > >+init_SCRIPTS = wrappers/$(PACKAGE_NAME) >+ > #//////////////////////////////////////////////////////////////// > # > # Server Strings > # > #//////////////////////////////////////////////////////////////// > #------------------------ > # makstrdb > #------------------------ >@@ -937,13 +940,19 @@ > -e 's,@sasl_libdir\@,$(sasl_libdir),g' \ > -e 's,@netsnmp_libdir\@,$(netsnmp_libdir),g' \ > -e 's,@propertydir\@,$(propertydir),g' \ > -e 's,@datadir\@,$(datadir),g' \ > -e 's,@schemadir\@,$(schemadir),g' \ > -e 's,@serverdir\@,$(serverdir),g' \ > -e 's,@serverplugindir\@,$(serverplugindir),g' \ > -e 's,@taskdir\@,$(taskdir),g' \ >- -e 's,@configdir\@,$(configdir),g' >+ -e 's,@configdir\@,$(configdir),g' \ >+ -e 's,@sysconfdir\@,$(sysconfdir),g' \ >+ -e 's,@localstatedir\@,$(localstatedir),g' \ >+ -e 's,@package_name\@,$(PACKAGE_NAME),g' > > %: %.in > mkdir -p $(dir $@) > $(fixupcmd) $^ > $@ >+ >+%/$(PACKAGE_NAME): %/initscript.in >+ $(fixupcmd) $^ > $@ >Index: ldapserver/configure.ac >=================================================================== >RCS file: /cvs/dirsec/ldapserver/configure.ac,v >retrieving revision 1.15 >diff -u -8 -r1.15 configure.ac >--- ldapserver/configure.ac 6 Feb 2007 15:51:22 -0000 1.15 >+++ ldapserver/configure.ac 9 Feb 2007 21:23:09 -0000 >@@ -1,12 +1,12 @@ > # -*- Autoconf -*- > # Process this file with autoconf to produce a configure script. > AC_PREREQ(2.59) >-AC_INIT([fedora-ds], [1.1], [http://bugzilla.redhat.com/]) >+AC_INIT([fedora-ds], [1.1.0], [http://bugzilla.redhat.com/]) > # AC_CONFIG_HEADER must be called right after AC_INIT. > AC_CONFIG_HEADERS([config.h]) > AM_INIT_AUTOMAKE([1.9 foreign subdir-objects]) > AM_MAINTAINER_MODE > AC_CANONICAL_HOST > > # Checks for programs. > AC_PROG_CXX >@@ -54,67 +54,71 @@ > debug_defs="-DDEBUG -DMCC_DEBUG" > ], > [ > AC_MSG_RESULT(no) > debug_defs="" > ]) > AC_SUBST([debug_defs]) > >-AC_PREFIX_DEFAULT([/opt/fedora-ds]) >+AC_PREFIX_DEFAULT([/opt/$PACKAGE_NAME]) > > # installation paths - by default, configure will just > # use /usr as the prefix for everything, which means > # /usr/etc and /usr/var. FHS sez to use /etc and /var. > 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 > > # relative to sysconfdir >-configdir=/fedora-ds/config >+configdir=/$PACKAGE_NAME/config > # relative to datadir >-sampledatadir=/fedora-ds/data >+sampledatadir=/$PACKAGE_NAME/data > # relative to sysconfdir >-propertydir=/fedora-ds/property >+propertydir=/$PACKAGE_NAME/property > # relative to sysconfdir >-schemadir=/fedora-ds/schema >+schemadir=/$PACKAGE_NAME/schema > # relative to libdir >-serverdir=/fedora-ds >+serverdir=/$PACKAGE_NAME > # relative to libdir >-serverplugindir=/fedora-ds/plugins >+serverplugindir=/$PACKAGE_NAME/plugins > # relative to datadir >-scripttemplatedir=/fedora-ds/script-templates >+scripttemplatedir=/$PACKAGE_NAME/script-templates > AC_SUBST(configdir) > AC_SUBST(sampledatadir) > AC_SUBST(propertydir) > AC_SUBST(schemadir) > AC_SUBST(serverdir) > AC_SUBST(serverplugindir) > AC_SUBST(scripttemplatedir) > > # WINNT should be true if building on Windows system not using > # cygnus, mingw, or the like and using cmd.exe as the shell > AM_CONDITIONAL([WINNT], false) > > # Deal with platform dependent defines >+# relative to sysconfdir >+initdir=/rc.d > case $host in > *-*-linux*) > AC_DEFINE([XP_UNIX], [1], [UNIX]) > AC_DEFINE([Linux], [1], [Linux]) > AC_DEFINE([LINUX], [1], [Linux]) > AC_DEFINE([LINUX2_0], [1], [Linux 2.0]) > AC_DEFINE([LINUX2_2], [1], [Linux 2.2]) > AC_DEFINE([LINUX2_4], [1], [Linux 2.4]) > platform="linux" >+ # relative to sysconfdir >+ initdir=/rc.d/init.d > ;; > ia64-hp-hpux*) > AC_DEFINE([XP_UNIX], [1], [UNIX]) > AC_DEFINE([hpux], [1], [HP-UX]) > AC_DEFINE([HPUX], [1], [HP-UX]) > AC_DEFINE([HPUX11], [1], [HP-UX 11]) > AC_DEFINE([HPUX11_23], [1], [HP-UX 11.23]) > AC_DEFINE([CPU_ia64], [], [cpu type ia64]) >@@ -145,21 +149,24 @@ > AC_DEFINE([_REENTRANT], [1], [_REENTRANT]) > LIBSOCKET=-lsocket > AC_SUBST([LIBSOCKET], [$LIBSOCKET]) > LIBNSL=-lnsl > AC_SUBST([LIBNSL], [$LIBNSL]) > LIBDL=-ldl > AC_SUBST([LIBDL], [$LIBDL]) > platform="solaris" >+ # relative to sysconfdir >+ initdir=/init.d > ;; > *) > platform="" > ;; > esac >+AC_SUBST(initdir) > > AM_CONDITIONAL(SOLARIS,test "$platform" = "solaris") > > # Check for library dependencies > m4_include(m4/nspr.m4) > m4_include(m4/nss.m4) > m4_include(m4/mozldap.m4) > m4_include(m4/db.m4) >Index: ldapserver/ldap/admin/src/create_instance.c >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v >retrieving revision 1.43 >diff -u -8 -r1.43 create_instance.c >--- ldapserver/ldap/admin/src/create_instance.c 8 Feb 2007 18:40:12 -0000 1.43 >+++ ldapserver/ldap/admin/src/create_instance.c 9 Feb 2007 21:23:17 -0000 >@@ -704,32 +704,32 @@ > 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, >+ cf->datadir, FILE_PATHSEP, cf->package_name, > 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 > strcpy(myperl, "!/usr/bin/env perl"); > #endif > > table[0][0] = "DS-ROOT"; > table[0][1] = cf->prefix; > table[1][0] = "DS-BRAND"; >- table[1][1] = cf->brand_ds; >+ table[1][1] = cf->package_name; > table[2][0] = "SEP"; > table[2][1] = FILE_PATHSEPP; > table[3][0] = "SERVER-NAME"; > table[3][1] = cf->servname; > table[4][0] = "SERVER-PORT"; > table[4][1] = cf->servport; > table[5][0] = "PERL-EXEC"; > table[6][0] = "DEV-NULL"; >@@ -3414,23 +3414,23 @@ > PR_snprintf(src, sizeof(src), "%s%c%s", > cf->config_dir, FILE_PATHSEP, DS_CONFIG_FILE); > PR_snprintf(dest, sizeof(dest), "%s%c%s", > cf->config_dir, FILE_PATHSEP, DS_ORIGCONFIG_FILE); > create_instance_copy(src, dest, 0600, 0 ); > > /* install certmap.conf at <configdir> */ > PR_snprintf(src, sizeof(src), "%s%c%s%c/config/certmap.conf", >- cf->sysconfdir, FILE_PATHSEP, cf->brand_ds, FILE_PATHSEP); >+ cf->sysconfdir, FILE_PATHSEP, cf->package_name, FILE_PATHSEP); > PR_snprintf(dest, sizeof(dest), "%s/certmap.conf", cf->config_dir); > create_instance_copy(src, dest, 0600, 0 ); > > /* generate <confdir>/slapd-collations.conf */ > PR_snprintf(src, sizeof(src), "%s%c%s%c/config/%s-collations.conf", >- cf->sysconfdir, FILE_PATHSEP, cf->brand_ds, >+ cf->sysconfdir, FILE_PATHSEP, cf->package_name, > FILE_PATHSEP, PRODUCT_NAME); > PR_snprintf(dest, sizeof(dest), "%s%c%s-collations.conf", > cf->config_dir, FILE_PATHSEP, PRODUCT_NAME); > if (!(srcf = fopen(src, "r"))) { > return make_error("Can't read from %s (%s)", src, ds_system_errmsg()); > } > if (!(f = fopen(dest, "w"))) { > return make_error("Can't write to %s (%s)", dest, ds_system_errmsg()); >@@ -3443,26 +3443,26 @@ > } > if (!feof(srcf)) { > make_error("Error reading from file %s (%s)", src, ds_system_errmsg()); > } > fclose(srcf); > fclose(f); > > /* >- * <sysconfdir>/BRAND_DS/schema to schema_dir >+ * <sysconfdir>/PACKAGE_NAME/schema to schema_dir > */ > PR_snprintf(src, sizeof(src), "%s%c%s%cschema", >- cf->sysconfdir, FILE_PATHSEP, cf->brand_ds, FILE_PATHSEP); >+ cf->sysconfdir, FILE_PATHSEP, cf->package_name, FILE_PATHSEP); > if (NULL != (t = ds_copy_group_files_using_mode_owner(src, cf->schema_dir, 0, NEWFILE_MODE, pw))) > return t; > > #if defined (BUILD_PRESENCE) > PR_snprintf(src, sizeof(src), "%s%c%s%c/config/presence", >- cf->sysconfdir, FILE_PATHSEP, cf->brand_ds, FILE_PATHSEP); >+ cf->sysconfdir, FILE_PATHSEP, cf->package_name, FILE_PATHSEP); > PR_snprintf(dest, sizeof(dest), "%s/presence", cf->config_dir); > if (t = ds_copy_group_files(src, dest, 0)) > return t; > #endif > > #if defined (ORGCHART) > /* Generate the orgchart configuration */ > PR_snprintf(src, sizeof(src), "%s/clients", sroot); >@@ -4229,34 +4229,34 @@ > } > return rstr; > } > > /* ------ Parse the results of a form and create a server from them ------- */ > /* > * FHS description > * cf->prefix: %{_prefix} >- * cf->sroot: %{_libdir}/BRAND_DS >+ * cf->sroot: %{_libdir}/PACKAGE_NAME > * 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) >- * cf->db_dir: <localstatedir>/lib/BRAND_DS/slapd-<servid>/db >- * cf->bak_dir: <localstatedir>/lib/BRAND_DS/slapd-<servid>/bak >- * cf->tmp_dir: <localstatedir>/tmp/BRAND_DS/slapd-<servid> >+ * cf->config_dir: <localstatedir>/lib/PACKAGE_NAME/slapd-<servid> >+ * cf->schema_dir: <localstatedir>/lib/PACKAGE_NAME/slapd-<servid>/schema >+ * cf->lock_dir: <localstatedir>/lock/PACKAGE_NAME/slapd-<servid> >+ * cf->log_dir: <localstatedir>/log/PACKAGE_NAME/slapd-<servid> >+ * cf->run_dir: <localstatedir>/run/PACKAGE_NAME (slapd-instance.pid slapd-instance.startpid files) >+ * cf->db_dir: <localstatedir>/lib/PACKAGE_NAME/slapd-<servid>/db >+ * cf->bak_dir: <localstatedir>/lib/PACKAGE_NAME/slapd-<servid>/bak >+ * cf->tmp_dir: <localstatedir>/tmp/PACKAGE_NAME/slapd-<servid> > * cf->ldif_dir: <datadir>/<brand-ds>/ldif >- * cf->cert_dir: <sysconfdir>/BRAND_DS/slapd-<servid> >+ * cf->cert_dir: <sysconfdir>/PACKAGE_NAME/slapd-<servid> > * cf->sasl_path: <sroot>/sasl2 > * cf->plugin_dir: <sroot>/plugins > * > * NOTES: > * If prefix is given, all the other paths start from prefix. > * NETSITE_ROOT is treated as a secondary prefix. (If prefix is also set, > * it's ignored. If prefix is not set, NETSITE_ROOT becomes prefix. > * If both are not set, the paths start from '/'.) >@@ -4269,17 +4269,17 @@ > char *qs = getenv("QUERY_STRING"); > char *cfg_sspt_uid_pw1 = NULL; > char *cfg_sspt_uid_pw2 = NULL; > char *temp = NULL; > char *prefix = NULL; > int prefixlen = 0; > LDAPURLDesc *desc = 0; > >- cf->brand_ds = BRAND_DS; >+ cf->package_name = PACKAGE_NAME; > if (rm && qs && !strcmp(rm, "GET")) > { > ds_get_begin(qs); > } > else if (ds_post_begin(stdin)) > { > return 1; > } >@@ -4296,17 +4296,17 @@ > prefix = cf->prefix = PL_strdup(temp); > } else if (NULL != prefix) { > cf->prefix = PL_strdup(prefix); /* value of NETSITE_ROOT */ > } else { > prefix = cf->prefix = PL_strdup("/"); > } > > cf->sroot = PR_smprintf("%s%s%c%s", >- prefix, LIBDIR, FILE_PATHSEP, cf->brand_ds); >+ prefix, LIBDIR, FILE_PATHSEP, cf->package_name); > 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 > * the platform. */ > cf->sasl_path = PL_strdup(temp); > } > #if !defined( LINUX ) > /* if not linux, we package sasl2 with DS, >@@ -4482,101 +4482,101 @@ > } else { > cf->inst_dir = PL_strdup(temp); > } > > temp = ds_a_get_cgi_var("config_dir", NULL, NULL); > if (NULL == temp) { > cf->config_dir = PR_smprintf("%s%c%s%c%s-%s", > cf->sysconfdir, FILE_PATHSEP, >- cf->brand_ds, FILE_PATHSEP, >+ cf->package_name, FILE_PATHSEP, > PRODUCT_NAME, cf->servid); > } else { > cf->config_dir = PL_strdup(temp); > } > /* set config dir to the environment variable DS_CONFIG_DIR */ > ds_set_config_dir(cf->config_dir); > > cf->schema_dir = ds_a_get_cgi_var("schema_dir", NULL, NULL); > temp = ds_a_get_cgi_var("schema_dir", NULL, NULL); > if (NULL == temp) { > cf->schema_dir = PR_smprintf("%s%c%s%c%s-%s%cschema", > cf->sysconfdir, FILE_PATHSEP, >- cf->brand_ds, FILE_PATHSEP, >+ cf->package_name, FILE_PATHSEP, > PRODUCT_NAME, cf->servid, FILE_PATHSEP); > } else { > cf->schema_dir = PL_strdup(temp); > } > > temp = ds_a_get_cgi_var("lock_dir", NULL, NULL); > if (NULL == temp) { > cf->lock_dir = PR_smprintf("%s%clock%c%s%c%s-%s", > cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP, >- cf->brand_ds, FILE_PATHSEP, >+ cf->package_name, FILE_PATHSEP, > PRODUCT_NAME, cf->servid); > } else { > cf->lock_dir = PL_strdup(temp); > } > > temp = ds_a_get_cgi_var("log_dir", NULL, NULL); > if (NULL == temp) { > cf->log_dir = PR_smprintf("%s%clog%c%s%c%s-%s", > cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP, >- cf->brand_ds, FILE_PATHSEP, >+ cf->package_name, FILE_PATHSEP, > PRODUCT_NAME, cf->servid); > } else { > cf->log_dir = PL_strdup(temp); > } > > temp = ds_a_get_cgi_var("run_dir", NULL, NULL); > if (NULL == temp) { > cf->run_dir = PR_smprintf("%s%crun%c%s", > cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP, >- cf->brand_ds); >+ cf->package_name); > } 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) { > cf->db_dir = PR_smprintf("%s%clib%c%s%c%s-%s%cdb", > cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP, >- cf->brand_ds, FILE_PATHSEP, >+ cf->package_name, FILE_PATHSEP, > PRODUCT_NAME, cf->servid, FILE_PATHSEP); > } else { > cf->db_dir = PL_strdup(temp); > } > > temp = ds_a_get_cgi_var("bak_dir", NULL, NULL); > if (NULL == temp) { > cf->bak_dir = PR_smprintf("%s%clib%c%s%c%s-%s%cbak", > cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP, >- cf->brand_ds, FILE_PATHSEP, >+ cf->package_name, FILE_PATHSEP, > PRODUCT_NAME, cf->servid, FILE_PATHSEP); > } else { > cf->bak_dir = PL_strdup(temp); > } > /* 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) { > cf->ldif_dir = PR_smprintf("%s%c%s%cldif", >- cf->datadir, FILE_PATHSEP, cf->brand_ds, FILE_PATHSEP); >+ cf->datadir, FILE_PATHSEP, cf->package_name, FILE_PATHSEP); > } else { > cf->ldif_dir = PL_strdup(temp); > } > > temp = ds_a_get_cgi_var("tmp_dir", NULL, NULL); > if (NULL == temp) { > cf->tmp_dir = PR_smprintf("%s%ctmp%c%s%c%s-%s", > cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP, >- cf->brand_ds, FILE_PATHSEP, >+ cf->package_name, FILE_PATHSEP, > PRODUCT_NAME, cf->servid); > } else { > cf->tmp_dir = PL_strdup(temp); > } > /* set tmp dir to the environment variable DS_TMP_DIR */ > ds_set_tmp_dir(cf->tmp_dir); > > temp = ds_a_get_cgi_var("cert_dir", NULL, NULL); >Index: ldapserver/ldap/admin/src/create_instance.h >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.h,v >retrieving revision 1.14 >diff -u -8 -r1.14 create_instance.h >--- ldapserver/ldap/admin/src/create_instance.h 7 Feb 2007 23:57:40 -0000 1.14 >+++ ldapserver/ldap/admin/src/create_instance.h 9 Feb 2007 21:23:18 -0000 >@@ -49,18 +49,18 @@ > > #ifndef _create_instance_h > #define _create_instance_h > > #ifdef __cplusplus > extern "C" { /* Assume C declarations for C++ */ > #endif /* __cplusplus */ > >-#ifndef BRAND_DS >-#define BRAND_DS "fedora-ds" >+#ifndef PACKAGE_NAME >+#define PACKAGE_NAME "fedora-ds" > #endif > > #ifdef XP_UNIX > #define PRODUCT_NAME "slapd" > #define PRODUCT_BIN "ns-slapd" > #ifndef LOCALSTATEDIR > #define LOCALSTATEDIR "/var" > #endif >@@ -116,17 +116,17 @@ > char *sroot; /* _libdir */ > char *localstatedir; > char *sysconfdir; > char *bindir; > char *sbindir; > char *datadir; > char *docdir; > >- char *brand_ds; >+ char *package_name; > char *lang; > > char *servname; > char *bindaddr; > char *servport; > char *suitespot3x_uid; > char *cfg_sspt; > char *cfg_sspt_uid; >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.2 >diff -u -8 -r1.2 ds_newinst.pl.in >--- ldapserver/ldap/admin/src/ds_newinst.pl.in 7 Feb 2007 23:57:40 -0000 1.2 >+++ ldapserver/ldap/admin/src/ds_newinst.pl.in 9 Feb 2007 21:23:18 -0000 >@@ -160,17 +160,17 @@ > } > close IN; > > #printhash (\%table); > > # next, construct a hash table with our arguments > > my %cgiargs = (); >-my $brand_ds = "fedora-ds"; >+my $package_name = "@package_name@"; > > # the following items are always required > addAndCheck(\%cgiargs, "sroot", \%table, "General", "ServerRoot"); > addAndCheck(\%cgiargs, "servname", \%table, "General", "FullMachineName"); > addAndCheck(\%cgiargs, "servuser", \%table, "General", "SuiteSpotUserID"); > addAndCheck(\%cgiargs, "servport", \%table, "slapd", "ServerPort"); > addAndCheck(\%cgiargs, "rootdn", \%table, "slapd", "RootDN"); > addAndCheck(\%cgiargs, "rootpw", \%table, "slapd", "RootDNPwd"); >@@ -233,35 +233,35 @@ > $cgiargs{user_ldap_url} = $cgiargs{ldap_url}; > } > > if ($table{General}->{prefix}) { > $prefix = $table{General}->{prefix}; > } > $cgiargs{prefix} = $prefix; > >-if ($table{General}->{BrandDs}) { >- $brand_ds = $table{General}->{BrandDs}; >+if ($table{General}->{PackageName}) { >+ $package_name = $table{General}->{PackageName}; > } > > # populate the DS with this file - the suffix in this file must > # be the suffix specified in the suffix argument above > # the filename should use the full absolute path > $cgiargs{install_ldif_file} = $table{slapd}->{InstallLdifFile}; > > # 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"; >+ $prog = "@libdir@/$package_name/ds_newinst"; > } > > my $rc = &cgiFake($sroot, $verbose, > $prog, \%cgiargs); > > if (!$rc) { > print "Success! Your new directory server instance was created\n"; > } else { >Index: ldapserver/ldap/include/ldaprot.h >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/include/ldaprot.h,v >retrieving revision 1.5 >diff -u -8 -r1.5 ldaprot.h >--- ldapserver/ldap/include/ldaprot.h 10 Nov 2006 23:44:41 -0000 1.5 >+++ ldapserver/ldap/include/ldaprot.h 9 Feb 2007 21:23:18 -0000 >@@ -42,20 +42,28 @@ > > #ifndef _LDAPROT_H > #define _LDAPROT_H > > #ifdef __cplusplus > extern "C" { > #endif > >+#ifndef LDAP_VERSION1 > #define LDAP_VERSION1 1 >+#endif >+#ifndef LDAP_VERSION2 > #define LDAP_VERSION2 2 >+#endif >+#ifndef LDAP_VERSION3 > #define LDAP_VERSION3 3 >+#endif >+#ifndef LDAP_VERSION > #define LDAP_VERSION LDAP_VERSION2 >+#endif > > #define COMPAT20 > #define COMPAT30 > #if defined(COMPAT20) || defined(COMPAT30) > #define COMPAT > #endif > > #define LDAP_URL_PREFIX "ldap://"
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=147814">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 160235
:
115369
|
115370
| 147814 |
147815
|
147821