From 759da3b915e2006d4c87b5ace47f399accd9ce91 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 27 Jan 2005 07:08:20 +0000 Subject: r5037: got rid of all of the TALLOC_DEPRECATED stuff. My apologies for the large commit. I thought this was worthwhile to get done for consistency. (This used to be commit ec32b22ed5ec224f6324f5e069d15e92e38e15c0) --- source4/libcli/auth/clikrb5.c | 2 +- source4/libcli/auth/gensec.c | 6 +++--- source4/libcli/auth/gensec_gssapi.c | 2 +- source4/libcli/auth/gensec_krb5.c | 2 +- source4/libcli/auth/gensec_ntlmssp.c | 2 +- source4/libcli/auth/ntlmssp.c | 4 ++-- source4/libcli/auth/ntlmssp_parse.c | 4 ++-- source4/libcli/auth/schannel.c | 2 +- source4/libcli/auth/spnego.c | 4 ++-- source4/libcli/auth/spnego_parse.c | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) (limited to 'source4/libcli/auth') diff --git a/source4/libcli/auth/clikrb5.c b/source4/libcli/auth/clikrb5.c index 122f9510e7..051798c9f1 100644 --- a/source4/libcli/auth/clikrb5.c +++ b/source4/libcli/auth/clikrb5.c @@ -321,7 +321,7 @@ static BOOL ads_cleanup_expired_creds(krb5_context context, krb5_cc_default_name(context), http_timestring(mem_ctx, credsp->times.endtime))); - talloc_destroy(mem_ctx); + talloc_free(mem_ctx); /* we will probably need new tickets if the current ones will expire within 10 seconds. diff --git a/source4/libcli/auth/gensec.c b/source4/libcli/auth/gensec.c index fb638a9000..e9dea6be33 100644 --- a/source4/libcli/auth/gensec.c +++ b/source4/libcli/auth/gensec.c @@ -94,7 +94,7 @@ const char **gensec_security_oids(TALLOC_CTX *mem_ctx, const char *skip) if (!ops) { return NULL; } - oid_list = talloc_array_p(mem_ctx, const char *, num_backends + 1); + oid_list = talloc_array(mem_ctx, const char *, num_backends + 1); if (!oid_list) { return NULL; } @@ -123,7 +123,7 @@ const char **gensec_security_oids(TALLOC_CTX *mem_ctx, const char *skip) */ static NTSTATUS gensec_start(TALLOC_CTX *mem_ctx, struct gensec_security **gensec_security) { - (*gensec_security) = talloc_p(mem_ctx, struct gensec_security); + (*gensec_security) = talloc(mem_ctx, struct gensec_security); if (!(*gensec_security)) { return NT_STATUS_NO_MEMORY; } @@ -155,7 +155,7 @@ NTSTATUS gensec_subcontext_start(TALLOC_CTX *mem_ctx, struct gensec_security *parent, struct gensec_security **gensec_security) { - (*gensec_security) = talloc_p(mem_ctx, struct gensec_security); + (*gensec_security) = talloc(mem_ctx, struct gensec_security); if (!(*gensec_security)) { return NT_STATUS_NO_MEMORY; } diff --git a/source4/libcli/auth/gensec_gssapi.c b/source4/libcli/auth/gensec_gssapi.c index 80a17c1b6b..43113412f7 100644 --- a/source4/libcli/auth/gensec_gssapi.c +++ b/source4/libcli/auth/gensec_gssapi.c @@ -62,7 +62,7 @@ static NTSTATUS gensec_gssapi_start(struct gensec_security *gensec_security) { struct gensec_gssapi_state *gensec_gssapi_state; - gensec_gssapi_state = talloc_p(gensec_security, struct gensec_gssapi_state); + gensec_gssapi_state = talloc(gensec_security, struct gensec_gssapi_state); if (!gensec_gssapi_state) { return NT_STATUS_NO_MEMORY; } diff --git a/source4/libcli/auth/gensec_krb5.c b/source4/libcli/auth/gensec_krb5.c index aaf892e1e6..e5bfd3865a 100644 --- a/source4/libcli/auth/gensec_krb5.c +++ b/source4/libcli/auth/gensec_krb5.c @@ -258,7 +258,7 @@ static NTSTATUS gensec_krb5_start(struct gensec_security *gensec_security) struct gensec_krb5_state *gensec_krb5_state; krb5_error_code ret = 0; - gensec_krb5_state = talloc_p(gensec_security, struct gensec_krb5_state); + gensec_krb5_state = talloc(gensec_security, struct gensec_krb5_state); if (!gensec_krb5_state) { return NT_STATUS_NO_MEMORY; } diff --git a/source4/libcli/auth/gensec_ntlmssp.c b/source4/libcli/auth/gensec_ntlmssp.c index ae97803ef7..59bab6ced2 100644 --- a/source4/libcli/auth/gensec_ntlmssp.c +++ b/source4/libcli/auth/gensec_ntlmssp.c @@ -143,7 +143,7 @@ static NTSTATUS gensec_ntlmssp_start(struct gensec_security *gensec_security) { struct gensec_ntlmssp_state *gensec_ntlmssp_state; - gensec_ntlmssp_state = talloc_p(gensec_security, struct gensec_ntlmssp_state); + gensec_ntlmssp_state = talloc(gensec_security, struct gensec_ntlmssp_state); if (!gensec_ntlmssp_state) { return NT_STATUS_NO_MEMORY; } diff --git a/source4/libcli/auth/ntlmssp.c b/source4/libcli/auth/ntlmssp.c index a9fb66d41e..d5ddcfbfb6 100644 --- a/source4/libcli/auth/ntlmssp.c +++ b/source4/libcli/auth/ntlmssp.c @@ -909,7 +909,7 @@ static NTSTATUS ntlmssp_server_auth(struct ntlmssp_state *ntlmssp_state, NTSTATUS ntlmssp_server_start(TALLOC_CTX *mem_ctx, struct ntlmssp_state **ntlmssp_state) { - *ntlmssp_state = talloc_p(mem_ctx, struct ntlmssp_state); + *ntlmssp_state = talloc(mem_ctx, struct ntlmssp_state); if (!*ntlmssp_state) { DEBUG(0,("ntlmssp_server_start: talloc failed!\n")); return NT_STATUS_NO_MEMORY; @@ -1269,7 +1269,7 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_state *ntlmssp_state, NTSTATUS ntlmssp_client_start(TALLOC_CTX *mem_ctx, struct ntlmssp_state **ntlmssp_state) { - *ntlmssp_state = talloc_p(mem_ctx, struct ntlmssp_state); + *ntlmssp_state = talloc(mem_ctx, struct ntlmssp_state); if (!*ntlmssp_state) { DEBUG(0,("ntlmssp_client_start: talloc failed!\n")); return NT_STATUS_NO_MEMORY; diff --git a/source4/libcli/auth/ntlmssp_parse.c b/source4/libcli/auth/ntlmssp_parse.c index a713b9896d..543f3d9b61 100644 --- a/source4/libcli/auth/ntlmssp_parse.c +++ b/source4/libcli/auth/ntlmssp_parse.c @@ -54,8 +54,8 @@ BOOL msrpc_gen(TALLOC_CTX *mem_ctx, DATA_BLOB *blob, DATA_BLOB *pointers; - pointers = talloc_array_p(mem_ctx, DATA_BLOB, strlen(format)); - intargs = talloc_array_p(pointers, int, strlen(format)); + pointers = talloc_array(mem_ctx, DATA_BLOB, strlen(format)); + intargs = talloc_array(pointers, int, strlen(format)); /* first scan the format to work out the header and body size */ va_start(ap, format); diff --git a/source4/libcli/auth/schannel.c b/source4/libcli/auth/schannel.c index 51b8690c97..92442234bd 100644 --- a/source4/libcli/auth/schannel.c +++ b/source4/libcli/auth/schannel.c @@ -289,7 +289,7 @@ NTSTATUS schannel_start(struct schannel_state **state, const uint8_t session_key[16], BOOL initiator) { - (*state) = talloc_p(NULL, struct schannel_state); + (*state) = talloc(NULL, struct schannel_state); if (!(*state)) { return NT_STATUS_NO_MEMORY; } diff --git a/source4/libcli/auth/spnego.c b/source4/libcli/auth/spnego.c index 1e92a7d16e..a61680c9d4 100644 --- a/source4/libcli/auth/spnego.c +++ b/source4/libcli/auth/spnego.c @@ -50,7 +50,7 @@ static NTSTATUS gensec_spnego_client_start(struct gensec_security *gensec_securi { struct spnego_state *spnego_state; - spnego_state = talloc_p(gensec_security, struct spnego_state); + spnego_state = talloc(gensec_security, struct spnego_state); if (!spnego_state) { return NT_STATUS_NO_MEMORY; } @@ -68,7 +68,7 @@ static NTSTATUS gensec_spnego_server_start(struct gensec_security *gensec_securi { struct spnego_state *spnego_state; - spnego_state = talloc_p(gensec_security, struct spnego_state); + spnego_state = talloc(gensec_security, struct spnego_state); if (!spnego_state) { return NT_STATUS_NO_MEMORY; } diff --git a/source4/libcli/auth/spnego_parse.c b/source4/libcli/auth/spnego_parse.c index 78a94a6a44..e48c32f0da 100644 --- a/source4/libcli/auth/spnego_parse.c +++ b/source4/libcli/auth/spnego_parse.c @@ -49,7 +49,7 @@ static BOOL read_negTokenInit(struct asn1_data *asn1, struct spnego_negTokenInit asn1_start_tag(asn1, ASN1_CONTEXT(0)); asn1_start_tag(asn1, ASN1_SEQUENCE(0)); - token->mechTypes = talloc_p(NULL, const char *); + token->mechTypes = talloc(NULL, const char *); for (i = 0; !asn1->has_error && 0 < asn1_tag_remaining(asn1); i++) { token->mechTypes = talloc_realloc(NULL, -- cgit