Add sets to NT build, remove LINT

diff --git a/servers/slapd/libslapd.dsp b/servers/slapd/libslapd.dsp
index da4167d05a4584d1189ab4226d6468b96d1c31fa..700b29c4bc44c1ea9a3736772c088a259a06bdcb 100644 (file)
--- a/servers/slapd/libslapd.dsp
+++ b/servers/slapd/libslapd.dsp
@@ -312,6 +312,14 @@ SOURCE=.\search.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\sets.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\sets.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\slap.h
 # End Source File
 # Begin Source File

diff --git a/servers/slapd/sets.c b/servers/slapd/sets.c
index 622249377dae54bf2ef749f17c66f441d34b1754..0fdec47ee2b783b10ce554f3c5c74007d8472f67 100644 (file)
--- a/servers/slapd/sets.c
+++ b/servers/slapd/sets.c
@@ -4,9 +4,12 @@
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
-#include "portable.h"
-#include <ac/string.h>
+#include "portable.h"\r
 
+#include <stdio.h>\r
+#include <ac/string.h>
+\r
+#include "slap.h"
 #include "sets.h"
 
 static char **set_join (char **lset, int op, char **rset);

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index f1d8de5cf42f2ff049e7351ccc91a4a522be51cc..f7d8175d12114a532daf3d690fb09c6fae667b02 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -78,6 +78,9 @@ LDAP_BEGIN_DECL
 #define ASCII_DIGIT(c) ( (c) >= '0' && (c) <= '9' )
 #define ASCII_ALNUM(c) ( ASCII_ALPHA(c) || ASCII_DIGIT(c) )
 
+#define ASCII_PRINTABLE(c) ( (c) >= ' ' && (c) <= '~' )
+#define FILTER_ESCAPE(c) ( (c) == '\\' || (c) == '(' || (c) == ')' || !ASCII_PRINTABLE(c) )
+
 #define DN_SEPARATOR(c)        ((c) == ',' || (c) == ';')
 #define RDN_SEPARATOR(c)       ((c) == ',' || (c) == ';' || (c) == '+')
 #define RDN_NEEDSESCAPE(c)     ((c) == '\\' || (c) == '"')