Merge branch 'liboping-0.3'

diff --cc src/liboping.c
index 9d14826,4c614f7..17071fd
--- 1/src/liboping.c
--- 2/src/liboping.c
+++ b/src/liboping.c
@@@ -1267,21 -1253,9 +1267,21 @@@ int ping_iterator_get_info (pingobj_ite
  
        switch (info)
        {
 +              case PING_INFO_USERNAME:
 +                      ret = ENOMEM;
 +                      *buffer_len = strlen (iter->username);
 +                      if (orig_buffer_len <= *buffer_len)
 +                              break;
 +                      /* Since (orig_buffer_len > *buffer_len) `strncpy'
 +                       * will copy `*buffer_len' and pad the rest of
 +                       * `buffer' with null-bytes */
 +                      strncpy (buffer, iter->username, orig_buffer_len);
 +                      ret = 0;
 +                      break;
 +
                case PING_INFO_HOSTNAME:
                        ret = ENOMEM;
-                       *buffer_len = strlen (iter->hostname);
+                       *buffer_len = strlen (iter->hostname) + 1;
                        if (orig_buffer_len <= *buffer_len)
                                break;
                        /* Since (orig_buffer_len > *buffer_len) `strncpy'