diff options
author | Andreas Schneider <asn@samba.org> | 2019-05-29 14:39:34 +0200 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2019-06-27 12:54:23 +0000 |
commit | 8c9cf56fe9865029bf033557b00e8987873a7096 (patch) | |
tree | 1fb311b6c462a45223b3652da71873227afc541d | |
parent | 2e6fe27bad609cf6143b41c4062a1acf2d49930f (diff) | |
download | samba-8c9cf56fe9865029bf033557b00e8987873a7096.tar.gz |
libcli:auth: Return NTSTATUS for netlogon_creds_server_step_check()
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
-rw-r--r-- | libcli/auth/credentials.c | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/libcli/auth/credentials.c b/libcli/auth/credentials.c index 11aeea28a27..562dd4f3c58 100644 --- a/libcli/auth/credentials.c +++ b/libcli/auth/credentials.c @@ -585,15 +585,15 @@ NTSTATUS netlogon_creds_server_step_check(struct netlogon_creds_CredentialState } } -static void netlogon_creds_crypt_samlogon_validation(struct netlogon_creds_CredentialState *creds, - uint16_t validation_level, - union netr_Validation *validation, - bool do_encrypt) +static NTSTATUS netlogon_creds_crypt_samlogon_validation(struct netlogon_creds_CredentialState *creds, + uint16_t validation_level, + union netr_Validation *validation, + bool do_encrypt) { struct netr_SamBaseInfo *base = NULL; if (validation == NULL) { - return; + return NT_STATUS_INVALID_PARAMETER; } switch (validation_level) { @@ -614,11 +614,11 @@ static void netlogon_creds_crypt_samlogon_validation(struct netlogon_creds_Crede break; default: /* If we can't find it, we can't very well decrypt it */ - return; + return NT_STATUS_INVALID_INFO_CLASS; } if (!base) { - return; + return NT_STATUS_INVALID_INFO_CLASS; } /* find and decyrpt the session keys, return in parameters above */ @@ -678,26 +678,28 @@ static void netlogon_creds_crypt_samlogon_validation(struct netlogon_creds_Crede } } } + + return NT_STATUS_OK; } NTSTATUS netlogon_creds_decrypt_samlogon_validation(struct netlogon_creds_CredentialState *creds, uint16_t validation_level, union netr_Validation *validation) { - netlogon_creds_crypt_samlogon_validation(creds, validation_level, - validation, false); - - return NT_STATUS_OK; + return netlogon_creds_crypt_samlogon_validation(creds, + validation_level, + validation, + false); } NTSTATUS netlogon_creds_encrypt_samlogon_validation(struct netlogon_creds_CredentialState *creds, uint16_t validation_level, union netr_Validation *validation) { - netlogon_creds_crypt_samlogon_validation(creds, validation_level, - validation, true); - - return NT_STATUS_OK; + return netlogon_creds_crypt_samlogon_validation(creds, + validation_level, + validation, + true); } static void netlogon_creds_crypt_samlogon_logon(struct netlogon_creds_CredentialState *creds, |