Merge remote-tracking branch 'origin/mdb.RE/0.9'

[openldap] / servers / slapd / aclparse.c

diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index b433196837ff97e3894c0955a64c4d5c62212de3..f5c244c82de564d3550cbce6fada0fe31de0b038 100644 (file)
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2011 The OpenLDAP Foundation.
+ * Copyright 1998-2014 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -2830,7 +2830,7 @@ acl_unparse( AccessControl *a, struct berval *bv )
                ptr = acl_safe_strcopy( ptr, "\n" );
        }
 
-       if ( !BER_BVISEMPTY( &a->acl_attrval ) ) {
+       if ( !BER_BVISNULL( &a->acl_attrval ) ) {
                to++;
                ptr = acl_safe_strcopy( ptr, " val." );
                if ( a->acl_attrval_style == ACL_STYLE_BASE &&