Fixes compiling issues on NT4.

diff --git a/include/ldapconfig.h.nt b/include/ldapconfig.h.nt
new file mode 100644 (file)
index 0000000..6a5dbf5
--- /dev/null
+++ b/include/ldapconfig.h.nt
@@ -0,0 +1,222 @@
+/*
+ * Copyright (c) 1994 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ */
+
+#ifndef _LDAP_CONFIG_H
+#define _LDAP_CONFIG_H
+
+/*
+ * config.h for LDAP -- edit this file to customize LDAP client behavior.
+ * NO platform-specific definitions should be placed in this file.
+ * Note that this IS USED by the LDAP or LBER libraries.
+ */
+
+/*
+ * SHARED DEFINITIONS - things you should change
+ */
+/*
+ * SHARED DEFINITIONS - things you should change
+ */
+#define DEFAULT_BINDIR         "C:\\OpenLDAP\\bin"
+#define DEFAULT_SBINDIR                "C:\\OpenLDAP\\sbin"
+#define DEFAULT_DATADIR                "C:\\OpenLDAP\\share"
+#define DEFAULT_SYSCONFDIR     "C:\\OpenLDAP\\etc"
+#define DEFAULT_LIBEXECDIR     "C:\\OpenLDAP\\execdir"
+#define DEFAULT_RUNDIR         "C:\\OpenLDAP\\run"
+
+#define DEFAULT_LDAP_CONF_FILE "C:\\OpenLDAP\\ldap.conf"
+#define DEFAULT_LDAP_USERRC_FILE "ldaprc"
+#define DEFAULT_LDAP_ENV_PREFIX "LDAP"
+
+
+/*********************************************************************
+ *                                                                   *
+ * You probably do not need to edit anything below this point        *
+ *                                                                   *
+ *********************************************************************/
+
+/*
+ * SHARED DEFINITIONS - other things you can change
+ */
+       /* default attribute to use when sorting entries, NULL => sort by DN */
+#define SORT_ATTR      NULL
+       /* default count of DN components to show in entry displays */
+#define DEFAULT_RDNCOUNT       2
+       /* default config file locations */
+#define FILTERFILE             "C:\\OpenLDAP\\etc\\ldapfilter.conf"
+#define TEMPLATEFILE   "C:\\OpenLDAP\\etc\\ldaptemplates.conf"
+#define SEARCHFILE             "C:\\OpenLDAP\\etc\\ldapsearchprefs.conf"
+#define FRIENDLYFILE   "C:\\OpenLDAP\\share\\ldapfriendly"
+
+/*
+ * FINGER DEFINITIONS
+ */
+       /* banner to print */
+#define FINGER_BANNER          "OpenLDAP Finger Service...\r\n"
+       /* who to report errors to */
+#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 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."
+#define FINGER_NOEMAIL2        NULL
+#define FINGER_NOEMAIL { FINGER_NOEMAIL1, FINGER_NOEMAIL2, NULL }
+       /* maximum number of matches returned */
+#define FINGER_SIZELIMIT       50
+       /* max number of hits displayed in full before a list is presented */
+#define FINGER_LISTLIMIT       1
+       /* what to exec for "finger @host" */
+#define FINGER_CMD             "%FINGER%"
+       /* how to treat aliases when searching */
+#define FINGER_DEREF           LDAP_DEREF_FINDING
+       /* attribute to use when sorting results */
+#define FINGER_SORT_ATTR       SORT_ATTR
+       /* enable ufn support */
+#define FINGER_UFN
+       /* timeout for searches */
+#define FINGER_TIMEOUT         60
+       /* number of DN components to show in entry displays */
+#define FINGER_RDNCOUNT                DEFAULT_RDNCOUNT        
+
+/*
+ * GO500 GOPHER GATEWAY DEFINITIONS
+ */
+       /* port on which to listen */
+#define GO500_PORT     5555
+       /* how to handle aliases */
+#define GO500_DEREF    LDAP_DEREF_FINDING
+       /* attribute to use when sorting results */
+#define GO500_SORT_ATTR        SORT_ATTR
+       /* timeout for searches */
+#define GO500_TIMEOUT  180
+       /* enable ufn support */
+#define GO500_UFN
+       /*
+        * only set and uncomment this if your hostname() does not return
+        * a fully qualified hostname
+        */
+/* #define GO500_HOSTNAME      "fully.qualified.hostname.here" */
+       /* number of DN components to show in entry displays */
+#define GO500_RDNCOUNT         DEFAULT_RDNCOUNT        
+
+/*
+ * GO500GW GOPHER GATEWAY DEFINITIONS
+ */
+       /* where the helpfile lives */
+#define GO500GW_HELPFILE       "C:\\OpenLDAP\\share\\go500gw.help"
+       /* port on which to listen */
+#define GO500GW_PORT           7777
+       /* timeout on all searches */
+#define GO500GW_TIMEOUT                180
+       /* enable ufn support */
+#define GO500GW_UFN
+       /* attribute to use when sorting results */
+#define GO500GW_SORT_ATTR      SORT_ATTR
+       /*
+        * only set and uncomment this if your hostname() does not return
+        * a fully qualified hostname
+        */
+/* #define GO500GW_HOSTNAME    "fully.qualified.hostname.here" */
+       /* number of DN components to show in entry displays */
+#define GO500GW_RDNCOUNT       DEFAULT_RDNCOUNT        
+
+/*
+ * RCPT500 MAIL RESPONDER GATEWAY DEFINITIONS
+ */
+       /* where the helpfile lives */
+#define RCPT500_HELPFILE       "C:\\OpenLDAP\\share\\rcpt500.help"
+       /* maximum number of matches returned */
+#define RCPT500_SIZELIMIT      50
+       /* address replies will appear to come from */
+#define RCPT500_FROM           "\"Directory Query Program\" <Dir-Query>"
+       /* command that will accept an RFC822 message text on standard
+          input, and send it.  sendmail -t does this nicely. */
+#define RCPT500_PIPEMAILCMD    "%SENDMAIL% -t"
+       /* attribute to use when sorting results */
+#define RCPT500_SORT_ATTR      SORT_ATTR
+       /* max number of hits displayed in full before a list is presented */
+#define RCPT500_LISTLIMIT      1
+       /* enable ufn support */
+#define RCPT500_UFN
+       /* number of DN components to show in entry displays */
+#define RCPT500_RDNCOUNT       DEFAULT_RDNCOUNT        
+
+/*
+ * MAIL500 MAILER DEFINITIONS
+ */
+       /* max number of ambiguous matches reported */
+#define MAIL500_MAXAMBIGUOUS   10
+       /* max subscribers allowed (size limit when searching for them ) */
+#define MAIL500_MAXGROUPMEMBERS        LDAP_NO_LIMIT
+       /* timeout for all searches */
+#define MAIL500_TIMEOUT                180
+       /* sendmail location - mail500 needs to exec this */
+#define MAIL500_SENDMAIL       "%SENDMAIL%"
+
+/*
+ * UD DEFINITIONS
+ */
+       /* ud configuration file */
+#define UD_CONFIG_FILE         "C:\\OpenLDAP\\etc\\ud.conf"
+       /* default editor */
+#define UD_DEFAULT_EDITOR      "%EDITOR%"
+       /* default bbasename of user config file */
+#define UD_USER_CONFIG_FILE    ".udrc"
+       /* default base where groups are created */
+#define UD_WHERE_GROUPS_ARE_CREATED    ""
+       /* default base below which all groups live */
+#define UD_WHERE_ALL_GROUPS_LIVE       ""
+
+/*
+ * FAX500 DEFINITIONS
+ */
+       /* how long to wait for searches */
+#define FAX_TIMEOUT            180
+       /* maximum number of ambiguous matches reported */
+#define FAX_MAXAMBIGUOUS       10
+       /* maximum number of members allowed */
+#define FAX_MAXMEMBERS         LDAP_NO_LIMIT
+       /* program to send mail */
+#define FAX_SENDMAIL           "%SENDMAIL%"
+
+/*
+ * RP500 DEFINITIONS
+ */
+       /* prefix to add to non-fully-qualified numbers */
+#define RP_PHONEPREFIX ""
+
+/*
+ * SLAPD DEFINITIONS
+ */
+       /* location of the default slapd config file */
+#define SLAPD_DEFAULT_CONFIGFILE       "C:\\OpenLDAP\\etc\\slapd.conf"
+       /* default max deref depth for aliases */
+#define SLAPD_DEFAULT_MAXDEREFDEPTH    15      
+       /* 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                  "C:\\OpenLDAP\\run\\slapd.pid"
+       /* location of the slapd args file */
+#define SLAPD_ARGSFILE                 "C:\\OpenLDAP\\run\\slapd.args"
+       /* dn of the special "monitor" entry */
+#define SLAPD_MONITOR_DN               "cn=monitor"
+       /* dn of the special "config" entry */
+#define SLAPD_CONFIG_DN                        "cn=config"
+       /* minimum max ids that a single index entry can map to in ldbm */
+#define SLAPD_LDBM_MIN_MAXIDS          4000
+
+#endif /* _LDAP_CONFIG_H */

