From: Andreas Schneider Date: Wed, 13 Jan 2021 14:46:22 +0000 (+0100) Subject: s3:libsmb: Use cli_credentials directly X-Git-Tag: samba-4.14.0rc1~80 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=181afa9f68ca7ed0a60ac69f5ad62ee70d89a599;p=thirdparty%2Fsamba.git s3:libsmb: Use cli_credentials directly Signed-off-by: Andreas Schneider Reviewed-by: Volker Lendecke Autobuild-User(master): Volker Lendecke Autobuild-Date(master): Wed Jan 13 21:32:52 UTC 2021 on sn-devel-184 --- diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c index 3c42071ae1b..eb12a6c2ebe 100644 --- a/source3/libsmb/libsmb_dir.c +++ b/source3/libsmb/libsmb_dir.c @@ -564,7 +564,6 @@ SMBC_opendir_ctx(SMBCCTX *context, size_t max_lmb_count; struct sockaddr_storage *ip_list; struct sockaddr_storage server_addr; - struct user_auth_info *u_info; struct cli_credentials *creds = NULL; NTSTATUS status; @@ -584,8 +583,8 @@ SMBC_opendir_ctx(SMBCCTX *context, ? INT_MAX : smbc_getOptionBrowseMaxLmbCount(context)); - u_info = user_auth_info_init(frame); - if (u_info == NULL) { + creds = cli_credentials_init(frame); + if (creds == NULL) { if (dir) { SAFE_FREE(dir->fname); SAFE_FREE(dir); @@ -594,10 +593,9 @@ SMBC_opendir_ctx(SMBCCTX *context, errno = ENOMEM; return NULL; } - set_cmdline_auth_info_username(u_info, user); - set_cmdline_auth_info_password(u_info, password); - creds = get_cmdline_auth_info_creds(u_info); + (void)cli_credentials_set_username(creds, user, CRED_SPECIFIED); + (void)cli_credentials_set_password(creds, password, CRED_SPECIFIED); /* * We have server and share and path empty but options