From 7e9ff09fcb2366b383b7ebbec80d2f6fff117290 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 13 Mar 2018 01:29:54 +0100 Subject: New upstream version 1.10.6 --- src/ppp/nm-pppd-plugin.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'src/ppp/nm-pppd-plugin.c') diff --git a/src/ppp/nm-pppd-plugin.c b/src/ppp/nm-pppd-plugin.c index 9c47c339..0ac8f907 100644 --- a/src/ppp/nm-pppd-plugin.c +++ b/src/ppp/nm-pppd-plugin.c @@ -281,7 +281,6 @@ get_credentials (char *username, char *password) { const char *my_username = NULL; const char *my_password = NULL; - size_t len; GVariant *ret; GError *err = NULL; @@ -313,21 +312,11 @@ get_credentials (char *username, char *password) g_variant_get (ret, "(&s&s)", &my_username, &my_password); - if (my_username) { - len = strlen (my_username) + 1; - len = len < MAXNAMELEN ? len : MAXNAMELEN; + if (my_username) + g_strlcpy (username, my_username, MAXNAMELEN); - strncpy (username, my_username, len); - username[len - 1] = '\0'; - } - - if (my_password) { - len = strlen (my_password) + 1; - len = len < MAXSECRETLEN ? len : MAXSECRETLEN; - - strncpy (password, my_password, len); - password[len - 1] = '\0'; - } + if (my_password) + g_strlcpy (password, my_password, MAXSECRETLEN); g_variant_unref (ret); -- cgit 1.3.0-6-gf8a5