Fix some debugging output now that ber type and encoding are unsigned int.

ok claudio@

diff --git a/usr.bin/ldap/aldap.c b/usr.bin/ldap/aldap.c
index 4c0f870..b5a0c86 100644 (file)
--- 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 <aschrijver@openbsd.org>
@@ -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: <INVALID>(%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 2eef9d7..981595f 100644 (file)
--- 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 <reyk@openbsd.org>
@@ -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 47a8cf8..e30f882 100644 (file)
--- 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 <reyk@openbsd.org>
@@ -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 1cedb4d..e9f7b45 100644 (file)
--- 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 <reyk@openbsd.org>
@@ -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 d54a0ac..7f17ba3 100644 (file)
--- 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 <aschrijver@openbsd.org>
@@ -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: <INVALID>(%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 81bf632..0da4bb3 100644 (file)
--- 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 <reyk@openbsd.org>
@@ -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)