auth auth_log: csbuild unused parm unix_username

Fixes csbuild errors

Error: COMPILER_WARNING:
auth/auth_log.c: scope_hint: In function ‘log_authentication_event_json’
auth/auth_log.c:146:14: warning: unused parameter ‘unix_username’
[-Wunused-parameter]

Error: COMPILER_WARNING:
auth/auth_log.c: scope_hint: In function
‘log_authentication_event_human_readable’
auth/auth_log.c:586:14: warning: unused parameter ‘unix_username’
[-Wunused-parameter]

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/auth/auth_log.c b/auth/auth_log.c
index d9b83b0ea0d5624ca9c335e3726cc5914d029258..6c5fac0bf42323e3f9c1424c894ffe9a85c7a6ae 100644 (file)
--- a/auth/auth_log.c
+++ b/auth/auth_log.c
@@ -143,7 +143,6 @@ static void log_authentication_event_json(
        NTSTATUS status,
        const char *domain_name,
        const char *account_name,
-       const char *unix_username,
        struct dom_sid *sid,
        enum event_id_type event_id,
        int debug_level)
@@ -498,7 +497,6 @@ static void log_authentication_event_json(
        NTSTATUS status,
        const char *domain_name,
        const char *account_name,
-       const char *unix_username,
        struct dom_sid *sid,
        enum event_id_type event_id,
        int debug_level)
