1
0
mirror of https://github.com/samba-team/samba.git synced 2025-03-24 10:50:22 +03:00

auth: Remove the "typedef auth_methods"

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
This commit is contained in:
Volker Lendecke 2020-01-03 13:47:14 +01:00 committed by Gary Lockyer
parent 33d4d48271
commit 59cb155a27
9 changed files with 44 additions and 19 deletions

View File

@ -42,7 +42,10 @@ static NTSTATUS check_skel_security(const struct auth_context *auth_context,
}
/* module initialisation */
static NTSTATUS auth_init_skel(struct auth_context *auth_context, const char *param, auth_methods **auth_method)
static NTSTATUS auth_init_skel(
struct auth_context *auth_context,
const char *param,
struct auth_methods **auth_method)
{
struct auth_methods *result;
@ -56,7 +59,7 @@ static NTSTATUS auth_init_skel(struct auth_context *auth_context, const char *pa
if (param && *param) {
/* we load the 'fallback' module - if skel isn't here, call this
module */
auth_methods *priv;
struct auth_methods *priv;
if (!load_auth_module(auth_context, param, &priv)) {
return NT_STATUS_UNSUCCESSFUL;
}

View File

@ -177,7 +177,7 @@ NTSTATUS auth_check_ntlm_password(TALLOC_CTX *mem_ctx,
/* if all the modules say 'not for me' this is reasonable */
NTSTATUS nt_status = NT_STATUS_NOT_IMPLEMENTED;
const char *unix_username;
auth_methods *auth_method;
struct auth_methods *auth_method;
struct auth_serversupplied_info *server_info = NULL;
struct dom_sid sid = {0};
struct imessaging_context *msg_ctx = NULL;
@ -404,7 +404,8 @@ static NTSTATUS make_auth_context(TALLOC_CTX *mem_ctx,
}
bool load_auth_module(struct auth_context *auth_context,
const char *module, auth_methods **ret)
const char *module,
struct auth_methods **ret)
{
static bool initialised_static_modules = False;
@ -465,8 +466,8 @@ static NTSTATUS make_auth_context_text_list(TALLOC_CTX *mem_ctx,
struct auth_context **auth_context,
char **text_list)
{
auth_methods *list = NULL;
auth_methods *t, *method = NULL;
struct auth_methods *list = NULL;
struct auth_methods *t, *method = NULL;
NTSTATUS nt_status;
if (!text_list) {

View File

@ -86,7 +86,10 @@ static NTSTATUS check_anonymous_security(const struct auth_context *auth_context
/* Guest modules initialisation */
static NTSTATUS auth_init_anonymous(struct auth_context *auth_context, const char *options, auth_methods **auth_method)
static NTSTATUS auth_init_anonymous(
struct auth_context *auth_context,
const char *options,
struct auth_methods **auth_method)
{
struct auth_methods *result;
@ -150,7 +153,10 @@ static NTSTATUS check_name_to_ntstatus_security(const struct auth_context *auth_
/** Module initialisation function */
static NTSTATUS auth_init_name_to_ntstatus(struct auth_context *auth_context, const char *param, auth_methods **auth_method)
static NTSTATUS auth_init_name_to_ntstatus(
struct auth_context *auth_context,
const char *param,
struct auth_methods **auth_method)
{
struct auth_methods *result;

View File

@ -40,7 +40,10 @@ static NTSTATUS auth_sam_ignoredomain_auth(const struct auth_context *auth_conte
}
/* module initialisation */
static NTSTATUS auth_init_sam_ignoredomain(struct auth_context *auth_context, const char *param, auth_methods **auth_method)
static NTSTATUS auth_init_sam_ignoredomain(
struct auth_context *auth_context,
const char *param,
struct auth_methods **auth_method)
{
struct auth_methods *result;
@ -108,7 +111,10 @@ static NTSTATUS auth_samstrict_auth(const struct auth_context *auth_context,
}
/* module initialisation */
static NTSTATUS auth_init_sam(struct auth_context *auth_context, const char *param, auth_methods **auth_method)
static NTSTATUS auth_init_sam(
struct auth_context *auth_context,
const char *param,
struct auth_methods **auth_method)
{
struct auth_methods *result;
@ -168,8 +174,10 @@ static NTSTATUS auth_sam_netlogon3_auth(const struct auth_context *auth_context,
}
/* module initialisation */
static NTSTATUS auth_init_sam_netlogon3(struct auth_context *auth_context,
const char *param, auth_methods **auth_method)
static NTSTATUS auth_init_sam_netlogon3(
struct auth_context *auth_context,
const char *param,
struct auth_methods **auth_method)
{
struct auth_methods *result;

View File

@ -364,8 +364,8 @@ static NTSTATUS make_auth4_context_s4(const struct auth_context *auth_context,
/* module initialisation */
static NTSTATUS auth_init_samba4(struct auth_context *auth_context,
const char *param,
auth_methods **auth_method)
const char *param,
struct auth_methods **auth_method)
{
struct auth_methods *result;

View File

@ -83,7 +83,10 @@ static NTSTATUS check_unix_security(const struct auth_context *auth_context,
}
/* module initialisation */
static NTSTATUS auth_init_unix(struct auth_context *auth_context, const char* param, auth_methods **auth_method)
static NTSTATUS auth_init_unix(
struct auth_context *auth_context,
const char* param,
struct auth_methods **auth_method)
{
struct auth_methods *result;

View File

@ -178,7 +178,10 @@ static NTSTATUS check_winbind_security(const struct auth_context *auth_context,
}
/* module initialisation */
static NTSTATUS auth_init_winbind(struct auth_context *auth_context, const char *param, auth_methods **auth_method)
static NTSTATUS auth_init_winbind(
struct auth_context *auth_context,
const char *param,
struct auth_methods **auth_method)
{
struct auth_methods *result;

View File

@ -37,7 +37,8 @@
NTSTATUS smb_register_auth(int version, const char *name, auth_init_function init);
bool load_auth_module(struct auth_context *auth_context,
const char *module, auth_methods **ret) ;
const char *module,
struct auth_methods **ret) ;
NTSTATUS make_auth3_context_for_ntlm(TALLOC_CTX *mem_ctx,
struct auth_context **auth_context);
NTSTATUS make_auth3_context_for_netlogon(TALLOC_CTX *mem_ctx,

View File

@ -98,7 +98,7 @@ struct auth_context {
const char *forced_samba4_methods;
};
typedef struct auth_methods
struct auth_methods
{
struct auth_methods *prev, *next;
const char *name; /* What name got this module */
@ -117,7 +117,7 @@ typedef struct auth_methods
uint32_t flags;
} auth_methods;
};
typedef NTSTATUS (*auth_init_function)(struct auth_context *, const char *, struct auth_methods **);