From b8cd5305067f511db230ff3b5548aad0f336ecb4 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Fri, 10 Jan 2014 09:37:31 +0100 Subject: [PATCH] shorter names for states --- src/main-ctl-handler.c | 4 ++-- src/occtl.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main-ctl-handler.c b/src/main-ctl-handler.c index a77da12b..8e1844dc 100644 --- a/src/main-ctl-handler.c +++ b/src/main-ctl-handler.c @@ -497,9 +497,9 @@ static int append_user_info(DBusMessageIter * subs, struct proc_st *ctmp) } if (ctmp->auth_status == PS_AUTH_COMPLETED) - strtmp = "authenticated"; + strtmp = "connected"; else if (ctmp->auth_status == PS_AUTH_INIT) - strtmp = "authenticating"; + strtmp = "auth"; else strtmp = "pre-auth"; if (dbus_message_iter_append_basic diff --git a/src/occtl.c b/src/occtl.c index e5a2c81f..66f3d8d9 100644 --- a/src/occtl.c +++ b/src/occtl.c @@ -638,7 +638,7 @@ void handle_list_users_cmd(DBusConnection * conn, const char *arg) /* add header */ if (iteration++ == 0) { - fprintf(out, "%6s %8s %8s %15s %15s %6s %7s %9s %10s\n", + fprintf(out, "%6s %8s %8s %15s %15s %6s %7s %9s %9s\n", "id", "user", "group", "ip", "vpn-ip", "device", "since", "cipher", "status"); } @@ -652,9 +652,9 @@ void handle_list_users_cmd(DBusConnection * conn, const char *arg) print_time_ival7(t, out); if (dtls_ciphersuite != NULL && dtls_ciphersuite[0] != 0) - fprintf(out, " %9s %10s\n", dtls_ciphersuite, auth); + fprintf(out, " %9s %9s\n", dtls_ciphersuite, auth); else - fprintf(out, " %9s %10s\n", "(no dtls)", auth); + fprintf(out, " %9s %9s\n", "(no dtls)", auth); if (!dbus_message_iter_next(&suba)) goto cleanup;