add logs; fix bug in group/dn selection logic

[openldap] / servers / slapd / compare.c

diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c
index 228983af14d08eb23de5954fb2b2ad3b9ca91bbe..9c483a7a677d71e6e39d8a662e61616d8d4d88a9 100644 (file)
--- a/servers/slapd/compare.c
+++ b/servers/slapd/compare.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2004 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -32,7 +32,7 @@
 #include "ldap_pvt.h"
 #include "slap.h"
 #ifdef LDAP_SLAPI
-#include "slapi.h"
+#include "slapi/slapi.h"
 #endif
 
 static int compare_entry(
@@ -47,10 +47,10 @@ do_compare(
 )
 {
        Entry *entry = NULL;
-       struct berval dn = { 0, NULL };
-       struct berval desc = { 0, NULL };
-       struct berval value = { 0, NULL };
-       AttributeAssertion ava = { NULL, { 0, NULL } };
+       struct berval dn = BER_BVNULL;
+       struct berval desc = BER_BVNULL;
+       struct berval value = BER_BVNULL;
+       AttributeAssertion ava = { NULL, BER_BVNULL };
        int manageDSAit;
 
        ava.aa_desc = NULL;