diff options
author | Andreas Schneider <asn@samba.org> | 2021-03-18 13:39:54 +0100 |
---|---|---|
committer | Günther Deschner <gd@samba.org> | 2021-03-24 00:55:32 +0000 |
commit | 67d49ac14805d6cb6fbc87904173aaeaf5f859c5 (patch) | |
tree | a9960689f15f06c5144e03cd9d9bd7710dbcebb8 /source3 | |
parent | dd7adbfa8f277932eeed17eceaaa7713fc23829b (diff) | |
download | samba-67d49ac14805d6cb6fbc87904173aaeaf5f859c5.tar.gz |
s3:netapi: Remove use_kerberos from struct libnetapi_ctx
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
Diffstat (limited to 'source3')
-rw-r--r-- | source3/lib/netapi/cm.c | 7 | ||||
-rw-r--r-- | source3/lib/netapi/netapi.c | 2 | ||||
-rw-r--r-- | source3/lib/netapi/netapi_private.h | 1 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c index fd5cc56786d..58fc1fb57cd 100644 --- a/source3/lib/netapi/cm.c +++ b/source3/lib/netapi/cm.c @@ -75,6 +75,7 @@ static WERROR libnetapi_open_ipc_connection(struct libnetapi_ctx *ctx, const char *username = NULL; const char *password = NULL; NET_API_STATUS rc; + enum credentials_use_kerberos krb5_state; if (!ctx || !pp || !server_name) { return WERR_INVALID_PARAMETER; @@ -105,8 +106,10 @@ static WERROR libnetapi_open_ipc_connection(struct libnetapi_ctx *ctx, return WERR_INTERNAL_ERROR; } + krb5_state = cli_credentials_get_kerberos_state(ctx->creds); + set_cmdline_auth_info_signing_state_raw(auth_info, SMB_SIGNING_IPC_DEFAULT); - set_cmdline_auth_info_use_kerberos(auth_info, ctx->use_kerberos); + set_cmdline_auth_info_use_kerberos(auth_info, krb5_state == CRED_USE_KERBEROS_REQUIRED); set_cmdline_auth_info_username(auth_info, username); if (password != NULL) { set_cmdline_auth_info_password(auth_info, password); @@ -116,7 +119,7 @@ static WERROR libnetapi_open_ipc_connection(struct libnetapi_ctx *ctx, if (username && username[0] && password && password[0] && - ctx->use_kerberos) { + krb5_state == CRED_USE_KERBEROS_REQUIRED) { set_cmdline_auth_info_fallback_after_kerberos(auth_info, true); } diff --git a/source3/lib/netapi/netapi.c b/source3/lib/netapi/netapi.c index a158a7c15c0..14567d04536 100644 --- a/source3/lib/netapi/netapi.c +++ b/source3/lib/netapi/netapi.c @@ -320,8 +320,6 @@ NET_API_STATUS libnetapi_set_workgroup(struct libnetapi_ctx *ctx, NET_API_STATUS libnetapi_set_use_kerberos(struct libnetapi_ctx *ctx) { - ctx->use_kerberos = true; - cli_credentials_set_kerberos_state(ctx->creds, CRED_USE_KERBEROS_REQUIRED); diff --git a/source3/lib/netapi/netapi_private.h b/source3/lib/netapi/netapi_private.h index b02d3ac6819..3f725c29f89 100644 --- a/source3/lib/netapi/netapi_private.h +++ b/source3/lib/netapi/netapi_private.h @@ -57,7 +57,6 @@ struct libnetapi_private_ctx { struct libnetapi_ctx { char *debuglevel; char *error_string; - int use_kerberos; int use_ccache; int disable_policy_handle_cache; |