From 79c62c2af6f7512b4cb6ca307843f8dbb786f49c Mon Sep 17 00:00:00 2001 From: rob Date: Tue, 31 Jul 2018 11:37:18 +0000 Subject: [PATCH] Fix some debugging output now that ber type and encoding are unsigned int. ok claudio@ --- usr.bin/ldap/aldap.c | 8 ++++---- usr.bin/ldap/ber.c | 4 ++-- usr.sbin/ldapd/ber.c | 4 ++-- usr.sbin/snmpd/ber.c | 4 ++-- usr.sbin/ypldap/aldap.c | 8 ++++---- usr.sbin/ypldap/ber.c | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/usr.bin/ldap/aldap.c b/usr.bin/ldap/aldap.c index 4c0f87004bd..b5a0c86c431 100644 --- a/usr.bin/ldap/aldap.c +++ b/usr.bin/ldap/aldap.c @@ -1,5 +1,5 @@ -/* $Id: aldap.c,v 1.3 2018/07/31 11:02:01 claudio Exp $ */ -/* $OpenBSD: aldap.c,v 1.3 2018/07/31 11:02:01 claudio Exp $ */ +/* $Id: aldap.c,v 1.4 2018/07/31 11:37:18 rob Exp $ */ +/* $OpenBSD: aldap.c,v 1.4 2018/07/31 11:37:18 rob Exp $ */ /* * Copyright (c) 2008 Alexander Schrijver @@ -1217,7 +1217,7 @@ ldap_debug_elements(struct ber_element *root) break; case BER_CLASS_PRIVATE: fprintf(stderr, "class: private(%u) type: ", root->be_class); - fprintf(stderr, "encoding (%lu) type: ", root->be_encoding); + fprintf(stderr, "encoding (%u) type: ", root->be_encoding); break; case BER_CLASS_CONTEXT: /* XXX: this is not correct */ @@ -1232,7 +1232,7 @@ ldap_debug_elements(struct ber_element *root) fprintf(stderr, "class: (%u) type: ", root->be_class); break; } - fprintf(stderr, "(%lu) encoding %lu ", + fprintf(stderr, "(%u) encoding %u ", root->be_type, root->be_encoding); if (constructed) diff --git a/usr.bin/ldap/ber.c b/usr.bin/ldap/ber.c index 2eef9d7d80d..981595fc4ce 100644 --- a/usr.bin/ldap/ber.c +++ b/usr.bin/ldap/ber.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ber.c,v 1.15 2018/07/31 11:02:01 claudio Exp $ */ +/* $OpenBSD: ber.c,v 1.16 2018/07/31 11:37:18 rob Exp $ */ /* * Copyright (c) 2007, 2012 Reyk Floeter @@ -1100,7 +1100,7 @@ ber_read_element(struct ber *ber, struct ber_element *elm) if ((r = get_id(ber, &type, &class, &cstruct)) == -1) return -1; - DPRINTF("ber read got class %d type %lu, %s\n", + DPRINTF("ber read got class %d type %u, %s\n", class, type, cstruct ? "constructed" : "primitive"); totlen += r; if ((r = get_len(ber, &len)) == -1) diff --git a/usr.sbin/ldapd/ber.c b/usr.sbin/ldapd/ber.c index 47a8cf891b6..e30f882aadd 100644 --- a/usr.sbin/ldapd/ber.c +++ b/usr.sbin/ldapd/ber.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ber.c,v 1.25 2018/07/31 11:01:00 claudio Exp $ */ +/* $OpenBSD: ber.c,v 1.26 2018/07/31 11:37:18 rob Exp $ */ /* * Copyright (c) 2007, 2012 Reyk Floeter @@ -1100,7 +1100,7 @@ ber_read_element(struct ber *ber, struct ber_element *elm) if ((r = get_id(ber, &type, &class, &cstruct)) == -1) return -1; - DPRINTF("ber read got class %d type %lu, %s\n", + DPRINTF("ber read got class %d type %u, %s\n", class, type, cstruct ? "constructed" : "primitive"); totlen += r; if ((r = get_len(ber, &len)) == -1) diff --git a/usr.sbin/snmpd/ber.c b/usr.sbin/snmpd/ber.c index 1cedb4d5bf7..e9f7b45df1c 100644 --- a/usr.sbin/snmpd/ber.c +++ b/usr.sbin/snmpd/ber.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ber.c,v 1.44 2018/07/31 11:01:29 claudio Exp $ */ +/* $OpenBSD: ber.c,v 1.45 2018/07/31 11:37:18 rob Exp $ */ /* * Copyright (c) 2007, 2012 Reyk Floeter @@ -1100,7 +1100,7 @@ ber_read_element(struct ber *ber, struct ber_element *elm) if ((r = get_id(ber, &type, &class, &cstruct)) == -1) return -1; - DPRINTF("ber read got class %d type %lu, %s\n", + DPRINTF("ber read got class %d type %u, %s\n", class, type, cstruct ? "constructed" : "primitive"); totlen += r; if ((r = get_len(ber, &len)) == -1) diff --git a/usr.sbin/ypldap/aldap.c b/usr.sbin/ypldap/aldap.c index d54a0ac27e6..7f17ba3ba5a 100644 --- a/usr.sbin/ypldap/aldap.c +++ b/usr.sbin/ypldap/aldap.c @@ -1,5 +1,5 @@ -/* $Id: aldap.c,v 1.41 2018/07/31 11:00:12 claudio Exp $ */ -/* $OpenBSD: aldap.c,v 1.41 2018/07/31 11:00:12 claudio Exp $ */ +/* $Id: aldap.c,v 1.42 2018/07/31 11:37:18 rob Exp $ */ +/* $OpenBSD: aldap.c,v 1.42 2018/07/31 11:37:18 rob Exp $ */ /* * Copyright (c) 2008 Alexander Schrijver @@ -1217,7 +1217,7 @@ ldap_debug_elements(struct ber_element *root) break; case BER_CLASS_PRIVATE: fprintf(stderr, "class: private(%u) type: ", root->be_class); - fprintf(stderr, "encoding (%lu) type: ", root->be_encoding); + fprintf(stderr, "encoding (%u) type: ", root->be_encoding); break; case BER_CLASS_CONTEXT: /* XXX: this is not correct */ @@ -1232,7 +1232,7 @@ ldap_debug_elements(struct ber_element *root) fprintf(stderr, "class: (%u) type: ", root->be_class); break; } - fprintf(stderr, "(%lu) encoding %lu ", + fprintf(stderr, "(%u) encoding %u ", root->be_type, root->be_encoding); if (constructed) diff --git a/usr.sbin/ypldap/ber.c b/usr.sbin/ypldap/ber.c index 81bf6328214..0da4bb3aba1 100644 --- a/usr.sbin/ypldap/ber.c +++ b/usr.sbin/ypldap/ber.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ber.c,v 1.27 2018/07/31 11:00:12 claudio Exp $ */ +/* $OpenBSD: ber.c,v 1.28 2018/07/31 11:37:18 rob Exp $ */ /* * Copyright (c) 2007, 2012 Reyk Floeter @@ -1100,7 +1100,7 @@ ber_read_element(struct ber *ber, struct ber_element *elm) if ((r = get_id(ber, &type, &class, &cstruct)) == -1) return -1; - DPRINTF("ber read got class %d type %lu, %s\n", + DPRINTF("ber read got class %d type %u, %s\n", class, type, cstruct ? "constructed" : "primitive"); totlen += r; if ((r = get_len(ber, &len)) == -1) -- 2.20.1