From 63ae1d22e527b3fac81ed0ece6a4f718a48c9350 Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 5 Sep 2000 18:24:24 +0000
Subject: [PATCH] Fix ACL SSF reporting

---
 servers/slapd/acl.c      | 16 ++++++++--------
 servers/slapd/aclparse.c |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index 2e18ce48b2..659a13441b 100644
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -637,8 +637,8 @@ acl_mask(
 		}
 
 		if ( b->a_authz.sai_ssf ) {
-			Debug( LDAP_DEBUG_ACL, "<= check a_authz.sai_ssf: %ud\n",
-				b->a_authz.sai_ssf, 0, 0 );
+			Debug( LDAP_DEBUG_ACL, "<= check a_authz.sai_ssf: ACL %u > OP %u\n",
+				b->a_authz.sai_ssf, op->o_ssf, 0 );
 
 			if ( b->a_authz.sai_ssf >  op->o_ssf ) {
 				continue;
@@ -647,8 +647,8 @@ acl_mask(
 
 		if ( b->a_authz.sai_transport_ssf ) {
 			Debug( LDAP_DEBUG_ACL,
-				"<= check a_authz.sai_transport_ssf: %ud\n",
-				b->a_authz.sai_transport_ssf, 0, 0 );
+				"<= check a_authz.sai_transport_ssf: ACL %u > OP %u\n",
+				b->a_authz.sai_transport_ssf, op->o_transport_ssf, 0 );
 
 			if ( b->a_authz.sai_transport_ssf >  op->o_transport_ssf ) {
 				continue;
@@ -657,8 +657,8 @@ acl_mask(
 
 		if ( b->a_authz.sai_tls_ssf ) {
 			Debug( LDAP_DEBUG_ACL,
-				"<= check a_authz.sai_tls_ssf: %ud\n",
-				b->a_authz.sai_tls_ssf, 0, 0 );
+				"<= check a_authz.sai_tls_ssf: ACL %u > OP %s\n",
+				b->a_authz.sai_tls_ssf, op->o_tls_ssf, 0 );
 
 			if ( b->a_authz.sai_tls_ssf >  op->o_tls_ssf ) {
 				continue;
@@ -667,8 +667,8 @@ acl_mask(
 
 		if ( b->a_authz.sai_sasl_ssf ) {
 			Debug( LDAP_DEBUG_ACL,
-				"<= check a_authz.sai_sasl_ssf: %ud\n",
-				b->a_authz.sai_sasl_ssf, 0, 0 );
+				"<= check a_authz.sai_sasl_ssf: ACL %u > OP %s\n",
+				b->a_authz.sai_sasl_ssf, op->o_sasl_ssf, 0 );
 
 			if ( b->a_authz.sai_sasl_ssf >  op->o_sasl_ssf ) {
 				continue;
diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index 54661b75da..d3b88bc6ec 100644
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -1236,19 +1236,19 @@ print_access( Access *b )
 
 	/* Security Strength Factors */
 	if ( b->a_authz.sai_ssf ) {
-		fprintf( stderr, " ssf=%ud",
+		fprintf( stderr, " ssf=%u",
 			b->a_authz.sai_ssf );
 	}
 	if ( b->a_authz.sai_transport_ssf ) {
-		fprintf( stderr, " transport_ssf=%ud",
+		fprintf( stderr, " transport_ssf=%u",
 			b->a_authz.sai_transport_ssf );
 	}
 	if ( b->a_authz.sai_tls_ssf ) {
-		fprintf( stderr, " tls_ssf=%ud",
+		fprintf( stderr, " tls_ssf=%u",
 			b->a_authz.sai_tls_ssf );
 	}
 	if ( b->a_authz.sai_sasl_ssf ) {
-		fprintf( stderr, " sasl_ssf=%ud",
+		fprintf( stderr, " sasl_ssf=%u",
 			b->a_authz.sai_sasl_ssf );
 	}
 
-- 
2.39.5