Make use of nanosleep/select as a sched_yeild(2) replacement

[openldap] / include / ldap_defaults.h

diff --git a/include/ldap_defaults.h b/include/ldap_defaults.h
index 91b73336bed9a6551f2db3be6068cdc9bfd6d271..861c0c199d06c06192abde072c053be769b166a9 100644 (file)
--- a/include/ldap_defaults.h
+++ b/include/ldap_defaults.h
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  * 
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,14 +39,14 @@
 #define LDAP_ENV_PREFIX "LDAP"
 
 /* default ldapi:// socket */
-#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" \
-       LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"
+#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"
 
 /*
  * SLAPD DEFINITIONS
  */
        /* location of the default slapd config file */
 #define SLAPD_DEFAULT_CONFIGFILE       LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.conf"
+#define SLAPD_DEFAULT_CONFIGDIR                LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.d"
 #define SLAPD_DEFAULT_DB_DIR           LDAP_RUNDIR LDAP_DIRSEP "openldap-data"
 #define SLAPD_DEFAULT_DB_MODE          0600
 #define SLAPD_DEFAULT_UCDATA           LDAP_DATADIR LDAP_DIRSEP "ucdata"