diff --git a/libraries/libldap/libldap.dsp b/libraries/libldap/libldap.dsp
index 169f872173b7ca9d9a027426ba4e5aca2c2d1bf4..d987163a6418bac935fb1a0657a36a775869e6af 100644 (file)
--- a/libraries/libldap/libldap.dsp
+++ b/libraries/libldap/libldap.dsp
@@ -156,6 +156,10 @@ SOURCE=.\getvalues.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\init.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\kbind.c
 # End Source File
 # Begin Source File
@@ -204,6 +208,10 @@ SOURCE=.\srchpref.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\strdup.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\ufn.c
 # End Source File
 # Begin Source File

diff --git a/libraries/libldap/srchpref.c b/libraries/libldap/srchpref.c
index 9ada96636900f8e958ba5b3f1a86f69d03d15a56..50af66a2a29903e866a599f4440e4be050849109 100644 (file)
--- a/libraries/libldap/srchpref.c
+++ b/libraries/libldap/srchpref.c
@@ -31,6 +31,8 @@
 #include "ldap.h"
 #include "srchpref.h"
 
+#include "ldap-int.h"
+
 static void free_searchobj LDAP_P(( struct ldap_searchobj *so ));
 static int read_next_searchobj LDAP_P(( char **bufp, long *blenp,
        struct ldap_searchobj **sop, int soversion ));