From 941a7e89074e2ed0e0401aa778ccf412dce14fc8 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Fri, 9 Feb 2007 22:33:59 +0000 Subject: Resolves: bug 160235 Bug Description: Add support for /etc/init scripts Reviewed by: nkinder (Thanks!) Fix Description: Add the new initscript. The initscript is called $PACKAGE_NAME which by default is fedora-ds. This script is created from wrappers/initscript.in, sed'd by the fixupcmd in Makefile.am during make install. The way it works is this: service fedora-ds cmd will execute the cmd on all instances (found in /etc/fedora-ds by default). service fedora-ds cmd instance will execute cmd on only that instance. So if you have /etc/fedora-ds/slapd-foo /etc/fedora-ds/slapd-bar and you do service start fedora-ds it will start up both slapd-foo and slapd-bar. If you do service start fedora-ds bar it will start up only slapd-bar. If you do service start fedora-ds biff you will get an error message. The initdir is platform specific (e.g. /etc/rc.d/init.d on linux, /etc/init.d on Solaris) so the definition was added to the platform dependent section of configure.ac. The init script is explicitly branded, including the filename. I needed to add support to the autotool files so that we could change the name of the file. Since package_name is defined when you use the AC_INIT macro in configure.ac, we don't need to define it elsewhere (e.g. #define BRAND_DS). So I added the branding and other information to the autotool files, and changed create_instance to use package_name instead of brand_ds to be consistent. Having the package_name defined in much fewer places should make it much easier to change in the future if necessary. I also fixed a compiler warning in ldaprot.h. Platforms tested: RHEL4, FC6 Flag Day: no Doc impact: Yes. We need to document how to use the initscript, and how to enable startup on boot - chkconfig fedora-ds on --- ldap/include/ldaprot.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'ldap/include') diff --git a/ldap/include/ldaprot.h b/ldap/include/ldaprot.h index 81cb9e9d..aa7b5139 100644 --- a/ldap/include/ldaprot.h +++ b/ldap/include/ldaprot.h @@ -47,10 +47,18 @@ 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 -- cgit