@@ -583,7 +581,6 @@ static void log_authentication_event_human_readable(
        NTSTATUS status,
        const char *domain_name,
        const char *account_name,
-       const char *unix_username,
        struct dom_sid *sid,
        int debug_level)
 {
@@ -673,7 +670,6 @@ void log_authentication_event(
        NTSTATUS status,
        const char *domain_name,
        const char *account_name,
-       const char *unix_username,
        struct dom_sid *sid)
 {
        /* set the log level */
@@ -693,7 +689,6 @@ void log_authentication_event(
                                                        status,
                                                        domain_name,
                                                        account_name,
-                                                       unix_username,
                                                        sid,
                                                        debug_level);
        }
@@ -706,7 +701,6 @@ void log_authentication_event(
                                              status,
                                              domain_name,
                                              account_name,
-                                             unix_username,
                                              sid,
                                              event_id,
                                              debug_level);

diff --git a/auth/common_auth.h b/auth/common_auth.h
index 0443c4e8044a2a39a4f7ab64086bb18bb4b0e0fc..9f04c9b9cbbbb8be0d373e268b3a49998890d096 100644 (file)
--- a/auth/common_auth.h
+++ b/auth/common_auth.h
@@ -187,7 +187,6 @@ void log_authentication_event(struct imessaging_context *msg_ctx,
                              NTSTATUS status,
                              const char *account_name,
                              const char *domain_name,
-                             const char *unix_username,
                              struct dom_sid *sid);
 
 /*

diff --git a/source3/auth/auth.c b/source3/auth/auth.c
index 7215218413fd4ba9933fe9afbfc48ab381d3d6ba..ce2cb0d75bf922a9e24488a5fe0b08e1baa7c52f 100644 (file)
--- a/source3/auth/auth.c
+++ b/source3/auth/auth.c
@@ -317,7 +317,7 @@ NTSTATUS auth_check_ntlm_password(TALLOC_CTX *mem_ctx,
                                 nt_status,
                                 server_info->info3->base.logon_domain.string,
                                 server_info->info3->base.account_name.string,
-                                unix_username, &sid);
+                                &sid);
 
        DEBUG(server_info->guest ? 5 : 2,
              ("check_ntlm_password:  %sauthentication for user "
@@ -352,7 +352,6 @@ fail:
                                 nt_status,
                                 NULL,
                                 NULL,
-                                NULL,
                                 NULL);
 
        ZERO_STRUCTP(pserver_info);

diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index 2d533773fb9e2777d4f3241e89ed91226ad8ec26..190f23f1b2487e7f220ad859c25f50ae8129ca65 100644 (file)
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -2038,7 +2038,6 @@ static void log_authentication(
            result,
            state->response->data.auth.info3.logon_dom,
            state->response->data.auth.info3.user_name,
-           state->response->data.auth.unix_username,
            sid);
        TALLOC_FREE(ui);
 }

diff --git a/source4/auth/ntlm/auth.c b/source4/auth/ntlm/auth.c
index 3a3fa7eaa59b9a4d0d7cb5fb86baf727aa92fb7b..ead5326705e67ec071ab34fcfce968834ef96f53 100644 (file)
--- a/source4/auth/ntlm/auth.c
+++ b/source4/auth/ntlm/auth.c
@@ -481,7 +481,7 @@ _PUBLIC_ NTSTATUS auth_check_password_recv(struct tevent_req *req,
                                         state->auth_ctx->lp_ctx,
                                         &state->auth_ctx->start_time,
                                         state->user_info, status,
-                                        NULL, NULL, NULL, NULL);
+                                        NULL, NULL, NULL);
                tevent_req_received(req);
                return status;
        }
@@ -498,7 +498,6 @@ _PUBLIC_ NTSTATUS auth_check_password_recv(struct tevent_req *req,
                                 state->user_info, status,
                                 state->user_info_dc->info->domain_name,
                                 state->user_info_dc->info->account_name,
-                                NULL,
                                 &state->user_info_dc->sids[0]);
 
        *user_info_dc = talloc_move(mem_ctx, &state->user_info_dc);

diff --git a/source4/auth/ntlm/auth_simple.c b/source4/auth/ntlm/auth_simple.c
index fcd9050979d0c015b7226b797e427db35266cb3d..8df160cefc37f736c4d8b019a637f222f4951002 100644 (file)
--- a/source4/auth/ntlm/auth_simple.c
+++ b/source4/auth/ntlm/auth_simple.c
@@ -114,7 +114,7 @@ _PUBLIC_ struct tevent_req *authenticate_ldap_simple_bind_send(TALLOC_CTX *mem_c
                log_authentication_event(msg, lp_ctx,
                                         &state->auth_context->start_time,
                                         user_info, status,
-                                        NULL, NULL, NULL, NULL);
+                                        NULL, NULL, NULL);
        }
        if (tevent_req_nterror(req, status)) {
                return tevent_req_post(req, ev);

diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
index bd7818aa8bc9a469e1576b5aec9b76ec4ffd520b..006e35c46d573311dbbf22fcae4651f6988bbbfa 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -2980,7 +2980,6 @@ static int check_password_restrictions_and_log(struct setup_password_fields_io *
                                         status,
                                         domain_name,
                                         io->u.sAMAccountName,
-                                        NULL,
                                         io->u.account_sid);
 
        }

diff --git a/source4/kdc/hdb-samba4.c b/source4/kdc/hdb-samba4.c
index c42d742a50facac8564fb146d8da4afc582c9775..38ce9807c02945552babedaedc676ed13ee3106e 100644 (file)
--- a/source4/kdc/hdb-samba4.c
+++ b/source4/kdc/hdb-samba4.c
@@ -501,7 +501,6 @@ static krb5_error_code hdb_samba4_auth_status(krb5_context context, HDB *db,
                                         status,
                                         domain_name,
                                         account_name,
-                                        NULL,
                                         sid);
                TALLOC_FREE(frame);
                break;
@@ -526,7 +525,7 @@ static krb5_error_code hdb_samba4_auth_status(krb5_context context, HDB *db,
                                         &ui,
                                         NT_STATUS_NO_SUCH_USER,
                                         NULL, NULL,
-                                        NULL, NULL);
+                                        NULL);
                TALLOC_FREE(frame);
                break;
        }

diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index d9eb9e3bb62f4d1c3eef23e6530f2c0d1c6302b8..909cfeaf5a38ce6201593ad6d02a62d52756c5f9 100644 (file)
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -556,7 +556,6 @@ static NTSTATUS dcesrv_netr_ServerAuthenticate3(
                status,
                lpcfg_workgroup(dce_call->conn->dce_ctx->lp_ctx),
                trust_account_in_db,
-               NULL,
                sid);
 
        return status;

diff --git a/source4/rpc_server/samr/samr_password.c b/source4/rpc_server/samr/samr_password.c
index af71b626cb9218a26f5082e4ed1446930db97a54..a27510c62e83d6b321c6753d0fad03f0d42953c0 100644 (file)
--- a/source4/rpc_server/samr/samr_password.c
+++ b/source4/rpc_server/samr/samr_password.c
@@ -76,7 +76,6 @@ static void log_password_change_event(struct imessaging_context *msg_ctx,
                                 status,
                                 ui.mapped.domain_name,
                                 ui.mapped.account_name,
-                                NULL,
                                 sid);
 }
 /*