------------------------------------------------------------ revno: 13022 revision-id: squid3@treenet.co.nz-20131101012624-8dn99svh0m1m8uo6 parent: squid3@treenet.co.nz-20131101012517-t73po8ww8d1ygrb2 author: Markus Moeller committer: Amos Jeffries branch nick: 3.4 timestamp: Thu 2013-10-31 19:26:24 -0600 message: kerberos_ldap_group: fix LDAP string duplication ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20131101012624-8dn99svh0m1m8uo6 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 # testament_sha1: c91509367280a806c661521300e383b25f4cecae # timestamp: 2013-11-01 01:27:32 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 # base_revision_id: squid3@treenet.co.nz-20131101012517-\ # t73po8ww8d1ygrb2 # # Begin patch === modified file 'helpers/external_acl/kerberos_ldap_group/support_ldap.cc' --- helpers/external_acl/kerberos_ldap_group/support_ldap.cc 2013-10-03 10:47:40 +0000 +++ helpers/external_acl/kerberos_ldap_group/support_ldap.cc 2013-11-01 01:26:24 +0000 @@ -640,11 +640,11 @@ memset(url, 0, sizeof(*url)); #ifdef HAVE_LDAP_URL_LUD_SCHEME if (ssl) - url->lud_scheme = (char *) "ldaps"; + url->lud_scheme = xstrdup("ldaps"); else - url->lud_scheme = (char *) "ldap"; + url->lud_scheme = xstrdup("ldap"); #endif - url->lud_host = host; + url->lud_host = xstrdup(host); url->lud_port = port; #ifdef HAVE_LDAP_SCOPE_DEFAULT url->lud_scope = LDAP_SCOPE_DEFAULT; @@ -707,9 +707,9 @@ url = (LDAPURLDesc *) xmalloc(sizeof(*url)); memset(url, 0, sizeof(*url)); #ifdef HAVE_LDAP_URL_LUD_SCHEME - url->lud_scheme = (char *) "ldaps"; + url->lud_scheme = xstrdup("ldaps"); #endif - url->lud_host = host; + url->lud_host = xstrdup(host); url->lud_port = port; #ifdef HAVE_LDAP_SCOPE_DEFAULT url->lud_scope = LDAP_SCOPE_DEFAULT;