From c9474fc766788a6dca4ac360c5b6b233b5b1eeb6 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Thu, 17 Sep 1998 02:21:28 +0000 Subject: [PATCH] Update ldapconfig.h.in based upon current (-devel) ldapconfig.h.edit --- include/ldapconfig.h.in | 101 ++++++++++++++++++++++++++-------------- 1 file changed, 66 insertions(+), 35 deletions(-) diff --git a/include/ldapconfig.h.in b/include/ldapconfig.h.in index 5cc74cfe9c..265016a2e8 100644 --- a/include/ldapconfig.h.in +++ b/include/ldapconfig.h.in @@ -1,5 +1,8 @@ /* - * Copyright (c) 1994 Regents of the University of Michigan. + * Copyright 1998 The OpenLDAP Foundation. + * Copying restrictions apply. See COPYRIGHT file for details. + * + * Portions Copyright (c) 1994 Regents of the University of Michigan. * All rights reserved. * * Redistribution and use in source and binary forms are permitted @@ -10,8 +13,8 @@ * is provided ``as is'' without express or implied warranty. */ -#ifndef _LDAPCLIENT_H -#define _LDAPCLIENT_H +#ifndef _LDAP_CONFIG_H +#define _LDAP_CONFIG_H /* * config.h for LDAP -- edit this file to customize LDAP client behavior. @@ -22,16 +25,28 @@ /* * SHARED DEFINITIONS - things you should change */ - /* default ldap host */ +#define DEFAULT_BINDIR "@BINDIR@" +#define DEFAULT_SBINDIR "@SBINDIR@" +#define DEFAULT_ETCDIR "@ETCDIR@" +#define DEFAULT_LIBEXECDIR "@LIBEXECDIR@" + +/* default ldap host */ #define LDAPHOST "localhost" - /* default place to start searching */ + +#define DEFAULT_LDAPHOST_FILE "@ETCDIR@/ldaphost" +/* default place to start searching */ #define DEFAULT_BASE "o=Your Organization Name, c=US" +#define DEFAULT_BASE_FILE "@ETCDIR@/ldapbase" -#define EDITOR "@EDITOR@" +/* + * default binddn and creditials + * use files, make sure they are not generally readable + */ +#define DEFAULT_BINDDN NULL +#define DEFAULT_BINDDN_FILE "@ETCDIR@/ldapbinddn" -#define DEFAULT_SCONFDIR "@SCONFDIR@/ldap" -#define DEFAULT_SBINDIR "@SBINDIR@" -#define DEFAULT_LIBEXECDIR "@LIBEXECDIR@" +#define DEFAULT_BIND_CRED NULL +#define DEFAULT_BIND_CRED_FILE "@ETCDIR@/ldapbindcred" /********************************************************************* * * @@ -47,27 +62,28 @@ /* default count of DN components to show in entry displays */ #define DEFAULT_RDNCOUNT 2 /* default config file locations */ -#define FILTERFILE "@SYSCONFDIR@/ldap/ldapfilter.conf" -#define TEMPLATEFILE "@SYSCONFDIR@/ldap/ldaptemplates.conf" -#define SEARCHFILE "@SYSCONFDIR@/ldap/ldapsearchprefs.conf" -#define FRIENDLYFILE "@SYSCONFDIR@/ldap/ldapfriendly" +#define FILTERFILE "@ETCDIR@/ldapfilter.conf" +#define TEMPLATEFILE "@ETCDIR@/ldaptemplates.conf" +#define SEARCHFILE "@ETCDIR@/ldapsearchprefs.conf" +#define FRIENDLYFILE "@ETCDIR@/ldapfriendly" /* * FINGER DEFINITIONS */ /* who to bind as */ -#define FINGER_BINDDN NULL +#define FINGER_BINDDN NULL +#define FINGER_BIND_CRED NULL /* where to search */ -#define FINGER_BASE DEFAULT_BASE +#define FINGER_BASE DEFAULT_BASE /* banner to print */ #define FINGER_BANNER "X.500 Finger Service...\r\n" /* who to report errors to */ -#define FINGER_ERRORS "your local system administrator" +#define FINGER_ERRORS "System Administrator" /* what to say if no matches are found */ #define FINGER_NOMATCH "Search failed to find anything.\r\n" /* what to say if the service may be unavailable */ #define FINGER_UNAVAILABLE \ -"The X.500 service may be temporarily unavailable.\r\n\ +"The directory service may be temporarily unavailable.\r\n\ Please try again later.\r\n" /* printed if a match has no email address - for disptmp default */ #define FINGER_NOEMAIL1 "None registered in this service." @@ -95,6 +111,7 @@ Please try again later.\r\n" */ /* who to bind as */ #define GO500_BINDDN NULL +#define GO500_BIND_CRED NULL /* where to search */ #define GO500_BASE DEFAULT_BASE /* port on which to listen */ @@ -119,9 +136,10 @@ Please try again later.\r\n" * GO500GW GOPHER GATEWAY DEFINITIONS */ /* who to bind as */ -#define GO500GW_BINDDN NULL +#define GO500GW_BINDDN NULL +#define GO500GW_BIND_CRED NULL /* where the helpfile lives */ -#define GO500GW_HELPFILE "@SYSCONFDIR@/ldap/go500gw.help" +#define GO500GW_HELPFILE "@ETCDIR@/go500gw.help" /* port on which to listen */ #define GO500GW_PORT 7777 /* timeout on all searches */ @@ -143,12 +161,13 @@ Please try again later.\r\n" */ /* who to bind as */ #define RCPT500_BINDDN NULL +#define RCPT500_BIND_CRED NULL /* where the helpfile lives */ -#define RCPT500_HELPFILE "@SYSCONFDIR@/ldap/rcpt500.help" +#define RCPT500_HELPFILE "@ETCDIR@/rcpt500.help" /* maximum number of matches returned */ #define RCPT500_SIZELIMIT 50 /* address replies will appear to come from */ -#define RCPT500_FROM "\"X.500 Query Program\" " +#define RCPT500_FROM "\"Directory Query Program\" " /* command that will accept an RFC822 message text on standard input, and send it. sendmail -t does this nicely. */ #define RCPT500_PIPEMAILCMD "@SENDMAIL@ -t" @@ -167,7 +186,8 @@ Please try again later.\r\n" * LDAPSEARCH TOOL */ /* who to bind as */ -#define LDAPSEARCH_BINDDN NULL +#define LDAPSEARCH_BINDDN NULL +#define LDAPSEARCH_BIND_CRED NULL /* search base */ #define LDAPSEARCH_BASE DEFAULT_BASE @@ -175,7 +195,8 @@ Please try again later.\r\n" * LDAPMODIFY TOOL */ /* who to bind as */ -#define LDAPMODIFY_BINDDN NULL +#define LDAPMODIFY_BINDDN NULL +#define LDAPMODIFY_BIND_CRED NULL /* search base */ #define LDAPMODIFY_BASE DEFAULT_BASE @@ -183,7 +204,8 @@ Please try again later.\r\n" * LDAPDELETE TOOL */ /* who to bind as */ -#define LDAPDELETE_BINDDN NULL +#define LDAPDELETE_BINDDN NULL +#define LDAPDELETE_BIND_CRED NULL /* search base */ #define LDAPDELETE_BASE DEFAULT_BASE @@ -191,7 +213,8 @@ Please try again later.\r\n" * LDAPMODRDN TOOL */ /* who to bind as */ -#define LDAPMODRDN_BINDDN NULL +#define LDAPMODRDN_BINDDN NULL +#define LDAPMODRDN_BIND_CRED NULL /* search base */ #define LDAPMODRDN_BASE DEFAULT_BASE @@ -199,7 +222,8 @@ Please try again later.\r\n" * MAIL500 MAILER DEFINITIONS */ /* who to bind as */ -#define MAIL500_BINDDN NULL +#define MAIL500_BINDDN NULL +#define MAIL500_BIND_CRED NULL /* max number of ambiguous matches reported */ #define MAIL500_MAXAMBIGUOUS 10 /* max subscribers allowed (size limit when searching for them ) */ @@ -213,7 +237,7 @@ Please try again later.\r\n" * UD DEFINITIONS */ /* ud configuration file */ -#define UD_CONFIG_FILE "@SYSCONFDIR@/ldap/ud.conf" +#define UD_CONFIG_FILE "@ETCDIR@/ud.conf" /* default editor */ #define UD_DEFAULT_EDITOR "@EDITOR@" /* default bbasename of user config file */ @@ -221,9 +245,9 @@ Please try again later.\r\n" /* default user to bind as */ #define UD_BINDDN NULL /* default password to bind with */ -#define UD_PASSWD NULL +#define UD_BIND_CRED NULL /* default search base */ -#define UD_BASE DEFAULT_BASE +#define UD_BASE DEFAULT_BASE /* default base where groups are created */ #define UD_WHERE_GROUPS_ARE_CREATED "" /* default base below which all groups live */ @@ -233,7 +257,10 @@ Please try again later.\r\n" * FAX500 DEFINITIONS */ /* what to bind as */ -#define FAX_BINDDN NULL +#define FAX_BINDDN NULL +#define FAX_BIND_CRED NULL + /* default search base */ +#define FAX_BASE DEFAULT_BASE /* how long to wait for searches */ #define FAX_TIMEOUT 180 /* maximum number of ambiguous matches reported */ @@ -247,7 +274,11 @@ Please try again later.\r\n" * RP500 DEFINITIONS */ /* what to bind as */ -#define RP_BINDDN NULL +#define RP_BINDDN NULL +#define RP_BIND_CRED NULL + /* default search base */ +#define RP_BASE DEFAULT_BASE + /* prefix to add to non-fully-qualified numbers */ #define RP_PHONEPREFIX "" @@ -255,15 +286,15 @@ Please try again later.\r\n" * SLAPD DEFINITIONS */ /* location of the default slapd config file */ -#define SLAPD_DEFAULT_CONFIGFILE "@SYSCONFDIR@/ldap/slapd.conf" +#define SLAPD_DEFAULT_CONFIGFILE "@ETCDIR@/slapd.conf" /* default sizelimit on number of entries from a search */ #define SLAPD_DEFAULT_SIZELIMIT 500 /* default timelimit to spend on a search */ #define SLAPD_DEFAULT_TIMELIMIT 3600 /* location of the slapd pid file */ -#define SLAPD_PIDFILE "@SYSCONFDIR@/ldap/slapd.pid" +#define SLAPD_PIDFILE "@RUNDIR@/slapd.pid" /* location of the slapd args file */ -#define SLAPD_ARGSFILE "@SYSCONFDIR@/ldap/slapd.args" +#define SLAPD_ARGSFILE "@RUNDIR@/slapd.args" /* dn of the special "monitor" entry */ #define SLAPD_MONITOR_DN "cn=monitor" /* dn of the special "config" entry */ @@ -271,4 +302,4 @@ Please try again later.\r\n" /* minimum max ids that a single index entry can map to in ldbm */ #define SLAPD_LDBM_MIN_MAXIDS 4000 -#endif /* _LDAPCLIENT_H */ +#endif /* _LDAP_CONFIG_H */ -- 2.39.5