sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-29 02:50:28 +03:00
Code

gensec: Add a TALLOC_CTX * to gensec_register().

Browse Source 
Pass in the TALLOC_CTX * from the module init to remove
another talloc_autofree_context() use.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Jeremy Allison 2017-05-11 15:56:29 -07:00 committed by Ralph Boehme
parent 6f05597f5f
commit 3cfa58de12
11 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
auth/gensec/external.c
View File

@ -115,7 +115,7 @@ NTSTATUS gensec_external_init(TALLOC_CTX *ctx)
{
NTSTATUS ret;
ret = gensec_register(&gensec_external_ops);
ret = gensec_register(ctx, &gensec_external_ops);
if (!NT_STATUS_IS_OK(ret)) {
DEBUG(0,("Failed to register '%s' gensec backend!\n",
gensec_external_ops.name));

3
auth/gensec/gensec.h
View File

@ -181,7 +181,8 @@ NTSTATUS gensec_start_mech_by_oid(struct gensec_security *gensec_security,
const char *gensec_get_name_by_oid(struct gensec_security *gensec_security, const char *oid_string);
struct cli_credentials *gensec_get_credentials(struct gensec_security *gensec_security);
NTSTATUS gensec_init(void);
NTSTATUS gensec_register(const struct gensec_security_ops *ops);
NTSTATUS gensec_register(TALLOC_CTX *ctx,
const struct gensec_security_ops *ops);
const struct gensec_security_ops *gensec_security_by_oid(struct gensec_security *gensec_security,
const char *oid_string);
const struct gensec_security_ops *gensec_security_by_sasl_name(struct gensec_security *gensec_security,

5
auth/gensec/gensec_start.c
View File

@ -893,7 +893,8 @@ _PUBLIC_ NTSTATUS gensec_set_credentials(struct gensec_security *gensec_security
The 'name' can be later used by other backends to find the operations
structure for this backend.
*/
_PUBLIC_ NTSTATUS gensec_register(const struct gensec_security_ops *ops)
_PUBLIC_ NTSTATUS gensec_register(TALLOC_CTX *ctx,
const struct gensec_security_ops *ops)
{
if (gensec_security_by_name(NULL, ops->name) != NULL) {
/* its already registered! */
@ -902,7 +903,7 @@ _PUBLIC_ NTSTATUS gensec_register(const struct gensec_security_ops *ops)
return NT_STATUS_OBJECT_NAME_COLLISION;
}
generic_security_ops = talloc_realloc(talloc_autofree_context(),
generic_security_ops = talloc_realloc(ctx,
generic_security_ops,
const struct gensec_security_ops *,
gensec_num_backends+2);

2
auth/gensec/ncalrpc.c
View File

@ -342,7 +342,7 @@ _PUBLIC_ NTSTATUS gensec_ncalrpc_as_system_init(TALLOC_CTX *ctx)
{
NTSTATUS status;
status = gensec_register(&gensec_ncalrpc_security_ops);
status = gensec_register(ctx, &gensec_ncalrpc_security_ops);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, ("Failed to register '%s' gensec backend!\n",
gensec_ncalrpc_security_ops.name));

2
auth/gensec/schannel.c
View File

@ -852,7 +852,7 @@ static const struct gensec_security_ops gensec_schannel_security_ops = {
_PUBLIC_ NTSTATUS gensec_schannel_init(TALLOC_CTX *ctx)
{
NTSTATUS ret;
ret = gensec_register(&gensec_schannel_security_ops);
ret = gensec_register(ctx, &gensec_schannel_security_ops);
if (!NT_STATUS_IS_OK(ret)) {
DEBUG(0,("Failed to register '%s' gensec backend!\n",
gensec_schannel_security_ops.name));

2
auth/gensec/spnego.c
View File

@ -1697,7 +1697,7 @@ static const struct gensec_security_ops gensec_spnego_security_ops = {
_PUBLIC_ NTSTATUS gensec_spnego_init(TALLOC_CTX *ctx)
{
NTSTATUS ret;
ret = gensec_register(&gensec_spnego_security_ops);
ret = gensec_register(ctx, &gensec_spnego_security_ops);
if (!NT_STATUS_IS_OK(ret)) {
DEBUG(0,("Failed to register '%s' gensec backend!\n",
gensec_spnego_security_ops.name));

4
auth/ntlmssp/ntlmssp.c
View File

@ -256,14 +256,14 @@ _PUBLIC_ NTSTATUS gensec_ntlmssp_init(TALLOC_CTX *ctx)
{
NTSTATUS ret;
ret = gensec_register(&gensec_ntlmssp_security_ops);
ret = gensec_register(ctx, &gensec_ntlmssp_security_ops);
if (!NT_STATUS_IS_OK(ret)) {
DEBUG(0,("Failed to register '%s' gensec backend!\n",
gensec_ntlmssp_security_ops.name));
return ret;
}
ret = gensec_register(&gensec_ntlmssp_resume_ccache_ops);
ret = gensec_register(ctx, &gensec_ntlmssp_resume_ccache_ops);
if (!NT_STATUS_IS_OK(ret)) {
DEBUG(0,("Failed to register '%s' gensec backend!\n",
gensec_ntlmssp_resume_ccache_ops.name));

6
source4/auth/gensec/gensec_gssapi.c
View File

@ -1644,21 +1644,21 @@ _PUBLIC_ NTSTATUS gensec_gssapi_init(TALLOC_CTX *ctx)
{
NTSTATUS ret;
ret = gensec_register(&gensec_gssapi_spnego_security_ops);
ret = gensec_register(ctx, &gensec_gssapi_spnego_security_ops);
if (!NT_STATUS_IS_OK(ret)) {
DEBUG(0,("Failed to register '%s' gensec backend!\n",
gensec_gssapi_spnego_security_ops.name));
return ret;
}
ret = gensec_register(&gensec_gssapi_krb5_security_ops);
ret = gensec_register(ctx, &gensec_gssapi_krb5_security_ops);
if (!NT_STATUS_IS_OK(ret)) {
DEBUG(0,("Failed to register '%s' gensec backend!\n",
gensec_gssapi_krb5_security_ops.name));
return ret;
}
ret = gensec_register(&gensec_gssapi_sasl_krb5_security_ops);
ret = gensec_register(ctx, &gensec_gssapi_sasl_krb5_security_ops);
if (!NT_STATUS_IS_OK(ret)) {
DEBUG(0,("Failed to register '%s' gensec backend!\n",
gensec_gssapi_sasl_krb5_security_ops.name));

4
source4/auth/gensec/gensec_krb5.c
View File

@ -1086,14 +1086,14 @@ _PUBLIC_ NTSTATUS gensec_krb5_init(TALLOC_CTX *ctx)
{
NTSTATUS ret;
ret = gensec_register(&gensec_krb5_security_ops);
ret = gensec_register(ctx, &gensec_krb5_security_ops);
if (!NT_STATUS_IS_OK(ret)) {
DEBUG(0,("Failed to register '%s' gensec backend!\n",
gensec_krb5_security_ops.name));
return ret;
}
ret = gensec_register(&gensec_fake_gssapi_krb5_security_ops);
ret = gensec_register(ctx, &gensec_fake_gssapi_krb5_security_ops);
if (!NT_STATUS_IS_OK(ret)) {
DEBUG(0,("Failed to register '%s' gensec backend!\n",
gensec_fake_gssapi_krb5_security_ops.name));

2
source4/lib/http/gensec/basic.c
View File

@ -127,7 +127,7 @@ _PUBLIC_ NTSTATUS gensec_http_basic_init(TALLOC_CTX *ctx)
{
NTSTATUS status;
status = gensec_register(&gensec_http_basic_security_ops);
status = gensec_register(ctx, &gensec_http_basic_security_ops);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, ("Failed to register '%s' gensec backend!\n",
gensec_http_basic_security_ops.name));

2
source4/lib/http/gensec/ntlm.c
View File

@ -110,7 +110,7 @@ _PUBLIC_ NTSTATUS gensec_http_ntlm_init(TALLOC_CTX *ctx)
{
NTSTATUS status;
status = gensec_register(&gensec_http_ntlm_security_ops);
status = gensec_register(ctx, &gensec_http_ntlm_security_ops);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, ("Failed to register '%s' gensec backend!\n",
gensec_http_ntlm_security_ops.name));