From b64c621c9de3fa72ff1f1688d8453d99f5cf7352 Mon Sep 17 00:00:00 2001 From: Alex Dowad Date: Thu, 1 May 2014 13:44:06 +0200 Subject: squark-auth-ip: don't print nulls at end of username --- src/blob.h | 1 + src/squark-auth-ip.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/blob.h b/src/blob.h index ff137af..244a1e4 100644 --- a/src/blob.h +++ b/src/blob.h @@ -31,6 +31,7 @@ typedef struct blob { #define BLOB_STRLEN(str) (blob_t){(str), strlen(str)} #define BLOB_STR_INIT(str) {(str), sizeof(str)-1} #define BLOB_STR(str) (blob_t) BLOB_STR_INIT(str) +#define BLOB_CHAR_ARRAY(a) (blob_t){(a), strnlen(a, sizeof(a))} #define BLOB_NULL (blob_t){NULL, 0} static inline int blob_is_null(blob_t b) diff --git a/src/squark-auth-ip.c b/src/squark-auth-ip.c index baf0b4b..94c450f 100644 --- a/src/squark-auth-ip.c +++ b/src/squark-auth-ip.c @@ -228,7 +228,7 @@ int main(int argc, char **argv) DUMPPAR(&b, "ip_address", addr_push_hostaddr(&b, &ipaddr)); DUMPPAR(&b, "username", - blob_push(&b, BLOB_BUF(entry.p.login_name))); + blob_push(&b, BLOB_CHAR_ARRAY(entry.p.login_name))); DUMPPAR(&b, "mac_address", blob_push_hexdump(&b, BLOB_BUF(entry.p.mac_address))); DUMPPAR(&b, "login_time", -- cgit v1.2.3