diff --git a/ldap/servers/plugins/acl/acl.h b/ldap/servers/plugins/acl/acl.h index be3774c..6fffdc2 100644 --- a/ldap/servers/plugins/acl/acl.h +++ b/ldap/servers/plugins/acl/acl.h @@ -57,14 +57,10 @@ #include "cert.h" #include -#ifdef SOLARIS - #include -#else - #define TNF_PROBE_0_DEBUG(a,b,c) - #define TNF_PROBE_1_DEBUG(a,b,c,d,e,f) -#endif - +#define TNF_PROBE_0_DEBUG(a,b,c) +#define TNF_PROBE_1_DEBUG(a,b,c,d,e,f) #define ACL_PLUGIN_NAME "NSACLPlugin" + extern char *plugin_name; /* diff --git a/ldap/servers/plugins/roles/roles_cache.c b/ldap/servers/plugins/roles/roles_cache.c index 66c8553..37bd77d 100644 --- a/ldap/servers/plugins/roles/roles_cache.c +++ b/ldap/servers/plugins/roles/roles_cache.c @@ -32,11 +32,7 @@ #include "roles_cache.h" #include "views.h" -#ifdef SOLARIS -#include -#else #define TNF_PROBE_0(a,b,c) -#endif #define MAX_NESTED_ROLES 30