pidgin/ljfisher-ssl-client-auth

Fix some un-fixes in the Zephyr strlcpy changes

2011-08-16, Ethan Blanton
b1662f03fa07
Parents 07e52e08be42
Children 2710edaebd02
Fix some un-fixes in the Zephyr strlcpy changes
2 files changed, 2 insertions(+), 2 deletions(-)
  • +1 -1
    libpurple/protocols/zephyr/ZInit.c
  • +1 -1
    libpurple/protocols/zephyr/Zinternal.c
    • --- a/libpurple/protocols/zephyr/ZInit.c Tue Aug 16 12:09:51 2011 +0000
    +++ b/libpurple/protocols/zephyr/ZInit.c Tue Aug 16 15:03:35 2011 +0000
    @@ -108,7 +108,7 @@
    return (krbval);
    }
    #else
    - g_strlcpy(__Zephyr_realm, "local-realm", 12);
    + g_strlcpy(__Zephyr_realm, "local-realm", REALM_SZ);
    #endif
    __My_addr.s_addr = INADDR_NONE;
    --- a/libpurple/protocols/zephyr/Zinternal.c Tue Aug 16 12:09:51 2011 +0000
    +++ b/libpurple/protocols/zephyr/Zinternal.c Tue Aug 16 15:03:35 2011 +0000
    @@ -767,7 +767,7 @@
    if (*ptr+len > end)
    return 1;
    if (field)
    - g_strlcpy(*ptr, field, len);
    + strcpy(*ptr, field);
    else
    **ptr = '\0';
    *ptr += len;