diff options
| author | Günther Deschner <gd@samba.org> | 2008-10-22 14:06:08 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2008-10-22 21:37:36 +0200 |
| commit | d9f1fff5b35a2c852e69c2c58e68824b5f381d01 (patch) | |
| tree | 7a0c9d09fb9f3623fa9aef746266b60a7cda1873 /source3/libads | |
| parent | cef97c245955d0f125928740cd89984100635d29 (diff) | |
| download | samba-d9f1fff5b35a2c852e69c2c58e68824b5f381d01.tar.gz samba-d9f1fff5b35a2c852e69c2c58e68824b5f381d01.tar.bz2 samba-d9f1fff5b35a2c852e69c2c58e68824b5f381d01.zip | |
s3: use shared asn1 code.
Guenther
Diffstat (limited to 'source3/libads')
| -rw-r--r-- | source3/libads/cldap.c | 8 | ||||
| -rw-r--r-- | source3/libads/sasl.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source3/libads/cldap.c b/source3/libads/cldap.c index c37220c903..7180464d47 100644 --- a/source3/libads/cldap.c +++ b/source3/libads/cldap.c @@ -46,7 +46,7 @@ static int send_cldap_netlogon(int sock, const char *domain, asn1_write_enumerated(&data, 0); asn1_write_Integer(&data, 0); asn1_write_Integer(&data, 0); - asn1_write_BOOLEAN2(&data, False); + asn1_write_BOOLEAN(&data, False); asn1_push_tag(&data, ASN1_CONTEXT(0)); if (domain) { @@ -164,12 +164,12 @@ static int recv_cldap_netlogon(TALLOC_CTX *mem_ctx, asn1_start_tag(&data, ASN1_SEQUENCE(0)); asn1_read_Integer(&data, &i1); asn1_start_tag(&data, ASN1_APPLICATION(4)); - asn1_read_OctetString(&data, &os1); + asn1_read_OctetString(&data, NULL, &os1); asn1_start_tag(&data, ASN1_SEQUENCE(0)); asn1_start_tag(&data, ASN1_SEQUENCE(0)); - asn1_read_OctetString(&data, &os2); + asn1_read_OctetString(&data, NULL, &os2); asn1_start_tag(&data, ASN1_SET); - asn1_read_OctetString(&data, &os3); + asn1_read_OctetString(&data, NULL, &os3); asn1_end_tag(&data); asn1_end_tag(&data); asn1_end_tag(&data); diff --git a/source3/libads/sasl.c b/source3/libads/sasl.c index 55bc16a1be..3182b936e0 100644 --- a/source3/libads/sasl.c +++ b/source3/libads/sasl.c @@ -784,7 +784,7 @@ static ADS_STATUS ads_sasl_spnego_bind(ADS_STRUCT *ads) got_kerberos_mechanism = True; } #endif - free(OIDs[i]); + talloc_free(OIDs[i]); } DEBUG(3,("ads_sasl_spnego_bind: got server principal name = %s\n", given_principal)); @@ -795,7 +795,7 @@ static ADS_STATUS ads_sasl_spnego_bind(ADS_STRUCT *ads) struct ads_service_principal p; status = ads_generate_service_principal(ads, given_principal, &p); - SAFE_FREE(given_principal); + TALLOC_FREE(given_principal); if (!ADS_ERR_OK(status)) { return status; } @@ -830,7 +830,7 @@ static ADS_STATUS ads_sasl_spnego_bind(ADS_STRUCT *ads) } else #endif { - SAFE_FREE(given_principal); + TALLOC_FREE(given_principal); } /* lets do NTLMSSP ... this has the big advantage that we don't need |