mirror of
https://github.com/samba-team/samba.git
synced 2024-12-22 13:34:15 +03:00
s4: popt: Global replace of cmdline_credentials -> popt_get_cmdline_credentials().
Add one use of popt_set_cmdline_credentials(). Fix 80 column limits when cmdline_credentials changes to popt_get_cmdline_credentials(). Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
parent
dd4a3ce927
commit
b2de5a81bf
@ -87,7 +87,8 @@ static int extensions_hook(struct ldb_context *ldb, enum ldb_module_hook_type t)
|
||||
if (ldb_set_opaque(ldb, "sessionInfo", system_session(cmdline_lp_ctx))) {
|
||||
return ldb_operr(ldb);
|
||||
}
|
||||
if (ldb_set_opaque(ldb, "credentials", cmdline_credentials)) {
|
||||
if (ldb_set_opaque(ldb, "credentials",
|
||||
popt_get_cmdline_credentials())) {
|
||||
return ldb_operr(ldb);
|
||||
}
|
||||
if (ldb_set_opaque(ldb, "loadparm", cmdline_lp_ctx)) {
|
||||
|
@ -693,13 +693,15 @@ static bool test_wbc_authenticate_user_int(struct torture_context *tctx,
|
||||
struct wbcAuthErrorInfo *error = NULL;
|
||||
wbcErr ret;
|
||||
|
||||
ret = wbcAuthenticateUser(cli_credentials_get_username(cmdline_credentials), correct_password);
|
||||
ret = wbcAuthenticateUser(cli_credentials_get_username(
|
||||
popt_get_cmdline_credentials()), correct_password);
|
||||
torture_assert_wbc_equal(tctx, ret, WBC_ERR_SUCCESS,
|
||||
"wbcAuthenticateUser of %s failed",
|
||||
cli_credentials_get_username(cmdline_credentials));
|
||||
"wbcAuthenticateUser of %s failed",
|
||||
cli_credentials_get_username(popt_get_cmdline_credentials()));
|
||||
|
||||
ZERO_STRUCT(params);
|
||||
params.account_name = cli_credentials_get_username(cmdline_credentials);
|
||||
params.account_name =
|
||||
cli_credentials_get_username(popt_get_cmdline_credentials());
|
||||
params.level = WBC_AUTH_USER_LEVEL_PLAIN;
|
||||
params.password.plaintext = correct_password;
|
||||
|
||||
@ -728,13 +730,15 @@ static bool test_wbc_authenticate_user_int(struct torture_context *tctx,
|
||||
|
||||
static bool test_wbc_authenticate_user(struct torture_context *tctx)
|
||||
{
|
||||
return test_wbc_authenticate_user_int(tctx, cli_credentials_get_password(cmdline_credentials));
|
||||
return test_wbc_authenticate_user_int(tctx,
|
||||
cli_credentials_get_password(popt_get_cmdline_credentials()));
|
||||
}
|
||||
|
||||
static bool test_wbc_change_password(struct torture_context *tctx)
|
||||
{
|
||||
wbcErr ret;
|
||||
const char *oldpass = cli_credentials_get_password(cmdline_credentials);
|
||||
const char *oldpass =
|
||||
cli_credentials_get_password(popt_get_cmdline_credentials());
|
||||
const char *newpass = "Koo8irei%$";
|
||||
|
||||
struct samr_CryptPassword new_nt_password;
|
||||
@ -799,8 +803,10 @@ static bool test_wbc_change_password(struct torture_context *tctx)
|
||||
params.new_password.response.nt_data = new_nt_password.data;
|
||||
|
||||
params.level = WBC_CHANGE_PASSWORD_LEVEL_RESPONSE;
|
||||
params.account_name = cli_credentials_get_username(cmdline_credentials);
|
||||
params.domain_name = cli_credentials_get_domain(cmdline_credentials);
|
||||
params.account_name =
|
||||
cli_credentials_get_username(popt_get_cmdline_credentials());
|
||||
params.domain_name =
|
||||
cli_credentials_get_domain(popt_get_cmdline_credentials());
|
||||
|
||||
ret = wbcChangeUserPasswordEx(¶ms, NULL, NULL, NULL);
|
||||
torture_assert_wbc_equal(tctx, ret, WBC_ERR_SUCCESS,
|
||||
@ -810,12 +816,15 @@ static bool test_wbc_change_password(struct torture_context *tctx)
|
||||
return false;
|
||||
}
|
||||
|
||||
ret = wbcChangeUserPassword(cli_credentials_get_username(cmdline_credentials), newpass,
|
||||
cli_credentials_get_password(cmdline_credentials));
|
||||
ret = wbcChangeUserPassword(
|
||||
cli_credentials_get_username(popt_get_cmdline_credentials()),
|
||||
newpass,
|
||||
cli_credentials_get_password(popt_get_cmdline_credentials()));
|
||||
torture_assert_wbc_equal(tctx, ret, WBC_ERR_SUCCESS,
|
||||
"wbcChangeUserPassword for %s failed", params.account_name);
|
||||
|
||||
return test_wbc_authenticate_user_int(tctx, cli_credentials_get_password(cmdline_credentials));
|
||||
return test_wbc_authenticate_user_int(tctx,
|
||||
cli_credentials_get_password(popt_get_cmdline_credentials()));
|
||||
}
|
||||
|
||||
static bool test_wbc_logon_user(struct torture_context *tctx)
|
||||
@ -837,8 +846,10 @@ static bool test_wbc_logon_user(struct torture_context *tctx)
|
||||
"%s", "wbcLogonUser succeeded for NULL where it should "
|
||||
"have failed");
|
||||
|
||||
params.username = cli_credentials_get_username(cmdline_credentials);
|
||||
params.password = cli_credentials_get_password(cmdline_credentials);
|
||||
params.username =
|
||||
cli_credentials_get_username(popt_get_cmdline_credentials());
|
||||
params.password =
|
||||
cli_credentials_get_password(popt_get_cmdline_credentials());
|
||||
|
||||
ret = wbcAddNamedBlob(¶ms.num_blobs, ¶ms.blobs,
|
||||
"foo", 0, discard_const_p(uint8_t, "bar"), 4);
|
||||
@ -868,7 +879,8 @@ static bool test_wbc_logon_user(struct torture_context *tctx)
|
||||
strlen("S-1-2-3-4")+1);
|
||||
torture_assert_wbc_equal(tctx, ret, WBC_ERR_SUCCESS,
|
||||
"%s", "wbcAddNamedBlob failed");
|
||||
params.password = cli_credentials_get_password(cmdline_credentials);
|
||||
params.password =
|
||||
cli_credentials_get_password(popt_get_cmdline_credentials());
|
||||
ret = wbcLogonUser(¶ms, &info, &error, &policy);
|
||||
torture_assert_wbc_equal(tctx, ret, WBC_ERR_AUTH_ERROR,
|
||||
"wbcLogonUser for %s should have failed with "
|
||||
@ -883,11 +895,14 @@ static bool test_wbc_logon_user(struct torture_context *tctx)
|
||||
torture_assert_wbc_equal(tctx, ret, WBC_ERR_SUCCESS,
|
||||
"%s", "wbcInterfaceDetails failed");
|
||||
|
||||
ret = wbcLookupName(iface->netbios_domain, cli_credentials_get_username(cmdline_credentials), &sid,
|
||||
&sidtype);
|
||||
ret = wbcLookupName(iface->netbios_domain,
|
||||
cli_credentials_get_username(popt_get_cmdline_credentials()),
|
||||
&sid,
|
||||
&sidtype);
|
||||
wbcFreeMemory(iface);
|
||||
torture_assert_wbc_equal(tctx, ret, WBC_ERR_SUCCESS,
|
||||
"wbcLookupName for %s failed", cli_credentials_get_username(cmdline_credentials));
|
||||
"wbcLookupName for %s failed",
|
||||
cli_credentials_get_username(popt_get_cmdline_credentials()));
|
||||
|
||||
ret = wbcSidToString(&sid, &sidstr);
|
||||
torture_assert_wbc_equal(tctx, ret, WBC_ERR_SUCCESS,
|
||||
@ -899,7 +914,8 @@ static bool test_wbc_logon_user(struct torture_context *tctx)
|
||||
torture_assert_wbc_equal(tctx, ret, WBC_ERR_SUCCESS,
|
||||
"%s", "wbcAddNamedBlob failed");
|
||||
wbcFreeMemory(sidstr);
|
||||
params.password = cli_credentials_get_password(cmdline_credentials);
|
||||
params.password =
|
||||
cli_credentials_get_password(popt_get_cmdline_credentials());
|
||||
ret = wbcLogonUser(¶ms, &info, &error, &policy);
|
||||
torture_assert_wbc_equal(tctx, ret, WBC_ERR_SUCCESS,
|
||||
"wbcLogonUser for %s failed", params.username);
|
||||
@ -918,9 +934,13 @@ static bool test_wbc_getgroups(struct torture_context *tctx)
|
||||
uint32_t num_groups;
|
||||
gid_t *groups;
|
||||
|
||||
ret = wbcGetGroups(cli_credentials_get_username(cmdline_credentials), &num_groups, &groups);
|
||||
ret = wbcGetGroups(
|
||||
cli_credentials_get_username(popt_get_cmdline_credentials()),
|
||||
&num_groups,
|
||||
&groups);
|
||||
torture_assert_wbc_equal(tctx, ret, WBC_ERR_SUCCESS,
|
||||
"wbcGetGroups for %s failed", cli_credentials_get_username(cmdline_credentials));
|
||||
"wbcGetGroups for %s failed",
|
||||
cli_credentials_get_username(popt_get_cmdline_credentials()));
|
||||
wbcFreeMemory(groups);
|
||||
return true;
|
||||
}
|
||||
|
@ -236,12 +236,13 @@ static struct smbcli_state * init_smb_session(struct resolve_context *resolve_ct
|
||||
* each connection, but for now, we just use the same one for both.
|
||||
*/
|
||||
ret = smbcli_full_connection(NULL, &cli, host, ports, share,
|
||||
NULL /* devtype */,
|
||||
socket_options,
|
||||
cmdline_credentials, resolve_ctx,
|
||||
ev, options,
|
||||
session_options,
|
||||
gensec_settings);
|
||||
NULL /* devtype */,
|
||||
socket_options,
|
||||
popt_get_cmdline_credentials(),
|
||||
resolve_ctx,
|
||||
ev, options,
|
||||
session_options,
|
||||
gensec_settings);
|
||||
|
||||
if (!NT_STATUS_IS_OK(ret)) {
|
||||
fprintf(stderr, "%s: connecting to //%s/%s: %s\n",
|
||||
|
@ -174,7 +174,11 @@ static void send_message(struct smbcli_state *cli, const char *desthost)
|
||||
int total_len = 0;
|
||||
int grp_id;
|
||||
|
||||
if (!smbcli_message_start(cli->tree, desthost, cli_credentials_get_username(cmdline_credentials), &grp_id)) {
|
||||
if (!smbcli_message_start(cli->tree,
|
||||
desthost,
|
||||
cli_credentials_get_username(
|
||||
popt_get_cmdline_credentials()),
|
||||
&grp_id)) {
|
||||
d_printf("message start: %s\n", smbcli_errstr(cli->tree));
|
||||
return;
|
||||
}
|
||||
@ -2702,7 +2706,7 @@ static bool browse_host(struct loadparm_context *lp_ctx,
|
||||
|
||||
status = dcerpc_pipe_connect(mem_ctx, &p, binding,
|
||||
&ndr_table_srvsvc,
|
||||
cmdline_credentials, ev_ctx,
|
||||
popt_get_cmdline_credentials(), ev_ctx,
|
||||
lp_ctx);
|
||||
if (!NT_STATUS_IS_OK(status)) {
|
||||
d_printf("Failed to connect to %s - %s\n",
|
||||
@ -3395,7 +3399,8 @@ static int do_message_op(const char *netbios_name, const char *desthost,
|
||||
}
|
||||
|
||||
if (poptPeekArg(pc)) {
|
||||
cli_credentials_set_password(cmdline_credentials, poptGetArg(pc), CRED_SPECIFIED);
|
||||
cli_credentials_set_password(popt_get_cmdline_credentials(),
|
||||
poptGetArg(pc), CRED_SPECIFIED);
|
||||
}
|
||||
|
||||
/*init_names(); */
|
||||
@ -3439,7 +3444,8 @@ static int do_message_op(const char *netbios_name, const char *desthost,
|
||||
if (!do_connect(ctx, ev_ctx, lpcfg_resolve_context(cmdline_lp_ctx),
|
||||
desthost, lpcfg_smb_ports(cmdline_lp_ctx), service,
|
||||
lpcfg_socket_options(cmdline_lp_ctx),
|
||||
cmdline_credentials, &smb_options, &smb_session_options,
|
||||
popt_get_cmdline_credentials(),
|
||||
&smb_options, &smb_session_options,
|
||||
lpcfg_gensec_settings(ctx, cmdline_lp_ctx)))
|
||||
return 1;
|
||||
|
||||
|
@ -48,19 +48,23 @@ static void popt_common_credentials_callback(poptContext con,
|
||||
const char *arg, const void *data)
|
||||
{
|
||||
if (reason == POPT_CALLBACK_REASON_PRE) {
|
||||
cmdline_credentials = cli_credentials_init(talloc_autofree_context());
|
||||
popt_set_cmdline_credentials(
|
||||
cli_credentials_init(talloc_autofree_context()));
|
||||
return;
|
||||
}
|
||||
|
||||
if (reason == POPT_CALLBACK_REASON_POST) {
|
||||
cli_credentials_guess(cmdline_credentials, cmdline_lp_ctx);
|
||||
cli_credentials_guess(popt_get_cmdline_credentials(),
|
||||
cmdline_lp_ctx);
|
||||
|
||||
if (!dont_ask) {
|
||||
cli_credentials_set_cmdline_callbacks(cmdline_credentials);
|
||||
cli_credentials_set_cmdline_callbacks(
|
||||
popt_get_cmdline_credentials());
|
||||
}
|
||||
|
||||
if (machine_account_pending) {
|
||||
cli_credentials_set_machine_account(cmdline_credentials, cmdline_lp_ctx);
|
||||
cli_credentials_set_machine_account(
|
||||
popt_get_cmdline_credentials(), cmdline_lp_ctx);
|
||||
}
|
||||
|
||||
return;
|
||||
@ -72,7 +76,8 @@ static void popt_common_credentials_callback(poptContext con,
|
||||
{
|
||||
char *lp;
|
||||
|
||||
cli_credentials_parse_string(cmdline_credentials, arg, CRED_SPECIFIED);
|
||||
cli_credentials_parse_string(
|
||||
popt_get_cmdline_credentials(), arg, CRED_SPECIFIED);
|
||||
/* This breaks the abstraction, including the const above */
|
||||
if ((lp=strchr_m(arg,'%'))) {
|
||||
lp[0]='\0';
|
||||
@ -84,13 +89,15 @@ static void popt_common_credentials_callback(poptContext con,
|
||||
break;
|
||||
|
||||
case OPT_PASSWORD:
|
||||
cli_credentials_set_password(cmdline_credentials, arg, CRED_SPECIFIED);
|
||||
cli_credentials_set_password(popt_get_cmdline_credentials(),
|
||||
arg, CRED_SPECIFIED);
|
||||
/* Try to prevent this showing up in ps */
|
||||
memset(discard_const(arg),0,strlen(arg));
|
||||
break;
|
||||
|
||||
case 'A':
|
||||
cli_credentials_parse_file(cmdline_credentials, arg, CRED_SPECIFIED);
|
||||
cli_credentials_parse_file(popt_get_cmdline_credentials(),
|
||||
arg, CRED_SPECIFIED);
|
||||
break;
|
||||
|
||||
case 'P':
|
||||
@ -111,7 +118,8 @@ static void popt_common_credentials_callback(poptContext con,
|
||||
}
|
||||
}
|
||||
|
||||
cli_credentials_set_kerberos_state(cmdline_credentials,
|
||||
cli_credentials_set_kerberos_state(
|
||||
popt_get_cmdline_credentials(),
|
||||
use_kerberos
|
||||
? CRED_MUST_USE_KERBEROS
|
||||
: CRED_DONT_USE_KERBEROS);
|
||||
@ -120,13 +128,16 @@ static void popt_common_credentials_callback(poptContext con,
|
||||
|
||||
case OPT_SIMPLE_BIND_DN:
|
||||
{
|
||||
cli_credentials_set_bind_dn(cmdline_credentials, arg);
|
||||
cli_credentials_set_bind_dn(popt_get_cmdline_credentials(),
|
||||
arg);
|
||||
break;
|
||||
}
|
||||
case OPT_KRB5_CCACHE:
|
||||
{
|
||||
const char *error_string;
|
||||
if (cli_credentials_set_ccache(cmdline_credentials, cmdline_lp_ctx, arg, CRED_SPECIFIED,
|
||||
if (cli_credentials_set_ccache(
|
||||
popt_get_cmdline_credentials(), cmdline_lp_ctx,
|
||||
arg, CRED_SPECIFIED,
|
||||
&error_string) != 0) {
|
||||
fprintf(stderr, "Error reading krb5 credentials cache: '%s' %s", arg, error_string);
|
||||
exit(1);
|
||||
@ -137,10 +148,12 @@ static void popt_common_credentials_callback(poptContext con,
|
||||
{
|
||||
uint32_t gensec_features;
|
||||
|
||||
gensec_features = cli_credentials_get_gensec_features(cmdline_credentials);
|
||||
gensec_features = cli_credentials_get_gensec_features(
|
||||
popt_get_cmdline_credentials());
|
||||
|
||||
gensec_features |= GENSEC_FEATURE_SIGN;
|
||||
cli_credentials_set_gensec_features(cmdline_credentials,
|
||||
cli_credentials_set_gensec_features(
|
||||
popt_get_cmdline_credentials(),
|
||||
gensec_features);
|
||||
break;
|
||||
}
|
||||
@ -148,10 +161,12 @@ static void popt_common_credentials_callback(poptContext con,
|
||||
{
|
||||
uint32_t gensec_features;
|
||||
|
||||
gensec_features = cli_credentials_get_gensec_features(cmdline_credentials);
|
||||
gensec_features = cli_credentials_get_gensec_features(
|
||||
popt_get_cmdline_credentials());
|
||||
|
||||
gensec_features |= GENSEC_FEATURE_SEAL;
|
||||
cli_credentials_set_gensec_features(cmdline_credentials,
|
||||
cli_credentials_set_gensec_features(
|
||||
popt_get_cmdline_credentials(),
|
||||
gensec_features);
|
||||
break;
|
||||
}
|
||||
|
@ -43,10 +43,12 @@ static struct registry_context *open_backend(TALLOC_CTX *mem_ctx,
|
||||
poptPrintUsage(pc, stderr, 0);
|
||||
return NULL;
|
||||
case REG_LOCAL:
|
||||
error = reg_open_samba(mem_ctx, &ctx, ev_ctx, lp_ctx, NULL, cmdline_credentials);
|
||||
error = reg_open_samba(mem_ctx, &ctx, ev_ctx, lp_ctx, NULL,
|
||||
popt_get_cmdline_credentials());
|
||||
break;
|
||||
case REG_REMOTE:
|
||||
error = reg_open_remote(mem_ctx, &ctx, NULL, cmdline_credentials, lp_ctx,
|
||||
error = reg_open_remote(mem_ctx, &ctx, NULL,
|
||||
popt_get_cmdline_credentials(), lp_ctx,
|
||||
remote_host, ev_ctx);
|
||||
break;
|
||||
case REG_NULL:
|
||||
|
@ -52,9 +52,11 @@ int main(int argc, const char **argv)
|
||||
ev_ctx = s4_event_context_init(NULL);
|
||||
|
||||
if (remote) {
|
||||
h = reg_common_open_remote (remote, ev_ctx, cmdline_lp_ctx, cmdline_credentials);
|
||||
h = reg_common_open_remote (remote, ev_ctx, cmdline_lp_ctx,
|
||||
popt_get_cmdline_credentials());
|
||||
} else {
|
||||
h = reg_common_open_local (cmdline_credentials, ev_ctx, cmdline_lp_ctx);
|
||||
h = reg_common_open_local (popt_get_cmdline_credentials(),
|
||||
ev_ctx, cmdline_lp_ctx);
|
||||
}
|
||||
|
||||
if (h == NULL)
|
||||
|
@ -586,9 +586,12 @@ int main(int argc, const char **argv)
|
||||
|
||||
if (remote != NULL) {
|
||||
ctx->registry = reg_common_open_remote(remote, ev_ctx,
|
||||
cmdline_lp_ctx, cmdline_credentials);
|
||||
cmdline_lp_ctx,
|
||||
popt_get_cmdline_credentials());
|
||||
} else if (file != NULL) {
|
||||
ctx->current = reg_common_open_file(file, ev_ctx, cmdline_lp_ctx, cmdline_credentials);
|
||||
ctx->current = reg_common_open_file(file, ev_ctx,
|
||||
cmdline_lp_ctx,
|
||||
popt_get_cmdline_credentials());
|
||||
if (ctx->current == NULL)
|
||||
return 1;
|
||||
ctx->registry = ctx->current->context;
|
||||
@ -596,7 +599,9 @@ int main(int argc, const char **argv)
|
||||
ctx->predef = NULL;
|
||||
ctx->root = ctx->current;
|
||||
} else {
|
||||
ctx->registry = reg_common_open_local(cmdline_credentials, ev_ctx, cmdline_lp_ctx);
|
||||
ctx->registry = reg_common_open_local(
|
||||
popt_get_cmdline_credentials(),
|
||||
ev_ctx, cmdline_lp_ctx);
|
||||
}
|
||||
|
||||
if (ctx->registry == NULL)
|
||||
|
@ -131,11 +131,14 @@ int main(int argc, const char **argv)
|
||||
ev_ctx = s4_event_context_init(NULL);
|
||||
|
||||
if (remote != NULL) {
|
||||
h = reg_common_open_remote(remote, ev_ctx, cmdline_lp_ctx, cmdline_credentials);
|
||||
h = reg_common_open_remote(remote, ev_ctx, cmdline_lp_ctx,
|
||||
popt_get_cmdline_credentials());
|
||||
} else if (file != NULL) {
|
||||
start_key = reg_common_open_file(file, ev_ctx, cmdline_lp_ctx, cmdline_credentials);
|
||||
start_key = reg_common_open_file(file, ev_ctx, cmdline_lp_ctx,
|
||||
popt_get_cmdline_credentials());
|
||||
} else {
|
||||
h = reg_common_open_local(cmdline_credentials, ev_ctx, cmdline_lp_ctx);
|
||||
h = reg_common_open_local(popt_get_cmdline_credentials(),
|
||||
ev_ctx, cmdline_lp_ctx);
|
||||
}
|
||||
|
||||
if (h == NULL && start_key == NULL)
|
||||
|
@ -166,7 +166,7 @@ int main(int argc, char **argv)
|
||||
|
||||
parse_args(argc, argv, &args);
|
||||
|
||||
wmi_init(&ctx, cmdline_credentials);
|
||||
wmi_init(&ctx, popt_get_cmdline_credentials());
|
||||
|
||||
if (!args.ns)
|
||||
args.ns = "root\\cimv2";
|
||||
|
@ -191,7 +191,7 @@ int main(int argc, char **argv)
|
||||
|
||||
parse_args(argc, argv, &args);
|
||||
|
||||
wmi_init(&ctx, cmdline_credentials);
|
||||
wmi_init(&ctx, popt_get_cmdline_credentials());
|
||||
result = WBEM_ConnectServer(ctx, args.hostname, "root\\cimv2", 0, 0, 0, 0, 0, 0, &pWS);
|
||||
WERR_CHECK("WBEM_ConnectServer.");
|
||||
|
||||
|
@ -41,7 +41,7 @@ static bool torture_ntlmssp_self_check(struct torture_context *tctx)
|
||||
lpcfg_gensec_settings(tctx, tctx->lp_ctx)),
|
||||
"gensec client start");
|
||||
|
||||
gensec_set_credentials(gensec_security, cmdline_credentials);
|
||||
gensec_set_credentials(gensec_security, popt_get_cmdline_credentials());
|
||||
|
||||
gensec_want_feature(gensec_security, GENSEC_FEATURE_SIGN);
|
||||
gensec_want_feature(gensec_security, GENSEC_FEATURE_SEAL);
|
||||
@ -98,7 +98,7 @@ static bool torture_ntlmssp_self_check(struct torture_context *tctx)
|
||||
lpcfg_gensec_settings(tctx, tctx->lp_ctx)),
|
||||
"Failed to start GENSEC for NTLMSSP");
|
||||
|
||||
gensec_set_credentials(gensec_security, cmdline_credentials);
|
||||
gensec_set_credentials(gensec_security, popt_get_cmdline_credentials());
|
||||
|
||||
gensec_want_feature(gensec_security, GENSEC_FEATURE_SIGN);
|
||||
gensec_want_feature(gensec_security, GENSEC_FEATURE_SEAL);
|
||||
|
@ -34,9 +34,8 @@
|
||||
#include "libcli/composite/composite.h"
|
||||
#include "param/param.h"
|
||||
#include "torture/basic/proto.h"
|
||||
#include "lib/cmdline/popt_common.h"
|
||||
|
||||
extern struct cli_credentials *cmdline_credentials;
|
||||
|
||||
static bool wait_lock(struct smbcli_state *c, int fnum, uint32_t offset, uint32_t len)
|
||||
{
|
||||
while (NT_STATUS_IS_ERR(smbcli_lock(c->tree, fnum, offset, len, -1, WRITE_LOCK))) {
|
||||
@ -873,7 +872,7 @@ static struct composite_context *torture_connect_async(
|
||||
smb->in.socket_options = lpcfg_socket_options(tctx->lp_ctx);
|
||||
smb->in.called_name = strupper_talloc(mem_ctx, host);
|
||||
smb->in.service_type=NULL;
|
||||
smb->in.credentials=cmdline_credentials;
|
||||
smb->in.credentials=popt_get_cmdline_credentials();
|
||||
smb->in.fallback_to_anonymous=false;
|
||||
smb->in.gensec_settings = lpcfg_gensec_settings(mem_ctx, tctx->lp_ctx);
|
||||
smb->in.workgroup=workgroup;
|
||||
|
@ -174,7 +174,8 @@ static bool test_dlz_bind9_gensec(struct torture_context *tctx, const char *mech
|
||||
status = gensec_set_target_service(gensec_client_context, "dns");
|
||||
torture_assert_ntstatus_ok(tctx, status, "gensec_set_target_service failed");
|
||||
|
||||
status = gensec_set_credentials(gensec_client_context, cmdline_credentials);
|
||||
status = gensec_set_credentials(gensec_client_context,
|
||||
popt_get_cmdline_credentials());
|
||||
torture_assert_ntstatus_ok(tctx, status, "gensec_set_credentials (client) failed");
|
||||
|
||||
status = gensec_start_mech_by_sasl_name(gensec_client_context, mech);
|
||||
@ -188,14 +189,16 @@ static bool test_dlz_bind9_gensec(struct torture_context *tctx, const char *mech
|
||||
torture_assert_ntstatus_ok(tctx, status, "gensec_update (client) failed");
|
||||
}
|
||||
|
||||
torture_assert_int_equal(tctx, dlz_ssumatch(cli_credentials_get_username(cmdline_credentials),
|
||||
lpcfg_dnsdomain(tctx->lp_ctx),
|
||||
"127.0.0.1", "type", "key",
|
||||
client_to_server.length,
|
||||
client_to_server.data,
|
||||
dbdata),
|
||||
ISC_TRUE,
|
||||
"Failed to check key for update rights samba_dlz");
|
||||
torture_assert_int_equal(tctx, dlz_ssumatch(
|
||||
cli_credentials_get_username(
|
||||
popt_get_cmdline_credentials()),
|
||||
lpcfg_dnsdomain(tctx->lp_ctx),
|
||||
"127.0.0.1", "type", "key",
|
||||
client_to_server.length,
|
||||
client_to_server.data,
|
||||
dbdata),
|
||||
ISC_TRUE,
|
||||
"Failed to check key for update rights samba_dlz");
|
||||
|
||||
dlz_destroy(dbdata);
|
||||
|
||||
@ -653,7 +656,8 @@ static bool test_dlz_bind9_update01(struct torture_context *tctx)
|
||||
status = gensec_set_target_service(gensec_client_context, "dns");
|
||||
torture_assert_ntstatus_ok(tctx, status, "gensec_set_target_service failed");
|
||||
|
||||
status = gensec_set_credentials(gensec_client_context, cmdline_credentials);
|
||||
status = gensec_set_credentials(gensec_client_context,
|
||||
popt_get_cmdline_credentials());
|
||||
torture_assert_ntstatus_ok(tctx, status, "gensec_set_credentials (client) failed");
|
||||
|
||||
status = gensec_start_mech_by_sasl_name(gensec_client_context, "GSS-SPNEGO");
|
||||
@ -667,16 +671,18 @@ static bool test_dlz_bind9_update01(struct torture_context *tctx)
|
||||
torture_assert_ntstatus_ok(tctx, status, "gensec_update (client) failed");
|
||||
}
|
||||
|
||||
torture_assert_int_equal(tctx, dlz_ssumatch(cli_credentials_get_username(cmdline_credentials),
|
||||
name,
|
||||
"127.0.0.1",
|
||||
expected1->records[0].type,
|
||||
"key",
|
||||
client_to_server.length,
|
||||
client_to_server.data,
|
||||
dbdata),
|
||||
ISC_TRUE,
|
||||
"Failed to check key for update rights samba_dlz");
|
||||
torture_assert_int_equal(tctx, dlz_ssumatch(
|
||||
cli_credentials_get_username(
|
||||
popt_get_cmdline_credentials()),
|
||||
name,
|
||||
"127.0.0.1",
|
||||
expected1->records[0].type,
|
||||
"key",
|
||||
client_to_server.length,
|
||||
client_to_server.data,
|
||||
dbdata),
|
||||
ISC_TRUE,
|
||||
"Failed to check key for update rights samba_dlz");
|
||||
|
||||
/*
|
||||
* We test the following:
|
||||
|
@ -123,7 +123,7 @@ static struct DsSyncTest *test_create_context(struct torture_context *tctx)
|
||||
}
|
||||
|
||||
/* ctx->admin ...*/
|
||||
ctx->admin.credentials = cmdline_credentials;
|
||||
ctx->admin.credentials = popt_get_cmdline_credentials();
|
||||
|
||||
our_bind_info28 = &ctx->admin.drsuapi.our_bind_info28;
|
||||
our_bind_info28->supported_extensions = 0xFFFFFFFF;
|
||||
@ -143,7 +143,7 @@ static struct DsSyncTest *test_create_context(struct torture_context *tctx)
|
||||
ctx->admin.drsuapi.req.out.bind_handle = &ctx->admin.drsuapi.bind_handle;
|
||||
|
||||
/* ctx->new_dc ...*/
|
||||
ctx->new_dc.credentials = cmdline_credentials;
|
||||
ctx->new_dc.credentials = popt_get_cmdline_credentials();
|
||||
|
||||
our_bind_info28 = &ctx->new_dc.drsuapi.our_bind_info28;
|
||||
our_bind_info28->supported_extensions |= DRSUAPI_SUPPORTED_EXTENSION_BASE;
|
||||
|
@ -185,7 +185,7 @@ static struct DsIntIdTestCtx *_dsintid_create_context(struct torture_context *tc
|
||||
}
|
||||
|
||||
/* populate test suite context */
|
||||
ctx->creds = cmdline_credentials;
|
||||
ctx->creds = popt_get_cmdline_credentials();
|
||||
ctx->dsa_bind.server_binding = server_binding;
|
||||
|
||||
ctx->ldap_url = talloc_asprintf(ctx, "ldap://%s",
|
||||
|
@ -1423,7 +1423,8 @@ static bool torture_krb5_as_req_canon(struct torture_context *tctx, const void *
|
||||
int expected_principal_flags;
|
||||
char *got_principal_string;
|
||||
char *assertion_message;
|
||||
const char *password = cli_credentials_get_password(cmdline_credentials);
|
||||
const char *password = cli_credentials_get_password(
|
||||
popt_get_cmdline_credentials());
|
||||
krb5_context k5_context;
|
||||
struct torture_krb5_context *test_context;
|
||||
bool ok;
|
||||
@ -1913,7 +1914,8 @@ static bool torture_krb5_as_req_canon(struct torture_context *tctx, const void *
|
||||
torture_assert_int_equal(tctx, k5ret, 0, assertion_message);
|
||||
client_to_server = data_blob_const(enc_ticket.data, enc_ticket.length);
|
||||
torture_assert(tctx,
|
||||
test_accept_ticket(tctx, cmdline_credentials,
|
||||
test_accept_ticket(tctx,
|
||||
popt_get_cmdline_credentials(),
|
||||
expected_unparse_principal_string,
|
||||
client_to_server),
|
||||
"test_accept_ticket failed - failed to accept the ticket we just created");
|
||||
@ -2227,10 +2229,15 @@ struct torture_suite *torture_krb5_canon(TALLOC_CTX *mem_ctx)
|
||||
|
||||
test_data->test_name = name;
|
||||
test_data->real_realm
|
||||
= strupper_talloc(test_data, cli_credentials_get_realm(cmdline_credentials));
|
||||
test_data->real_domain = cli_credentials_get_domain(cmdline_credentials);
|
||||
test_data->username = cli_credentials_get_username(cmdline_credentials);
|
||||
test_data->real_username = cli_credentials_get_username(cmdline_credentials);
|
||||
= strupper_talloc(test_data,
|
||||
cli_credentials_get_realm(
|
||||
popt_get_cmdline_credentials()));
|
||||
test_data->real_domain = cli_credentials_get_domain(
|
||||
popt_get_cmdline_credentials());
|
||||
test_data->username = cli_credentials_get_username(
|
||||
popt_get_cmdline_credentials());
|
||||
test_data->real_username = cli_credentials_get_username(
|
||||
popt_get_cmdline_credentials());
|
||||
test_data->canonicalize = (i & TEST_CANONICALIZE) != 0;
|
||||
test_data->enterprise = (i & TEST_ENTERPRISE) != 0;
|
||||
test_data->upper_realm = (i & TEST_UPPER_REALM) != 0;
|
||||
|
@ -643,7 +643,8 @@ static bool torture_krb5_as_req_creds(struct torture_context *tctx,
|
||||
|
||||
static bool torture_krb5_as_req_cmdline(struct torture_context *tctx)
|
||||
{
|
||||
return torture_krb5_as_req_creds(tctx, cmdline_credentials, TORTURE_KRB5_TEST_PLAIN);
|
||||
return torture_krb5_as_req_creds(tctx, popt_get_cmdline_credentials(),
|
||||
TORTURE_KRB5_TEST_PLAIN);
|
||||
}
|
||||
|
||||
static bool torture_krb5_as_req_pac_request(struct torture_context *tctx)
|
||||
@ -651,37 +652,40 @@ static bool torture_krb5_as_req_pac_request(struct torture_context *tctx)
|
||||
if (torture_setting_bool(tctx, "expect_rodc", false)) {
|
||||
torture_skip(tctx, "This test needs further investigation in the RODC case against a Windows DC, in particular with non-cached users");
|
||||
}
|
||||
return torture_krb5_as_req_creds(tctx, cmdline_credentials, TORTURE_KRB5_TEST_PAC_REQUEST);
|
||||
return torture_krb5_as_req_creds(tctx, popt_get_cmdline_credentials(),
|
||||
TORTURE_KRB5_TEST_PAC_REQUEST);
|
||||
}
|
||||
|
||||
static bool torture_krb5_as_req_break_pw(struct torture_context *tctx)
|
||||
{
|
||||
return torture_krb5_as_req_creds(tctx, cmdline_credentials, TORTURE_KRB5_TEST_BREAK_PW);
|
||||
return torture_krb5_as_req_creds(tctx, popt_get_cmdline_credentials(),
|
||||
TORTURE_KRB5_TEST_BREAK_PW);
|
||||
}
|
||||
|
||||
static bool torture_krb5_as_req_clock_skew(struct torture_context *tctx)
|
||||
{
|
||||
return torture_krb5_as_req_creds(tctx, cmdline_credentials, TORTURE_KRB5_TEST_CLOCK_SKEW);
|
||||
return torture_krb5_as_req_creds(tctx, popt_get_cmdline_credentials(),
|
||||
TORTURE_KRB5_TEST_CLOCK_SKEW);
|
||||
}
|
||||
|
||||
static bool torture_krb5_as_req_aes(struct torture_context *tctx)
|
||||
{
|
||||
return torture_krb5_as_req_creds(tctx,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
TORTURE_KRB5_TEST_AES);
|
||||
}
|
||||
|
||||
static bool torture_krb5_as_req_rc4(struct torture_context *tctx)
|
||||
{
|
||||
return torture_krb5_as_req_creds(tctx,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
TORTURE_KRB5_TEST_RC4);
|
||||
}
|
||||
|
||||
static bool torture_krb5_as_req_aes_rc4(struct torture_context *tctx)
|
||||
{
|
||||
return torture_krb5_as_req_creds(tctx,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
TORTURE_KRB5_TEST_AES_RC4);
|
||||
}
|
||||
|
||||
|
@ -691,7 +691,7 @@ static bool torture_krb5_as_req_creds(struct torture_context *tctx,
|
||||
static bool torture_krb5_as_req_cmdline(struct torture_context *tctx)
|
||||
{
|
||||
return torture_krb5_as_req_creds(tctx,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
TORTURE_KRB5_TEST_PLAIN);
|
||||
}
|
||||
|
||||
@ -707,42 +707,43 @@ static bool torture_krb5_as_req_pac_request(struct torture_context *tctx)
|
||||
"RODC case against a Windows DC, in particular "
|
||||
"with non-cached users");
|
||||
}
|
||||
return torture_krb5_as_req_creds(tctx, cmdline_credentials, TORTURE_KRB5_TEST_PAC_REQUEST);
|
||||
return torture_krb5_as_req_creds(tctx, popt_get_cmdline_credentials(),
|
||||
TORTURE_KRB5_TEST_PAC_REQUEST);
|
||||
}
|
||||
#endif /* HAVE_KRB5_GET_INIT_CREDS_OPT_SET_PAC_REQUEST */
|
||||
|
||||
static bool torture_krb5_as_req_break_pw(struct torture_context *tctx)
|
||||
{
|
||||
return torture_krb5_as_req_creds(tctx,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
TORTURE_KRB5_TEST_BREAK_PW);
|
||||
}
|
||||
|
||||
static bool torture_krb5_as_req_clock_skew(struct torture_context *tctx)
|
||||
{
|
||||
return torture_krb5_as_req_creds(tctx,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
TORTURE_KRB5_TEST_CLOCK_SKEW);
|
||||
}
|
||||
|
||||
static bool torture_krb5_as_req_aes(struct torture_context *tctx)
|
||||
{
|
||||
return torture_krb5_as_req_creds(tctx,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
TORTURE_KRB5_TEST_AES);
|
||||
}
|
||||
|
||||
static bool torture_krb5_as_req_rc4(struct torture_context *tctx)
|
||||
{
|
||||
return torture_krb5_as_req_creds(tctx,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
TORTURE_KRB5_TEST_RC4);
|
||||
}
|
||||
|
||||
static bool torture_krb5_as_req_aes_rc4(struct torture_context *tctx)
|
||||
{
|
||||
return torture_krb5_as_req_creds(tctx,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
TORTURE_KRB5_TEST_AES_RC4);
|
||||
}
|
||||
|
||||
|
@ -724,7 +724,7 @@ static bool test_referrals(struct torture_context *tctx, TALLOC_CTX *mem_ctx,
|
||||
}
|
||||
|
||||
ldb = ldb_wrap_connect(mem_ctx, tctx->ev, tctx->lp_ctx, url,
|
||||
NULL, cmdline_credentials, 0);
|
||||
NULL, popt_get_cmdline_credentials(), 0);
|
||||
|
||||
/* "partitions[i]" are the partitions for which we search the parents */
|
||||
for (i = 1; partitions[i] != NULL; i++) {
|
||||
@ -968,7 +968,7 @@ bool torture_ldap_basic(struct torture_context *torture)
|
||||
ret = false;
|
||||
}
|
||||
|
||||
if (!test_bind_sasl(torture, conn, cmdline_credentials)) {
|
||||
if (!test_bind_sasl(torture, conn, popt_get_cmdline_credentials())) {
|
||||
ret = false;
|
||||
}
|
||||
|
||||
|
@ -62,7 +62,7 @@ bool torture_ldap_sort(struct torture_context *torture)
|
||||
|
||||
ldb = ldb_wrap_connect(torture, torture->ev, torture->lp_ctx, url,
|
||||
NULL,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
0);
|
||||
torture_assert(torture, ldb, "Failed to make LDB connection to target");
|
||||
|
||||
|
@ -162,7 +162,7 @@ bool test_ldap_nested_search(struct torture_context *tctx)
|
||||
torture_comment(tctx, "Connecting to: %s\n", url);
|
||||
sctx->ldb = ldb_wrap_connect(sctx, tctx->ev, tctx->lp_ctx, url,
|
||||
NULL,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
0);
|
||||
torture_assert(tctx, sctx->ldb, "Failed to create ldb connection");
|
||||
|
||||
|
@ -388,7 +388,7 @@ bool torture_ldap_schema(struct torture_context *torture)
|
||||
|
||||
ldb = ldb_wrap_connect(torture, torture->ev, torture->lp_ctx, url,
|
||||
NULL,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
0);
|
||||
if (!ldb) goto failed;
|
||||
|
||||
|
@ -159,7 +159,7 @@ bool torture_ldap_uptodatevector(struct torture_context *torture)
|
||||
|
||||
ldb = ldb_wrap_connect(torture, torture->ev, torture->lp_ctx, url,
|
||||
NULL,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
0);
|
||||
if (!ldb) goto failed;
|
||||
|
||||
|
@ -92,7 +92,7 @@ bool torture_net_become_dc(struct torture_context *torture)
|
||||
torture_assert(torture, s, "libnet_vampire_cb_state_init");
|
||||
|
||||
ctx = libnet_context_init(torture->ev, torture->lp_ctx);
|
||||
ctx->cred = cmdline_credentials;
|
||||
ctx->cred = popt_get_cmdline_credentials();
|
||||
|
||||
ZERO_STRUCT(b);
|
||||
b.in.domain_dns_name = torture_join_dom_dns_name(tj);
|
||||
|
@ -141,7 +141,7 @@ bool torture_domain_open_lsa(struct torture_context *torture)
|
||||
return false;
|
||||
}
|
||||
|
||||
ctx->cred = cmdline_credentials;
|
||||
ctx->cred = popt_get_cmdline_credentials();
|
||||
|
||||
ZERO_STRUCT(r);
|
||||
r.in.type = DOMAIN_LSA;
|
||||
@ -196,11 +196,12 @@ bool torture_domain_close_lsa(struct torture_context *torture)
|
||||
goto done;
|
||||
}
|
||||
|
||||
ctx->cred = cmdline_credentials;
|
||||
ctx->cred = popt_get_cmdline_credentials();
|
||||
|
||||
mem_ctx = talloc_init("torture_domain_close_lsa");
|
||||
status = dcerpc_pipe_connect_b(mem_ctx, &p, binding, &ndr_table_lsarpc,
|
||||
cmdline_credentials, torture->ev, torture->lp_ctx);
|
||||
popt_get_cmdline_credentials(),
|
||||
torture->ev, torture->lp_ctx);
|
||||
if (!NT_STATUS_IS_OK(status)) {
|
||||
torture_comment(torture, "failed to connect to server: %s\n", nt_errstr(status));
|
||||
ret = false;
|
||||
@ -251,7 +252,7 @@ bool torture_domain_open_samr(struct torture_context *torture)
|
||||
mem_ctx = talloc_init("test_domainopen_lsa");
|
||||
|
||||
ctx = libnet_context_init(torture->ev, torture->lp_ctx);
|
||||
ctx->cred = cmdline_credentials;
|
||||
ctx->cred = popt_get_cmdline_credentials();
|
||||
|
||||
/* we're accessing domain controller so the domain name should be
|
||||
passed (it's going to be resolved to dc name and address) instead
|
||||
@ -322,7 +323,7 @@ bool torture_domain_close_samr(struct torture_context *torture)
|
||||
goto done;
|
||||
}
|
||||
|
||||
ctx->cred = cmdline_credentials;
|
||||
ctx->cred = popt_get_cmdline_credentials();
|
||||
|
||||
mem_ctx = talloc_init("torture_domain_close_samr");
|
||||
status = dcerpc_pipe_connect_b(mem_ctx, &p, binding, &ndr_table_samr,
|
||||
@ -386,7 +387,7 @@ bool torture_domain_list(struct torture_context *torture)
|
||||
goto done;
|
||||
}
|
||||
|
||||
ctx->cred = cmdline_credentials;
|
||||
ctx->cred = popt_get_cmdline_credentials();
|
||||
|
||||
mem_ctx = talloc_init("torture_domain_close_samr");
|
||||
|
||||
|
@ -114,7 +114,7 @@ bool torture_grouplist(struct torture_context *torture)
|
||||
int i;
|
||||
|
||||
ctx = libnet_context_init(torture->ev, torture->lp_ctx);
|
||||
ctx->cred = cmdline_credentials;
|
||||
ctx->cred = popt_get_cmdline_credentials();
|
||||
|
||||
domain_name.string = lpcfg_workgroup(torture->lp_ctx);
|
||||
mem_ctx = talloc_init("torture group list");
|
||||
@ -177,7 +177,7 @@ bool torture_creategroup(struct torture_context *torture)
|
||||
mem_ctx = talloc_init("test_creategroup");
|
||||
|
||||
ctx = libnet_context_init(torture->ev, torture->lp_ctx);
|
||||
ctx->cred = cmdline_credentials;
|
||||
ctx->cred = popt_get_cmdline_credentials();
|
||||
|
||||
req.in.group_name = TEST_GROUPNAME;
|
||||
req.in.domain_name = lpcfg_workgroup(torture->lp_ctx);
|
||||
|
@ -39,7 +39,7 @@ bool torture_lookup(struct torture_context *torture)
|
||||
mem_ctx = talloc_init("test_lookup");
|
||||
|
||||
ctx = libnet_context_init(torture->ev, torture->lp_ctx);
|
||||
ctx->cred = cmdline_credentials;
|
||||
ctx->cred = popt_get_cmdline_credentials();
|
||||
|
||||
lookup.in.hostname = torture_setting_string(torture, "host", NULL);
|
||||
if (lookup.in.hostname == NULL) {
|
||||
@ -83,7 +83,7 @@ bool torture_lookup_host(struct torture_context *torture)
|
||||
mem_ctx = talloc_init("test_lookup_host");
|
||||
|
||||
ctx = libnet_context_init(torture->ev, torture->lp_ctx);
|
||||
ctx->cred = cmdline_credentials;
|
||||
ctx->cred = popt_get_cmdline_credentials();
|
||||
|
||||
lookup.in.hostname = torture_setting_string(torture, "host", NULL);
|
||||
if (lookup.in.hostname == NULL) {
|
||||
@ -126,7 +126,7 @@ bool torture_lookup_pdc(struct torture_context *torture)
|
||||
mem_ctx = talloc_init("test_lookup_pdc");
|
||||
|
||||
ctx = libnet_context_init(torture->ev, torture->lp_ctx);
|
||||
ctx->cred = cmdline_credentials;
|
||||
ctx->cred = popt_get_cmdline_credentials();
|
||||
|
||||
talloc_steal(ctx, mem_ctx);
|
||||
|
||||
@ -171,7 +171,7 @@ bool torture_lookup_sam_name(struct torture_context *torture)
|
||||
bool ret = true;
|
||||
|
||||
ctx = libnet_context_init(torture->ev, torture->lp_ctx);
|
||||
ctx->cred = cmdline_credentials;
|
||||
ctx->cred = popt_get_cmdline_credentials();
|
||||
|
||||
mem_ctx = talloc_init("torture lookup sam name");
|
||||
if (mem_ctx == NULL) return false;
|
||||
|
@ -90,7 +90,7 @@ static bool torture_rpc_connect(struct torture_context *torture,
|
||||
struct libnet_context *ctx;
|
||||
|
||||
ctx = libnet_context_init(torture->ev, torture->lp_ctx);
|
||||
ctx->cred = cmdline_credentials;
|
||||
ctx->cred = popt_get_cmdline_credentials();
|
||||
|
||||
torture_comment(torture, "Testing connection to LSA interface\n");
|
||||
|
||||
|
@ -140,7 +140,7 @@ bool torture_listshares(struct torture_context *torture)
|
||||
goto done;
|
||||
}
|
||||
|
||||
libnetctx->cred = cmdline_credentials;
|
||||
libnetctx->cred = popt_get_cmdline_credentials();
|
||||
|
||||
torture_comment(torture, "Testing libnet_ListShare\n");
|
||||
|
||||
@ -221,7 +221,7 @@ bool torture_delshare(struct torture_context *torture)
|
||||
torture_assert_ntstatus_ok(torture, status, "Failed to get binding");
|
||||
|
||||
libnetctx = libnet_context_init(torture->ev, torture->lp_ctx);
|
||||
libnetctx->cred = cmdline_credentials;
|
||||
libnetctx->cred = popt_get_cmdline_credentials();
|
||||
|
||||
status = torture_rpc_connection(torture,
|
||||
&p,
|
||||
|
@ -466,7 +466,7 @@ bool torture_userlist(struct torture_context *torture)
|
||||
int i;
|
||||
|
||||
ctx = libnet_context_init(torture->ev, torture->lp_ctx);
|
||||
ctx->cred = cmdline_credentials;
|
||||
ctx->cred = popt_get_cmdline_credentials();
|
||||
|
||||
domain_name.string = lpcfg_workgroup(torture->lp_ctx);
|
||||
mem_ctx = talloc_init("torture user list");
|
||||
|
@ -134,7 +134,7 @@ static bool _get_account_name_for_user_rdn(struct torture_context *tctx,
|
||||
|
||||
ldb = ldb_wrap_connect(tmp_ctx,
|
||||
tctx->ev, tctx->lp_ctx,
|
||||
url, NULL, cmdline_credentials, 0);
|
||||
url, NULL, popt_get_cmdline_credentials(), 0);
|
||||
torture_assert_goto(tctx, ldb != NULL, test_res, done, "Failed to make LDB connection");
|
||||
|
||||
ldb_ret = ldb_search(ldb, tmp_ctx, &ldb_res,
|
||||
@ -493,7 +493,7 @@ bool test_libnet_context_init(struct torture_context *tctx,
|
||||
torture_assert(tctx, net_ctx != NULL, "Failed to create libnet_context");
|
||||
|
||||
/* Use command line credentials for testing */
|
||||
net_ctx->cred = cmdline_credentials;
|
||||
net_ctx->cred = popt_get_cmdline_credentials();
|
||||
|
||||
if (rpc_connect) {
|
||||
/* connect SAMR pipe */
|
||||
|
@ -49,9 +49,9 @@ bool torture_libnetapi_init_context(struct torture_context *tctx,
|
||||
}
|
||||
|
||||
libnetapi_set_username(ctx,
|
||||
cli_credentials_get_username(cmdline_credentials));
|
||||
cli_credentials_get_username(popt_get_cmdline_credentials()));
|
||||
libnetapi_set_password(ctx,
|
||||
cli_credentials_get_password(cmdline_credentials));
|
||||
cli_credentials_get_password(popt_get_cmdline_credentials()));
|
||||
|
||||
*ctx_p = ctx;
|
||||
|
||||
|
@ -38,7 +38,8 @@ bool torture_libsmbclient_init_context(struct torture_context *tctx,
|
||||
|
||||
/* yes, libsmbclient API frees the username when freeing the context, so
|
||||
* have to pass malloced data here */
|
||||
smbc_setUser(ctx, strdup(cli_credentials_get_username(cmdline_credentials)));
|
||||
smbc_setUser(ctx, strdup(cli_credentials_get_username(
|
||||
popt_get_cmdline_credentials())));
|
||||
|
||||
*ctx_p = ctx;
|
||||
|
||||
|
@ -90,14 +90,16 @@ static struct smbcli_state *connect_one(struct resolve_context *resolve_ctx,
|
||||
*share = 0;
|
||||
share++;
|
||||
|
||||
cli_credentials_set_workstation(cmdline_credentials, "masktest", CRED_SPECIFIED);
|
||||
cli_credentials_set_workstation(popt_get_cmdline_credentials(),
|
||||
"masktest", CRED_SPECIFIED);
|
||||
|
||||
status = smbcli_full_connection(NULL, &c,
|
||||
server,
|
||||
ports,
|
||||
share, NULL,
|
||||
socket_options,
|
||||
cmdline_credentials, resolve_ctx, ev,
|
||||
popt_get_cmdline_credentials(),
|
||||
resolve_ctx, ev,
|
||||
options, session_options,
|
||||
gensec_settings);
|
||||
|
||||
|
@ -159,7 +159,7 @@ static bool test_fetchfile(struct torture_context *tctx, struct smbcli_state *cl
|
||||
io2.in.service_type = "A:";
|
||||
io2.in.socket_options = lpcfg_socket_options(tctx->lp_ctx);
|
||||
|
||||
io2.in.credentials = cmdline_credentials;
|
||||
io2.in.credentials = popt_get_cmdline_credentials();
|
||||
io2.in.workgroup = lpcfg_workgroup(tctx->lp_ctx);
|
||||
io2.in.filename = fname;
|
||||
lpcfg_smbcli_options(tctx->lp_ctx, &io2.in.options);
|
||||
@ -348,7 +348,7 @@ static bool test_fsinfo(struct torture_context *tctx, struct smbcli_state *cli)
|
||||
io1.in.called_name = torture_setting_string(tctx, "host", NULL);
|
||||
io1.in.service = torture_setting_string(tctx, "share", NULL);
|
||||
io1.in.service_type = "A:";
|
||||
io1.in.credentials = cmdline_credentials;
|
||||
io1.in.credentials = popt_get_cmdline_credentials();
|
||||
io1.in.workgroup = lpcfg_workgroup(tctx->lp_ctx);
|
||||
io1.in.level = RAW_QFS_OBJECTID_INFORMATION;
|
||||
io1.in.gensec_settings = lpcfg_gensec_settings(tctx, tctx->lp_ctx);
|
||||
|
@ -86,7 +86,7 @@ static bool test_session(struct torture_context *tctx,
|
||||
setup.in.capabilities = cli->transport->negotiate.capabilities; /* ignored in secondary session setup, except by our libs, which care about the extended security bit */
|
||||
setup.in.workgroup = lpcfg_workgroup(tctx->lp_ctx);
|
||||
|
||||
setup.in.credentials = cmdline_credentials;
|
||||
setup.in.credentials = popt_get_cmdline_credentials();
|
||||
setup.in.gensec_settings = gensec_settings;
|
||||
|
||||
status = smb_composite_sesssetup(session, &setup);
|
||||
@ -114,7 +114,7 @@ static bool test_session(struct torture_context *tctx,
|
||||
setup.in.capabilities = cli->transport->negotiate.capabilities; /* ignored in secondary session setup, except by our libs, which care about the extended security bit */
|
||||
setup.in.workgroup = lpcfg_workgroup(tctx->lp_ctx);
|
||||
|
||||
setup.in.credentials = cmdline_credentials;
|
||||
setup.in.credentials = popt_get_cmdline_credentials();
|
||||
|
||||
torture_comment(tctx, "vuid1=%d vuid2=%d vuid3=%d\n", cli->session->vuid, session->vuid, vuid3);
|
||||
|
||||
@ -142,7 +142,7 @@ static bool test_session(struct torture_context *tctx,
|
||||
setup.in.capabilities &= ~CAP_EXTENDED_SECURITY; /* force a non extended security login (should fail) */
|
||||
setup.in.workgroup = lpcfg_workgroup(tctx->lp_ctx);
|
||||
|
||||
setup.in.credentials = cmdline_credentials;
|
||||
setup.in.credentials = popt_get_cmdline_credentials();
|
||||
|
||||
status = smb_composite_sesssetup(session3, &setup);
|
||||
if (!NT_STATUS_EQUAL(status, NT_STATUS_LOGON_FAILURE)) {
|
||||
@ -239,7 +239,7 @@ static bool test_session(struct torture_context *tctx,
|
||||
setups[i].in.capabilities = cli->transport->negotiate.capabilities; /* ignored in secondary session setup, except by our libs, which care about the extended security bit */
|
||||
setups[i].in.workgroup = lpcfg_workgroup(tctx->lp_ctx);
|
||||
|
||||
setups[i].in.credentials = cmdline_credentials;
|
||||
setups[i].in.credentials = popt_get_cmdline_credentials();
|
||||
setups[i].in.gensec_settings = gensec_settings;
|
||||
|
||||
sessions[i] = smbcli_session_init(cli->transport, tctx, false, options);
|
||||
@ -402,7 +402,7 @@ static bool test_tree_ulogoff(struct torture_context *tctx, struct smbcli_state
|
||||
setup.in.sesskey = cli->transport->negotiate.sesskey;
|
||||
setup.in.capabilities = cli->transport->negotiate.capabilities;
|
||||
setup.in.workgroup = lpcfg_workgroup(tctx->lp_ctx);
|
||||
setup.in.credentials = cmdline_credentials;
|
||||
setup.in.credentials = popt_get_cmdline_credentials();
|
||||
setup.in.gensec_settings = lpcfg_gensec_settings(tctx, tctx->lp_ctx);
|
||||
status = smb_composite_sesssetup(session1, &setup);
|
||||
CHECK_STATUS(status, NT_STATUS_OK);
|
||||
@ -459,7 +459,7 @@ static bool test_tree_ulogoff(struct torture_context *tctx, struct smbcli_state
|
||||
setup.in.sesskey = cli->transport->negotiate.sesskey;
|
||||
setup.in.capabilities = cli->transport->negotiate.capabilities;
|
||||
setup.in.workgroup = lpcfg_workgroup(tctx->lp_ctx);
|
||||
setup.in.credentials = cmdline_credentials;
|
||||
setup.in.credentials = popt_get_cmdline_credentials();
|
||||
setup.in.gensec_settings = lpcfg_gensec_settings(tctx, tctx->lp_ctx);
|
||||
status = smb_composite_sesssetup(session2, &setup);
|
||||
CHECK_STATUS(status, NT_STATUS_OK);
|
||||
@ -659,7 +659,7 @@ static bool test_pid_2sess(struct torture_context *tctx,
|
||||
setup.in.sesskey = cli->transport->negotiate.sesskey;
|
||||
setup.in.capabilities = cli->transport->negotiate.capabilities; /* ignored in secondary session setup, except by our libs, which care about the extended security bit */
|
||||
setup.in.workgroup = lpcfg_workgroup(tctx->lp_ctx);
|
||||
setup.in.credentials = cmdline_credentials;
|
||||
setup.in.credentials = popt_get_cmdline_credentials();
|
||||
setup.in.gensec_settings = lpcfg_gensec_settings(tctx, tctx->lp_ctx);
|
||||
|
||||
status = smb_composite_sesssetup(session, &setup);
|
||||
|
@ -816,7 +816,7 @@ static bool test_async(struct torture_context *tctx,
|
||||
setup.in.sesskey = cli->transport->negotiate.sesskey;
|
||||
setup.in.capabilities = cli->transport->negotiate.capabilities;
|
||||
setup.in.workgroup = lpcfg_workgroup(tctx->lp_ctx);
|
||||
setup.in.credentials = cmdline_credentials;
|
||||
setup.in.credentials = popt_get_cmdline_credentials();
|
||||
setup.in.gensec_settings = lpcfg_gensec_settings(tctx, tctx->lp_ctx);
|
||||
status = smb_composite_sesssetup(session, &setup);
|
||||
CHECK_STATUS(status, NT_STATUS_OK);
|
||||
|
@ -195,7 +195,7 @@ static void reopen_connection(struct tevent_context *ev, struct tevent_timer *te
|
||||
io->in.called_name = state->called_name;
|
||||
io->in.service = share;
|
||||
io->in.service_type = state->service_type;
|
||||
io->in.credentials = cmdline_credentials;
|
||||
io->in.credentials = popt_get_cmdline_credentials();
|
||||
io->in.fallback_to_anonymous = false;
|
||||
io->in.workgroup = lpcfg_workgroup(state->tctx->lp_ctx);
|
||||
lpcfg_smbcli_options(state->tctx->lp_ctx, &io->in.options);
|
||||
|
@ -137,7 +137,7 @@ static void reopen_connection(struct tevent_context *ev, struct tevent_timer *te
|
||||
io->in.called_name = state->called_name;
|
||||
io->in.service = share;
|
||||
io->in.service_type = state->service_type;
|
||||
io->in.credentials = cmdline_credentials;
|
||||
io->in.credentials = popt_get_cmdline_credentials();
|
||||
io->in.fallback_to_anonymous = false;
|
||||
io->in.workgroup = lpcfg_workgroup(state->tctx->lp_ctx);
|
||||
io->in.gensec_settings = lpcfg_gensec_settings(state->mem_ctx, state->tctx->lp_ctx);
|
||||
|
@ -186,7 +186,8 @@ static bool open_connection_no_level2_oplocks(struct torture_context *tctx,
|
||||
torture_setting_string(tctx, "host", NULL),
|
||||
lpcfg_smb_ports(tctx->lp_ctx),
|
||||
torture_setting_string(tctx, "share", NULL),
|
||||
NULL, lpcfg_socket_options(tctx->lp_ctx), cmdline_credentials,
|
||||
NULL, lpcfg_socket_options(tctx->lp_ctx),
|
||||
popt_get_cmdline_credentials(),
|
||||
lpcfg_resolve_context(tctx->lp_ctx),
|
||||
tctx->ev, &options, &session_options,
|
||||
lpcfg_gensec_settings(tctx, tctx->lp_ctx));
|
||||
|
@ -63,7 +63,7 @@ static bool test_session_reauth1(struct torture_context *tctx,
|
||||
ZERO_STRUCT(io);
|
||||
io.in.sesskey = cli->transport->negotiate.sesskey;
|
||||
io.in.capabilities = cli->transport->negotiate.capabilities;
|
||||
io.in.credentials = cmdline_credentials;
|
||||
io.in.credentials = popt_get_cmdline_credentials();
|
||||
io.in.workgroup = lpcfg_workgroup(tctx->lp_ctx);
|
||||
io.in.gensec_settings = lpcfg_gensec_settings(tctx, tctx->lp_ctx);
|
||||
status = smb_composite_sesssetup(cli->session, &io);
|
||||
@ -205,7 +205,7 @@ static bool test_session_reauth2(struct torture_context *tctx,
|
||||
ZERO_STRUCT(io_sesssetup);
|
||||
io_sesssetup.in.sesskey = cli->transport->negotiate.sesskey;
|
||||
io_sesssetup.in.capabilities = cli->transport->negotiate.capabilities;
|
||||
io_sesssetup.in.credentials = cmdline_credentials;
|
||||
io_sesssetup.in.credentials = popt_get_cmdline_credentials();
|
||||
io_sesssetup.in.workgroup = lpcfg_workgroup(tctx->lp_ctx);
|
||||
io_sesssetup.in.gensec_settings = lpcfg_gensec_settings(
|
||||
tctx, tctx->lp_ctx);
|
||||
@ -234,7 +234,7 @@ static bool test_session_expire1(struct torture_context *tctx)
|
||||
struct smbcli_session_options session_options;
|
||||
const char *host = torture_setting_string(tctx, "host", NULL);
|
||||
const char *share = torture_setting_string(tctx, "share", NULL);
|
||||
struct cli_credentials *credentials = cmdline_credentials;
|
||||
struct cli_credentials *credentials = popt_get_cmdline_credentials();
|
||||
struct smbcli_state *cli = NULL;
|
||||
enum credentials_use_kerberos use_kerberos;
|
||||
char fname[256];
|
||||
|
@ -100,7 +100,8 @@ static int fork_tcon_client(struct torture_context *tctx,
|
||||
|
||||
status = smbcli_full_connection(NULL, &cli,
|
||||
host, lpcfg_smb_ports(tctx->lp_ctx), share,
|
||||
NULL, lpcfg_socket_options(tctx->lp_ctx), cmdline_credentials,
|
||||
NULL, lpcfg_socket_options(tctx->lp_ctx),
|
||||
popt_get_cmdline_credentials(),
|
||||
lpcfg_resolve_context(tctx->lp_ctx),
|
||||
tctx->ev, &options, &session_options,
|
||||
lpcfg_gensec_settings(tctx, tctx->lp_ctx));
|
||||
|
@ -63,7 +63,7 @@ bool torture_async_bind(struct torture_context *torture)
|
||||
if (table == NULL) return false;
|
||||
|
||||
/* credentials */
|
||||
creds = cmdline_credentials;
|
||||
creds = popt_get_cmdline_credentials();
|
||||
|
||||
/* send bind requests */
|
||||
for (i = 0; i < torture_numasync; i++) {
|
||||
|
@ -79,7 +79,8 @@ static struct dom_sid *get_user_sid(struct torture_context *tctx,
|
||||
struct dcerpc_pipe *p2;
|
||||
struct dcerpc_binding_handle *b;
|
||||
|
||||
const char *domain = cli_credentials_get_domain(cmdline_credentials);
|
||||
const char *domain = cli_credentials_get_domain(
|
||||
popt_get_cmdline_credentials());
|
||||
|
||||
torture_assert_ntstatus_ok(tctx,
|
||||
torture_rpc_connection(tctx, &p2, &ndr_table_lsarpc),
|
||||
@ -644,7 +645,8 @@ static struct bkrp_BackupKey *createRestoreGUIDStruct(struct torture_context *tc
|
||||
/* we take a fake user*/
|
||||
user = "guest";
|
||||
} else {
|
||||
user = cli_credentials_get_username(cmdline_credentials);
|
||||
user = cli_credentials_get_username(
|
||||
popt_get_cmdline_credentials());
|
||||
}
|
||||
|
||||
|
||||
@ -1814,7 +1816,8 @@ static bool test_ServerWrap_encrypt_decrypt_manual(struct torture_context *tctx,
|
||||
torture_assert_ntstatus_ok(tctx,
|
||||
dcerpc_pipe_connect_b(tctx, &lsa_p,
|
||||
lsa_binding, &ndr_table_lsarpc,
|
||||
cmdline_credentials, tctx->ev, tctx->lp_ctx),
|
||||
popt_get_cmdline_credentials(),
|
||||
tctx->ev, tctx->lp_ctx),
|
||||
"Opening LSA pipe");
|
||||
lsa_b = lsa_p->binding_handle;
|
||||
|
||||
@ -1980,7 +1983,9 @@ static bool test_ServerWrap_encrypt_decrypt_manual(struct torture_context *tctx,
|
||||
"decrypted data is not correct");
|
||||
|
||||
/* Not strictly correct all the time, but good enough for this test */
|
||||
caller_sid = get_user_sid(tctx, tctx, cli_credentials_get_username(cmdline_credentials));
|
||||
caller_sid = get_user_sid(tctx, tctx,
|
||||
cli_credentials_get_username(
|
||||
popt_get_cmdline_credentials()));
|
||||
|
||||
torture_assert_sid_equal(tctx, &rc4payload.sid, caller_sid, "Secret saved with wrong SID");
|
||||
|
||||
|
@ -82,7 +82,8 @@ static struct dom_sid *get_user_sid(struct torture_context *tctx,
|
||||
struct dcerpc_pipe *p2;
|
||||
struct dcerpc_binding_handle *b;
|
||||
|
||||
const char *domain = cli_credentials_get_domain(cmdline_credentials);
|
||||
const char *domain = cli_credentials_get_domain(
|
||||
popt_get_cmdline_credentials());
|
||||
|
||||
torture_assert_ntstatus_ok(tctx,
|
||||
torture_rpc_connection(tctx, &p2, &ndr_table_lsarpc),
|
||||
@ -594,7 +595,8 @@ static struct bkrp_BackupKey *createRestoreGUIDStruct(struct torture_context *tc
|
||||
/* we take a fake user*/
|
||||
user = "guest";
|
||||
} else {
|
||||
user = cli_credentials_get_username(cmdline_credentials);
|
||||
user = cli_credentials_get_username(
|
||||
popt_get_cmdline_credentials());
|
||||
}
|
||||
|
||||
|
||||
@ -1589,7 +1591,8 @@ static bool test_ServerWrap_encrypt_decrypt_manual(struct torture_context *tctx,
|
||||
torture_assert_ntstatus_ok(tctx,
|
||||
dcerpc_pipe_connect_b(tctx, &lsa_p,
|
||||
lsa_binding, &ndr_table_lsarpc,
|
||||
cmdline_credentials, tctx->ev, tctx->lp_ctx),
|
||||
popt_get_cmdline_credentials(),
|
||||
tctx->ev, tctx->lp_ctx),
|
||||
"Opening LSA pipe");
|
||||
lsa_b = lsa_p->binding_handle;
|
||||
|
||||
@ -1726,7 +1729,9 @@ static bool test_ServerWrap_encrypt_decrypt_manual(struct torture_context *tctx,
|
||||
"decrypted data is not correct");
|
||||
|
||||
/* Not strictly correct all the time, but good enough for this test */
|
||||
caller_sid = get_user_sid(tctx, tctx, cli_credentials_get_username(cmdline_credentials));
|
||||
caller_sid = get_user_sid(tctx, tctx,
|
||||
cli_credentials_get_username(
|
||||
popt_get_cmdline_credentials()));
|
||||
|
||||
torture_assert_sid_equal(tctx, &rc4payload.sid, caller_sid, "Secret saved with wrong SID");
|
||||
|
||||
|
@ -59,7 +59,7 @@ static bool test_bind(struct torture_context *tctx,
|
||||
torture_assert_ntstatus_ok(tctx,
|
||||
dcerpc_pipe_connect_b(tctx, &p, binding,
|
||||
&ndr_table_lsarpc,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
tctx->ev,
|
||||
tctx->lp_ctx),
|
||||
"failed to connect pipe");
|
||||
|
@ -56,7 +56,7 @@ static bool test_NetShareAdd(struct torture_context *tctx,
|
||||
return false;
|
||||
}
|
||||
|
||||
libnetctx->cred = cmdline_credentials;
|
||||
libnetctx->cred = popt_get_cmdline_credentials();
|
||||
|
||||
i.name = sharename;
|
||||
i.type = STYPE_DISKTREE;
|
||||
@ -95,7 +95,7 @@ static bool test_NetShareDel(struct torture_context *tctx,
|
||||
return false;
|
||||
}
|
||||
|
||||
libnetctx->cred = cmdline_credentials;
|
||||
libnetctx->cred = popt_get_cmdline_credentials();
|
||||
|
||||
r.in.share_name = sharename;
|
||||
r.in.server_name = host;
|
||||
|
@ -134,7 +134,7 @@ static struct DsGetinfoTest *test_create_context(struct torture_context *tctx)
|
||||
}
|
||||
|
||||
/* ctx->admin ...*/
|
||||
ctx->admin.credentials = cmdline_credentials;
|
||||
ctx->admin.credentials = popt_get_cmdline_credentials();
|
||||
|
||||
our_bind_info28 = &ctx->admin.drsuapi.our_bind_info28;
|
||||
our_bind_info28->supported_extensions = 0xFFFFFFFF;
|
||||
|
@ -44,6 +44,7 @@
|
||||
#include "librpc/gen_ndr/ndr_security.h"
|
||||
#include "librpc/gen_ndr/ndr_srvsvc_c.h"
|
||||
#include "librpc/gen_ndr/ndr_fsrvp_c.h"
|
||||
#include "lib/cmdline/popt_common.h"
|
||||
|
||||
#define FSHARE "fsrvp_share"
|
||||
#define FNAME "testfss.dat"
|
||||
@ -506,7 +507,6 @@ static bool test_fsrvp_sc_share_io(struct torture_context *tctx,
|
||||
TALLOC_CTX *tmp_ctx = talloc_new(tctx);
|
||||
char *share_unc = talloc_asprintf(tmp_ctx, "\\\\%s\\%s",
|
||||
dcerpc_server_name(p), FSHARE);
|
||||
extern struct cli_credentials *cmdline_credentials;
|
||||
struct smb2_tree *tree_base;
|
||||
struct smb2_tree *tree_snap;
|
||||
struct smbcli_options options;
|
||||
@ -520,7 +520,7 @@ static bool test_fsrvp_sc_share_io(struct torture_context *tctx,
|
||||
lpcfg_smb_ports(tctx->lp_ctx),
|
||||
FSHARE,
|
||||
lpcfg_resolve_context(tctx->lp_ctx),
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
&tree_base,
|
||||
tctx->ev,
|
||||
&options,
|
||||
@ -551,7 +551,7 @@ static bool test_fsrvp_sc_share_io(struct torture_context *tctx,
|
||||
lpcfg_smb_ports(tctx->lp_ctx),
|
||||
sc_map->ShadowCopyShareName,
|
||||
lpcfg_resolve_context(tctx->lp_ctx),
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
&tree_snap,
|
||||
tctx->ev,
|
||||
&options,
|
||||
@ -633,7 +633,6 @@ static bool test_fsrvp_enum_created(struct torture_context *tctx,
|
||||
TALLOC_CTX *tmp_ctx = talloc_new(tctx);
|
||||
char *share_unc = talloc_asprintf(tmp_ctx, "\\\\%s\\%s\\",
|
||||
dcerpc_server_name(p), FSHARE);
|
||||
extern struct cli_credentials *cmdline_credentials;
|
||||
struct smb2_tree *tree_base;
|
||||
struct smbcli_options options;
|
||||
struct smb2_handle base_fh;
|
||||
@ -645,7 +644,7 @@ static bool test_fsrvp_enum_created(struct torture_context *tctx,
|
||||
lpcfg_smb_ports(tctx->lp_ctx),
|
||||
FSHARE,
|
||||
lpcfg_resolve_context(tctx->lp_ctx),
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
&tree_base,
|
||||
tctx->ev,
|
||||
&options,
|
||||
@ -915,10 +914,9 @@ static bool fsrvp_rpc_setup(struct torture_context *tctx, void **data)
|
||||
struct torture_rpc_tcase *tcase = talloc_get_type(
|
||||
tctx->active_tcase, struct torture_rpc_tcase);
|
||||
struct torture_rpc_tcase_data *tcase_data;
|
||||
extern struct cli_credentials *cmdline_credentials;
|
||||
|
||||
*data = tcase_data = talloc_zero(tctx, struct torture_rpc_tcase_data);
|
||||
tcase_data->credentials = cmdline_credentials;
|
||||
tcase_data->credentials = popt_get_cmdline_credentials();
|
||||
|
||||
status = torture_rpc_connection(tctx,
|
||||
&(tcase_data->pipe),
|
||||
|
@ -107,7 +107,8 @@ static bool test_LogonUasLogon(struct torture_context *tctx,
|
||||
struct dcerpc_binding_handle *b = p->binding_handle;
|
||||
|
||||
r.in.server_name = NULL;
|
||||
r.in.account_name = cli_credentials_get_username(cmdline_credentials);
|
||||
r.in.account_name = cli_credentials_get_username(
|
||||
popt_get_cmdline_credentials());
|
||||
r.in.workstation = TEST_MACHINE_NAME;
|
||||
r.out.info = &info;
|
||||
|
||||
@ -126,7 +127,8 @@ static bool test_LogonUasLogoff(struct torture_context *tctx,
|
||||
struct dcerpc_binding_handle *b = p->binding_handle;
|
||||
|
||||
r.in.server_name = NULL;
|
||||
r.in.account_name = cli_credentials_get_username(cmdline_credentials);
|
||||
r.in.account_name = cli_credentials_get_username(
|
||||
popt_get_cmdline_credentials());
|
||||
r.in.workstation = TEST_MACHINE_NAME;
|
||||
r.out.info = &info;
|
||||
|
||||
@ -948,7 +950,8 @@ static bool test_netlogon_ops_args(struct dcerpc_pipe *p, struct torture_context
|
||||
flags |= CLI_CRED_NTLMv2_AUTH;
|
||||
}
|
||||
|
||||
cli_credentials_get_ntlm_username_domain(cmdline_credentials, tctx,
|
||||
cli_credentials_get_ntlm_username_domain(popt_get_cmdline_credentials(),
|
||||
tctx,
|
||||
&ninfo.identity_info.account_name.string,
|
||||
&ninfo.identity_info.domain_name.string);
|
||||
|
||||
@ -964,13 +967,14 @@ static bool test_netlogon_ops_args(struct dcerpc_pipe *p, struct torture_context
|
||||
names_blob = NTLMv2_generate_names_blob(tctx, cli_credentials_get_workstation(credentials),
|
||||
cli_credentials_get_domain(credentials));
|
||||
|
||||
status = cli_credentials_get_ntlm_response(cmdline_credentials, tctx,
|
||||
&flags,
|
||||
chal,
|
||||
NULL, /* server_timestamp */
|
||||
names_blob,
|
||||
&lm_resp, &nt_resp,
|
||||
NULL, NULL);
|
||||
status = cli_credentials_get_ntlm_response(
|
||||
popt_get_cmdline_credentials(), tctx,
|
||||
&flags,
|
||||
chal,
|
||||
NULL, /* server_timestamp */
|
||||
names_blob,
|
||||
&lm_resp, &nt_resp,
|
||||
NULL, NULL);
|
||||
torture_assert_ntstatus_ok(tctx, status, "cli_credentials_get_ntlm_response failed");
|
||||
|
||||
ninfo.lm.data = lm_resp.data;
|
||||
@ -3347,7 +3351,7 @@ static bool test_netr_DsrGetDcSiteCoverageW(struct torture_context *tctx,
|
||||
url = talloc_asprintf(tctx, "ldap://%s", dcerpc_server_name(p));
|
||||
sam_ctx = ldb_wrap_connect(tctx, tctx->ev, tctx->lp_ctx, url,
|
||||
NULL,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
0);
|
||||
|
||||
torture_assert(tctx, sam_ctx, "Connection to the SAMDB on DC failed!");
|
||||
@ -3396,7 +3400,7 @@ static bool test_netr_DsRAddressToSitenamesW(struct torture_context *tctx,
|
||||
url = talloc_asprintf(tctx, "ldap://%s", dcerpc_server_name(p));
|
||||
sam_ctx = ldb_wrap_connect(tctx, tctx->ev, tctx->lp_ctx, url,
|
||||
NULL,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
0);
|
||||
|
||||
torture_assert(tctx, sam_ctx, "Connection to the SAMDB on DC failed!");
|
||||
@ -3573,7 +3577,7 @@ static bool test_netr_DsRAddressToSitenamesExW(struct torture_context *tctx,
|
||||
url = talloc_asprintf(tctx, "ldap://%s", dcerpc_server_name(p));
|
||||
sam_ctx = ldb_wrap_connect(tctx, tctx->ev, tctx->lp_ctx, url,
|
||||
NULL,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
0);
|
||||
|
||||
torture_assert(tctx, sam_ctx, "Connection to the SAMDB on DC failed!");
|
||||
@ -3852,7 +3856,7 @@ static bool test_GetDomainInfo(struct torture_context *tctx,
|
||||
url = talloc_asprintf(tctx, "ldap://%s", dcerpc_server_name(p));
|
||||
sam_ctx = ldb_wrap_connect(tctx, tctx->ev, tctx->lp_ctx, url,
|
||||
NULL,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
0);
|
||||
|
||||
torture_assert(tctx, sam_ctx, "Connection to the SAMDB on DC failed!");
|
||||
|
@ -196,7 +196,7 @@ static bool test_PACVerify(struct torture_context *tctx,
|
||||
* we will get a new clean memory cache.
|
||||
*/
|
||||
client_creds = cli_credentials_shallow_copy(tmp_ctx,
|
||||
cmdline_credentials);
|
||||
popt_get_cmdline_credentials());
|
||||
torture_assert(tctx, client_creds, "Failed to copy of credentials");
|
||||
if (!pkinit_in_use) {
|
||||
/* Invalidate the gss creds container to allocate a new MEMORY ccache */
|
||||
@ -591,7 +591,8 @@ static bool test_PACVerify_workstation_des(struct torture_context *tctx,
|
||||
struct smb_krb5_context *smb_krb5_context;
|
||||
krb5_error_code ret;
|
||||
|
||||
ret = cli_credentials_get_krb5_context(cmdline_credentials, tctx->lp_ctx, &smb_krb5_context);
|
||||
ret = cli_credentials_get_krb5_context(popt_get_cmdline_credentials(),
|
||||
tctx->lp_ctx, &smb_krb5_context);
|
||||
torture_assert_int_equal(tctx, ret, 0, "cli_credentials_get_krb5_context() failed");
|
||||
|
||||
if (smb_krb5_get_allowed_weak_crypto(smb_krb5_context->krb5_context) == FALSE) {
|
||||
@ -671,7 +672,7 @@ static bool test_S2U4Self(struct torture_context *tctx,
|
||||
* we will get a new clean memory cache.
|
||||
*/
|
||||
client_creds = cli_credentials_shallow_copy(tmp_ctx,
|
||||
cmdline_credentials);
|
||||
popt_get_cmdline_credentials());
|
||||
torture_assert(tctx, client_creds, "Failed to copy of credentials");
|
||||
|
||||
server_creds = cli_credentials_shallow_copy(tmp_ctx,
|
||||
|
@ -96,7 +96,8 @@ _PUBLIC_ NTSTATUS torture_rpc_connection_with_binding(struct torture_context *tc
|
||||
|
||||
status = dcerpc_pipe_connect_b(tctx,
|
||||
p, binding, table,
|
||||
cmdline_credentials, tctx->ev, tctx->lp_ctx);
|
||||
popt_get_cmdline_credentials(),
|
||||
tctx->ev, tctx->lp_ctx);
|
||||
|
||||
if (NT_STATUS_IS_ERR(status)) {
|
||||
torture_warning(tctx, "Failed to connect to remote server: %s %s\n",
|
||||
@ -142,7 +143,7 @@ NTSTATUS torture_rpc_connection_transport(struct torture_context *tctx,
|
||||
}
|
||||
|
||||
status = dcerpc_pipe_connect_b(tctx, p, binding, table,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
tctx->ev, tctx->lp_ctx);
|
||||
if (!NT_STATUS_IS_OK(status)) {
|
||||
*p = NULL;
|
||||
@ -166,7 +167,7 @@ static bool torture_rpc_setup_machine_workstation(struct torture_context *tctx,
|
||||
return false;
|
||||
|
||||
*data = tcase_data = talloc_zero(tctx, struct torture_rpc_tcase_data);
|
||||
tcase_data->credentials = cmdline_credentials;
|
||||
tcase_data->credentials = popt_get_cmdline_credentials();
|
||||
tcase_data->join_ctx = torture_join_domain(tctx, tcase->machine_name,
|
||||
ACB_WSTRUST,
|
||||
&tcase_data->credentials);
|
||||
@ -198,7 +199,7 @@ static bool torture_rpc_setup_machine_bdc(struct torture_context *tctx,
|
||||
return false;
|
||||
|
||||
*data = tcase_data = talloc_zero(tctx, struct torture_rpc_tcase_data);
|
||||
tcase_data->credentials = cmdline_credentials;
|
||||
tcase_data->credentials = popt_get_cmdline_credentials();
|
||||
tcase_data->join_ctx = torture_join_domain(tctx, tcase->machine_name,
|
||||
ACB_SVRTRUST,
|
||||
&tcase_data->credentials);
|
||||
@ -300,7 +301,7 @@ static bool torture_rpc_setup (struct torture_context *tctx, void **data)
|
||||
struct torture_rpc_tcase_data *tcase_data;
|
||||
|
||||
*data = tcase_data = talloc_zero(tctx, struct torture_rpc_tcase_data);
|
||||
tcase_data->credentials = cmdline_credentials;
|
||||
tcase_data->credentials = popt_get_cmdline_credentials();
|
||||
|
||||
status = torture_rpc_connection(tctx,
|
||||
&(tcase_data->pipe),
|
||||
|
@ -195,7 +195,7 @@ bool torture_bind_authcontext(struct torture_context *torture)
|
||||
lpcfg_smb_ports(torture->lp_ctx),
|
||||
"IPC$", NULL,
|
||||
lpcfg_socket_options(torture->lp_ctx),
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
lpcfg_resolve_context(torture->lp_ctx),
|
||||
torture->ev, &options, &session_options,
|
||||
lpcfg_gensec_settings(torture, torture->lp_ctx));
|
||||
@ -430,7 +430,7 @@ static bool torture_bind_samba3(struct torture_context *torture)
|
||||
lpcfg_smb_ports(torture->lp_ctx),
|
||||
"IPC$", NULL,
|
||||
lpcfg_socket_options(torture->lp_ctx),
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
lpcfg_resolve_context(torture->lp_ctx),
|
||||
torture->ev, &options, &session_options,
|
||||
lpcfg_gensec_settings(torture, torture->lp_ctx));
|
||||
@ -442,13 +442,17 @@ static bool torture_bind_samba3(struct torture_context *torture)
|
||||
|
||||
ret = true;
|
||||
|
||||
ret &= bindtest(torture, cli, cmdline_credentials, DCERPC_AUTH_TYPE_NTLMSSP,
|
||||
ret &= bindtest(torture, cli, popt_get_cmdline_credentials(),
|
||||
DCERPC_AUTH_TYPE_NTLMSSP,
|
||||
DCERPC_AUTH_LEVEL_INTEGRITY);
|
||||
ret &= bindtest(torture, cli, cmdline_credentials, DCERPC_AUTH_TYPE_NTLMSSP,
|
||||
ret &= bindtest(torture, cli, popt_get_cmdline_credentials(),
|
||||
DCERPC_AUTH_TYPE_NTLMSSP,
|
||||
DCERPC_AUTH_LEVEL_PRIVACY);
|
||||
ret &= bindtest(torture, cli, cmdline_credentials, DCERPC_AUTH_TYPE_SPNEGO,
|
||||
ret &= bindtest(torture, cli, popt_get_cmdline_credentials(),
|
||||
DCERPC_AUTH_TYPE_SPNEGO,
|
||||
DCERPC_AUTH_LEVEL_INTEGRITY);
|
||||
ret &= bindtest(torture, cli, cmdline_credentials, DCERPC_AUTH_TYPE_SPNEGO,
|
||||
ret &= bindtest(torture, cli, popt_get_cmdline_credentials(),
|
||||
DCERPC_AUTH_TYPE_SPNEGO,
|
||||
DCERPC_AUTH_LEVEL_PRIVACY);
|
||||
|
||||
done:
|
||||
@ -1381,7 +1385,7 @@ static bool torture_netlogon_samba3(struct torture_context *torture)
|
||||
lpcfg_smb_ports(torture->lp_ctx),
|
||||
"IPC$", NULL,
|
||||
lpcfg_socket_options(torture->lp_ctx),
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
lpcfg_resolve_context(torture->lp_ctx),
|
||||
torture->ev, &options, &session_options,
|
||||
lpcfg_gensec_settings(torture, torture->lp_ctx));
|
||||
@ -1405,7 +1409,8 @@ static bool torture_netlogon_samba3(struct torture_context *torture)
|
||||
"join failed");
|
||||
|
||||
cli_credentials_set_domain(
|
||||
cmdline_credentials, cli_credentials_get_domain(wks_creds),
|
||||
popt_get_cmdline_credentials(),
|
||||
cli_credentials_get_domain(wks_creds),
|
||||
CRED_SPECIFIED);
|
||||
|
||||
for (i=0; i<2; i++) {
|
||||
@ -1422,7 +1427,8 @@ static bool torture_netlogon_samba3(struct torture_context *torture)
|
||||
|
||||
for (j=0; j<2; j++) {
|
||||
torture_assert(torture,
|
||||
schan(torture, cli, wks_creds, cmdline_credentials),
|
||||
schan(torture, cli, wks_creds,
|
||||
popt_get_cmdline_credentials()),
|
||||
"schan failed");
|
||||
}
|
||||
}
|
||||
@ -1480,7 +1486,8 @@ static bool test_join3(struct torture_context *tctx,
|
||||
"join failed");
|
||||
|
||||
cli_credentials_set_domain(
|
||||
cmdline_credentials, cli_credentials_get_domain(wks_creds),
|
||||
popt_get_cmdline_credentials(),
|
||||
cli_credentials_get_domain(wks_creds),
|
||||
CRED_SPECIFIED);
|
||||
|
||||
torture_assert(tctx,
|
||||
@ -1527,7 +1534,8 @@ static bool torture_samba3_sessionkey(struct torture_context *torture)
|
||||
}
|
||||
|
||||
torture_assert(torture,
|
||||
test_join3(torture, false, cmdline_credentials, NULL, wks_name),
|
||||
test_join3(torture, false, popt_get_cmdline_credentials(),
|
||||
NULL, wks_name),
|
||||
"join using anonymous bind on an authenticated smb connection failed");
|
||||
|
||||
/*
|
||||
@ -1535,7 +1543,8 @@ static bool torture_samba3_sessionkey(struct torture_context *torture)
|
||||
*/
|
||||
|
||||
torture_assert(torture,
|
||||
test_join3(torture, true, cmdline_credentials, NULL, wks_name),
|
||||
test_join3(torture, true, popt_get_cmdline_credentials(),
|
||||
NULL, wks_name),
|
||||
"join using anonymous bind on an authenticated smb connection failed");
|
||||
|
||||
return true;
|
||||
@ -1807,7 +1816,8 @@ static bool torture_samba3_rpc_getusername(struct torture_context *torture)
|
||||
status = smbcli_full_connection(
|
||||
torture, &cli, torture_setting_string(torture, "host", NULL),
|
||||
lpcfg_smb_ports(torture->lp_ctx),
|
||||
"IPC$", NULL, lpcfg_socket_options(torture->lp_ctx), cmdline_credentials,
|
||||
"IPC$", NULL, lpcfg_socket_options(torture->lp_ctx),
|
||||
popt_get_cmdline_credentials(),
|
||||
lpcfg_resolve_context(torture->lp_ctx), torture->ev, &options,
|
||||
&session_options, lpcfg_gensec_settings(torture, torture->lp_ctx));
|
||||
torture_assert_ntstatus_ok(torture, status, "smbcli_full_connection failed\n");
|
||||
@ -2785,7 +2795,8 @@ static bool torture_samba3_rpc_spoolss(struct torture_context *torture)
|
||||
ZERO_STRUCT(userlevel1);
|
||||
userlevel1.client = talloc_asprintf(
|
||||
torture, "\\\\%s", lpcfg_netbios_name(torture->lp_ctx));
|
||||
userlevel1.user = cli_credentials_get_username(cmdline_credentials);
|
||||
userlevel1.user = cli_credentials_get_username(
|
||||
popt_get_cmdline_credentials());
|
||||
userlevel1.build = 2600;
|
||||
userlevel1.major = 3;
|
||||
userlevel1.minor = 0;
|
||||
@ -3411,7 +3422,7 @@ static bool torture_rpc_smb_reauth1(struct torture_context *torture)
|
||||
lpcfg_smb_ports(torture->lp_ctx),
|
||||
"IPC$", NULL,
|
||||
lpcfg_socket_options(torture->lp_ctx),
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
lpcfg_resolve_context(torture->lp_ctx),
|
||||
torture->ev, &options, &session_options,
|
||||
lpcfg_gensec_settings(torture, torture->lp_ctx));
|
||||
@ -3496,7 +3507,7 @@ static bool torture_rpc_smb_reauth1(struct torture_context *torture)
|
||||
ZERO_STRUCT(io);
|
||||
io.in.sesskey = cli->transport->negotiate.sesskey;
|
||||
io.in.capabilities = cli->transport->negotiate.capabilities;
|
||||
io.in.credentials = cmdline_credentials;
|
||||
io.in.credentials = popt_get_cmdline_credentials();
|
||||
io.in.workgroup = lpcfg_workgroup(torture->lp_ctx);
|
||||
io.in.gensec_settings = lpcfg_gensec_settings(torture, torture->lp_ctx);
|
||||
|
||||
@ -3570,7 +3581,7 @@ static bool torture_rpc_smb_reauth2(struct torture_context *torture)
|
||||
lpcfg_smb_ports(torture->lp_ctx),
|
||||
"IPC$", NULL,
|
||||
lpcfg_socket_options(torture->lp_ctx),
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
lpcfg_resolve_context(torture->lp_ctx),
|
||||
torture->ev, &options, &session_options,
|
||||
lpcfg_gensec_settings(torture, torture->lp_ctx));
|
||||
@ -3633,7 +3644,7 @@ static bool torture_rpc_smb_reauth2(struct torture_context *torture)
|
||||
ZERO_STRUCT(io);
|
||||
io.in.sesskey = cli->transport->negotiate.sesskey;
|
||||
io.in.capabilities = cli->transport->negotiate.capabilities;
|
||||
io.in.credentials = cmdline_credentials;
|
||||
io.in.credentials = popt_get_cmdline_credentials();
|
||||
io.in.workgroup = lpcfg_workgroup(torture->lp_ctx);
|
||||
io.in.gensec_settings = lpcfg_gensec_settings(torture, torture->lp_ctx);
|
||||
|
||||
@ -3703,7 +3714,7 @@ static bool torture_rpc_smb2_reauth1(struct torture_context *torture)
|
||||
lpcfg_smb_ports(torture->lp_ctx),
|
||||
"IPC$",
|
||||
lpcfg_resolve_context(torture->lp_ctx),
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
&tree,
|
||||
torture->ev,
|
||||
&options,
|
||||
@ -3784,7 +3795,7 @@ static bool torture_rpc_smb2_reauth1(struct torture_context *torture)
|
||||
/* smb re-auth again to the original user */
|
||||
|
||||
status = smb2_session_setup_spnego(tree->session,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
0 /* previous_session_id */);
|
||||
torture_assert_ntstatus_ok_goto(torture, status, ret, done,
|
||||
"session reauth to anon failed");
|
||||
@ -3853,7 +3864,7 @@ static bool torture_rpc_smb2_reauth2(struct torture_context *torture)
|
||||
lpcfg_smb_ports(torture->lp_ctx),
|
||||
"IPC$",
|
||||
lpcfg_resolve_context(torture->lp_ctx),
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
&tree,
|
||||
torture->ev,
|
||||
&options,
|
||||
@ -3912,7 +3923,7 @@ static bool torture_rpc_smb2_reauth2(struct torture_context *torture)
|
||||
/* smb re-auth again to the original user */
|
||||
|
||||
status = smb2_session_setup_spnego(tree->session,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
0 /* previous_session_id */);
|
||||
torture_assert_ntstatus_ok_goto(torture, status, ret, done,
|
||||
"session reauth to anon failed");
|
||||
@ -3971,7 +3982,7 @@ static bool torture_rpc_smb1_pipe_name(struct torture_context *torture)
|
||||
lpcfg_smb_ports(torture->lp_ctx),
|
||||
"IPC$", NULL,
|
||||
lpcfg_socket_options(torture->lp_ctx),
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
lpcfg_resolve_context(torture->lp_ctx),
|
||||
torture->ev, &options, &session_options,
|
||||
lpcfg_gensec_settings(torture, torture->lp_ctx));
|
||||
@ -4220,7 +4231,7 @@ static bool torture_rpc_smb2_pipe_name(struct torture_context *torture)
|
||||
lpcfg_smb_ports(torture->lp_ctx),
|
||||
"IPC$",
|
||||
lpcfg_resolve_context(torture->lp_ctx),
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
&tree,
|
||||
torture->ev,
|
||||
&options,
|
||||
@ -4314,7 +4325,7 @@ static bool torture_rpc_smb2_pipe_read_close(struct torture_context *torture)
|
||||
lpcfg_smb_ports(torture->lp_ctx),
|
||||
"IPC$",
|
||||
lpcfg_resolve_context(torture->lp_ctx),
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
&tree,
|
||||
torture->ev,
|
||||
&options,
|
||||
@ -4398,7 +4409,7 @@ static bool torture_rpc_smb2_pipe_read_tdis(struct torture_context *torture)
|
||||
lpcfg_smb_ports(torture->lp_ctx),
|
||||
"IPC$",
|
||||
lpcfg_resolve_context(torture->lp_ctx),
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
&tree,
|
||||
torture->ev,
|
||||
&options,
|
||||
@ -4482,7 +4493,7 @@ static bool torture_rpc_smb2_pipe_read_logoff(struct torture_context *torture)
|
||||
lpcfg_smb_ports(torture->lp_ctx),
|
||||
"IPC$",
|
||||
lpcfg_resolve_context(torture->lp_ctx),
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
&tree,
|
||||
torture->ev,
|
||||
&options,
|
||||
|
@ -1816,18 +1816,24 @@ bool torture_rpc_samlogon(struct torture_context *torture)
|
||||
} usercreds[] = {
|
||||
{
|
||||
.comment = "domain\\user",
|
||||
.domain = cli_credentials_get_domain(cmdline_credentials),
|
||||
.username = cli_credentials_get_username(cmdline_credentials),
|
||||
.password = cli_credentials_get_password(cmdline_credentials),
|
||||
.domain = cli_credentials_get_domain(
|
||||
popt_get_cmdline_credentials()),
|
||||
.username = cli_credentials_get_username(
|
||||
popt_get_cmdline_credentials()),
|
||||
.password = cli_credentials_get_password(
|
||||
popt_get_cmdline_credentials()),
|
||||
.network_login = true,
|
||||
.expected_interactive_error = NT_STATUS_OK,
|
||||
.expected_network_error = NT_STATUS_OK
|
||||
},
|
||||
{
|
||||
.comment = "realm\\user",
|
||||
.domain = cli_credentials_get_realm(cmdline_credentials),
|
||||
.username = cli_credentials_get_username(cmdline_credentials),
|
||||
.password = cli_credentials_get_password(cmdline_credentials),
|
||||
.domain = cli_credentials_get_realm(
|
||||
popt_get_cmdline_credentials()),
|
||||
.username = cli_credentials_get_username(
|
||||
popt_get_cmdline_credentials()),
|
||||
.password = cli_credentials_get_password(
|
||||
popt_get_cmdline_credentials()),
|
||||
.network_login = true,
|
||||
.expected_interactive_error = NT_STATUS_OK,
|
||||
.expected_network_error = NT_STATUS_OK
|
||||
@ -1836,11 +1842,14 @@ bool torture_rpc_samlogon(struct torture_context *torture)
|
||||
.comment = "user@domain",
|
||||
.domain = NULL,
|
||||
.username = talloc_asprintf(mem_ctx,
|
||||
"%s@%s",
|
||||
cli_credentials_get_username(cmdline_credentials),
|
||||
cli_credentials_get_domain(cmdline_credentials)
|
||||
"%s@%s",
|
||||
cli_credentials_get_username(
|
||||
popt_get_cmdline_credentials()),
|
||||
cli_credentials_get_domain(
|
||||
popt_get_cmdline_credentials())
|
||||
),
|
||||
.password = cli_credentials_get_password(cmdline_credentials),
|
||||
.password = cli_credentials_get_password(
|
||||
popt_get_cmdline_credentials()),
|
||||
.network_login = false, /* works for some things, but not NTLMv2. Odd */
|
||||
.expected_interactive_error = NT_STATUS_OK,
|
||||
.expected_network_error = NT_STATUS_OK
|
||||
@ -1849,11 +1858,14 @@ bool torture_rpc_samlogon(struct torture_context *torture)
|
||||
.comment = "user@realm",
|
||||
.domain = NULL,
|
||||
.username = talloc_asprintf(mem_ctx,
|
||||
"%s@%s",
|
||||
cli_credentials_get_username(cmdline_credentials),
|
||||
cli_credentials_get_realm(cmdline_credentials)
|
||||
"%s@%s",
|
||||
cli_credentials_get_username(
|
||||
popt_get_cmdline_credentials()),
|
||||
cli_credentials_get_realm(
|
||||
popt_get_cmdline_credentials())
|
||||
),
|
||||
.password = cli_credentials_get_password(cmdline_credentials),
|
||||
.password = cli_credentials_get_password(
|
||||
popt_get_cmdline_credentials()),
|
||||
.network_login = true,
|
||||
.expected_interactive_error = NT_STATUS_OK,
|
||||
.expected_network_error = NT_STATUS_OK
|
||||
|
@ -73,9 +73,10 @@ bool test_netlogon_ex_ops(struct dcerpc_pipe *p, struct torture_context *tctx,
|
||||
flags |= CLI_CRED_NTLMv2_AUTH;
|
||||
}
|
||||
|
||||
cli_credentials_get_ntlm_username_domain(cmdline_credentials, tctx,
|
||||
&ninfo.identity_info.account_name.string,
|
||||
&ninfo.identity_info.domain_name.string);
|
||||
cli_credentials_get_ntlm_username_domain(popt_get_cmdline_credentials(),
|
||||
tctx,
|
||||
&ninfo.identity_info.account_name.string,
|
||||
&ninfo.identity_info.domain_name.string);
|
||||
|
||||
generate_random_buffer(ninfo.challenge,
|
||||
sizeof(ninfo.challenge));
|
||||
@ -85,13 +86,15 @@ bool test_netlogon_ex_ops(struct dcerpc_pipe *p, struct torture_context *tctx,
|
||||
names_blob = NTLMv2_generate_names_blob(tctx, cli_credentials_get_workstation(credentials),
|
||||
cli_credentials_get_domain(credentials));
|
||||
|
||||
status = cli_credentials_get_ntlm_response(cmdline_credentials, tctx,
|
||||
&flags,
|
||||
chal,
|
||||
NULL, /* server_timestamp */
|
||||
names_blob,
|
||||
&lm_resp, &nt_resp,
|
||||
NULL, NULL);
|
||||
status = cli_credentials_get_ntlm_response(
|
||||
popt_get_cmdline_credentials(),
|
||||
tctx,
|
||||
&flags,
|
||||
chal,
|
||||
NULL, /* server_timestamp */
|
||||
names_blob,
|
||||
&lm_resp, &nt_resp,
|
||||
NULL, NULL);
|
||||
torture_assert_ntstatus_ok(tctx, status,
|
||||
"cli_credentials_get_ntlm_response failed");
|
||||
|
||||
@ -942,12 +945,14 @@ bool torture_rpc_schannel_bench1(struct torture_context *torture)
|
||||
s->nprocs = torture_setting_int(torture, "nprocs", 4);
|
||||
s->conns = talloc_zero_array(s, struct torture_schannel_bench_conn, s->nprocs);
|
||||
|
||||
s->user1_creds = cli_credentials_shallow_copy(s, cmdline_credentials);
|
||||
s->user1_creds = cli_credentials_shallow_copy(s,
|
||||
popt_get_cmdline_credentials());
|
||||
tmp = torture_setting_string(s->tctx, "extra_user1", NULL);
|
||||
if (tmp) {
|
||||
cli_credentials_parse_string(s->user1_creds, tmp, CRED_SPECIFIED);
|
||||
}
|
||||
s->user2_creds = cli_credentials_shallow_copy(s, cmdline_credentials);
|
||||
s->user2_creds = cli_credentials_shallow_copy(s,
|
||||
popt_get_cmdline_credentials());
|
||||
tmp = torture_setting_string(s->tctx, "extra_user2", NULL);
|
||||
if (tmp) {
|
||||
cli_credentials_parse_string(s->user1_creds, tmp, CRED_SPECIFIED);
|
||||
|
@ -162,7 +162,7 @@ static bool test_secrets(struct torture_context *torture, const void *_data)
|
||||
|
||||
status = dcerpc_pipe_connect_b(torture, &p, binding,
|
||||
&ndr_table_lsarpc,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
torture->ev,
|
||||
torture->lp_ctx);
|
||||
|
||||
|
@ -8717,7 +8717,7 @@ static bool test_print_test_smbd(struct torture_context *tctx,
|
||||
|
||||
struct smb2_tree *tree;
|
||||
struct smb2_handle job_h;
|
||||
struct cli_credentials *credentials = cmdline_credentials;
|
||||
struct cli_credentials *credentials = popt_get_cmdline_credentials();
|
||||
struct smbcli_options options;
|
||||
TALLOC_CTX *mem_ctx = talloc_new(tctx);
|
||||
/*
|
||||
@ -10546,7 +10546,7 @@ static bool connect_printer_driver_share(struct torture_context *tctx,
|
||||
lpcfg_smb_ports(tctx->lp_ctx),
|
||||
share_name, NULL,
|
||||
lpcfg_socket_options(tctx->lp_ctx),
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
lpcfg_resolve_context(tctx->lp_ctx),
|
||||
tctx->ev,
|
||||
&smb_options,
|
||||
|
@ -160,7 +160,8 @@ struct test_join *torture_create_testuser_max_pwlen(struct torture_context *tctx
|
||||
&join->p,
|
||||
dc_binding,
|
||||
&ndr_table_samr,
|
||||
cmdline_credentials, NULL, tctx->lp_ctx);
|
||||
popt_get_cmdline_credentials(),
|
||||
NULL, tctx->lp_ctx);
|
||||
|
||||
} else {
|
||||
status = torture_rpc_connection(tctx,
|
||||
@ -549,7 +550,7 @@ _PUBLIC_ struct test_join *torture_join_domain(struct torture_context *tctx,
|
||||
|
||||
tj->libnet_r = libnet_r;
|
||||
|
||||
libnet_ctx->cred = cmdline_credentials;
|
||||
libnet_ctx->cred = popt_get_cmdline_credentials();
|
||||
libnet_r->in.binding = dcerpc_binding_string(libnet_r, binding);
|
||||
if (libnet_r->in.binding == NULL) {
|
||||
talloc_free(tj);
|
||||
@ -697,7 +698,7 @@ static NTSTATUS torture_leave_ads_domain(struct torture_context *torture,
|
||||
return NT_STATUS_NO_MEMORY;
|
||||
}
|
||||
|
||||
ldb_set_opaque(ldb_ctx, "credentials", cmdline_credentials);
|
||||
ldb_set_opaque(ldb_ctx, "credentials", popt_get_cmdline_credentials());
|
||||
ldb_set_opaque(ldb_ctx, "loadparm", cmdline_lp_ctx);
|
||||
|
||||
rtn = ldb_connect(ldb_ctx, remote_ldb_url, 0, NULL);
|
||||
|
@ -538,7 +538,7 @@ static bool setup_clusapi_connection(struct torture_context *tctx,
|
||||
torture_assert_ntstatus_ok(tctx,
|
||||
dcerpc_pipe_connect_b(tctx, &s->clusapi.p, binding,
|
||||
&ndr_table_clusapi,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
tctx->ev, tctx->lp_ctx),
|
||||
"failed to connect dcerpc pipe");
|
||||
|
||||
|
@ -218,7 +218,7 @@ static bool test_NetrWkstaUserGetInfo(struct torture_context *tctx,
|
||||
struct wkssvc_NetrWkstaUserGetInfo r;
|
||||
union wkssvc_NetrWkstaUserInfo info;
|
||||
const char *dom = lpcfg_workgroup(tctx->lp_ctx);
|
||||
struct cli_credentials *creds = cmdline_credentials;
|
||||
struct cli_credentials *creds = popt_get_cmdline_credentials();
|
||||
const char *user = cli_credentials_get_username(creds);
|
||||
int i;
|
||||
struct dcerpc_binding_handle *b = p->binding_handle;
|
||||
@ -1124,7 +1124,7 @@ static bool test_NetrUnjoinDomain(struct torture_context *tctx,
|
||||
{
|
||||
NTSTATUS status;
|
||||
struct wkssvc_NetrUnjoinDomain r;
|
||||
struct cli_credentials *creds = cmdline_credentials;
|
||||
struct cli_credentials *creds = popt_get_cmdline_credentials();
|
||||
const char *user = cli_credentials_get_username(creds);
|
||||
const char *admin_account = NULL;
|
||||
struct dcerpc_binding_handle *b = p->binding_handle;
|
||||
@ -1153,7 +1153,7 @@ static bool test_NetrJoinDomain(struct torture_context *tctx,
|
||||
{
|
||||
NTSTATUS status;
|
||||
struct wkssvc_NetrJoinDomain r;
|
||||
struct cli_credentials *creds = cmdline_credentials;
|
||||
struct cli_credentials *creds = popt_get_cmdline_credentials();
|
||||
const char *user = cli_credentials_get_username(creds);
|
||||
const char *admin_account = NULL;
|
||||
struct dcerpc_binding_handle *b = p->binding_handle;
|
||||
|
@ -110,7 +110,8 @@ void torture_shell(struct torture_context *tctx)
|
||||
* stops the credentials system prompting when we use the "auth"
|
||||
* command to display the current auth parameters.
|
||||
*/
|
||||
cli_credentials_set_password(cmdline_credentials, "", CRED_GUESS_ENV);
|
||||
cli_credentials_set_password(popt_get_cmdline_credentials(),
|
||||
"", CRED_GUESS_ENV);
|
||||
|
||||
while (1) {
|
||||
cline = smb_readline("torture> ", NULL, NULL);
|
||||
@ -226,11 +227,14 @@ static void shell_auth(const struct shell_command * command,
|
||||
const char * password;
|
||||
const char * principal;
|
||||
|
||||
username = cli_credentials_get_username(cmdline_credentials);
|
||||
principal = cli_credentials_get_principal(cmdline_credentials, tctx);
|
||||
domain = cli_credentials_get_domain(cmdline_credentials);
|
||||
realm = cli_credentials_get_realm(cmdline_credentials);
|
||||
password = cli_credentials_get_password(cmdline_credentials);
|
||||
username = cli_credentials_get_username(
|
||||
popt_get_cmdline_credentials());
|
||||
principal = cli_credentials_get_principal(
|
||||
popt_get_cmdline_credentials(), tctx);
|
||||
domain = cli_credentials_get_domain(popt_get_cmdline_credentials());
|
||||
realm = cli_credentials_get_realm(popt_get_cmdline_credentials());
|
||||
password = cli_credentials_get_password(
|
||||
popt_get_cmdline_credentials());
|
||||
|
||||
printf("Username: %s\n", username ? username : "");
|
||||
printf("User Principal: %s\n", principal ? principal : "");
|
||||
@ -242,19 +246,24 @@ static void shell_auth(const struct shell_command * command,
|
||||
|
||||
if (!strcmp(argv[0], "username")) {
|
||||
result = cli_credentials_set_username(
|
||||
cmdline_credentials, argv[1], CRED_SPECIFIED);
|
||||
popt_get_cmdline_credentials(),
|
||||
argv[1], CRED_SPECIFIED);
|
||||
} else if (!strcmp(argv[0], "principal")) {
|
||||
result = cli_credentials_set_principal(
|
||||
cmdline_credentials, argv[1], CRED_SPECIFIED);
|
||||
popt_get_cmdline_credentials(),
|
||||
argv[1], CRED_SPECIFIED);
|
||||
} else if (!strcmp(argv[0], "domain")) {
|
||||
result = cli_credentials_set_domain(
|
||||
cmdline_credentials, argv[1], CRED_SPECIFIED);
|
||||
popt_get_cmdline_credentials(),
|
||||
argv[1], CRED_SPECIFIED);
|
||||
} else if (!strcmp(argv[0], "realm")) {
|
||||
result = cli_credentials_set_realm(
|
||||
cmdline_credentials, argv[1], CRED_SPECIFIED);
|
||||
popt_get_cmdline_credentials(),
|
||||
argv[1], CRED_SPECIFIED);
|
||||
} else if (!strcmp(argv[0], "password")) {
|
||||
result = cli_credentials_set_password(
|
||||
cmdline_credentials, argv[1], CRED_SPECIFIED);
|
||||
popt_get_cmdline_credentials(),
|
||||
argv[1], CRED_SPECIFIED);
|
||||
} else {
|
||||
shell_usage(command);
|
||||
return;
|
||||
|
@ -1872,7 +1872,7 @@ static bool torture_smb2_con_share(struct torture_context *tctx,
|
||||
struct smbcli_options options;
|
||||
NTSTATUS status;
|
||||
const char *host = torture_setting_string(tctx, "host", NULL);
|
||||
struct cli_credentials *credentials = cmdline_credentials;
|
||||
struct cli_credentials *credentials = popt_get_cmdline_credentials();
|
||||
|
||||
lpcfg_smbcli_options(tctx->lp_ctx, &options);
|
||||
|
||||
|
@ -281,7 +281,7 @@ static bool open_smb2_connection_no_level2_oplocks(struct torture_context *tctx,
|
||||
NTSTATUS status;
|
||||
const char *host = torture_setting_string(tctx, "host", NULL);
|
||||
const char *share = torture_setting_string(tctx, "share", NULL);
|
||||
struct cli_credentials *credentials = cmdline_credentials;
|
||||
struct cli_credentials *credentials = popt_get_cmdline_credentials();
|
||||
struct smbcli_options options;
|
||||
|
||||
lpcfg_smbcli_options(tctx->lp_ctx, &options);
|
||||
|
@ -1764,7 +1764,7 @@ static bool test_replay3(struct torture_context *tctx, struct smb2_tree *tree1)
|
||||
{
|
||||
const char *host = torture_setting_string(tctx, "host", NULL);
|
||||
const char *share = torture_setting_string(tctx, "share", NULL);
|
||||
struct cli_credentials *credentials = cmdline_credentials;
|
||||
struct cli_credentials *credentials = popt_get_cmdline_credentials();
|
||||
NTSTATUS status;
|
||||
TALLOC_CTX *mem_ctx = talloc_new(tctx);
|
||||
struct smb2_handle _h;
|
||||
@ -1868,7 +1868,7 @@ static bool test_replay3(struct torture_context *tctx, struct smb2_tree *tree1)
|
||||
torture_assert(tctx, session1_2 != NULL, "smb2_session_channel failed");
|
||||
|
||||
status = smb2_session_setup_spnego(session1_2,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
0 /* previous_session_id */);
|
||||
CHECK_STATUS(status, NT_STATUS_OK);
|
||||
|
||||
@ -1923,7 +1923,7 @@ static bool test_replay4(struct torture_context *tctx, struct smb2_tree *tree1)
|
||||
{
|
||||
const char *host = torture_setting_string(tctx, "host", NULL);
|
||||
const char *share = torture_setting_string(tctx, "share", NULL);
|
||||
struct cli_credentials *credentials = cmdline_credentials;
|
||||
struct cli_credentials *credentials = popt_get_cmdline_credentials();
|
||||
NTSTATUS status;
|
||||
TALLOC_CTX *mem_ctx = talloc_new(tctx);
|
||||
struct smb2_handle _h1;
|
||||
@ -2092,7 +2092,7 @@ static bool test_replay4(struct torture_context *tctx, struct smb2_tree *tree1)
|
||||
torture_assert(tctx, session1_2 != NULL, "smb2_session_channel failed");
|
||||
|
||||
status = smb2_session_setup_spnego(session1_2,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
0 /* previous_session_id */);
|
||||
CHECK_STATUS(status, NT_STATUS_OK);
|
||||
|
||||
|
@ -204,7 +204,7 @@ static bool torture_smb2_scan(struct torture_context *tctx)
|
||||
struct smb2_tree *tree;
|
||||
const char *host = torture_setting_string(tctx, "host", NULL);
|
||||
const char *share = torture_setting_string(tctx, "share", NULL);
|
||||
struct cli_credentials *credentials = cmdline_credentials;
|
||||
struct cli_credentials *credentials = popt_get_cmdline_credentials();
|
||||
NTSTATUS status;
|
||||
int opcode;
|
||||
struct smb2_request *req;
|
||||
|
@ -243,7 +243,7 @@ bool test_session_reauth1(struct torture_context *tctx, struct smb2_tree *tree)
|
||||
"oplock_level incorrect");
|
||||
|
||||
status = smb2_session_setup_spnego(tree->session,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
0 /* previous_session_id */);
|
||||
torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
|
||||
"smb2_session_setup_spnego failed");
|
||||
@ -258,7 +258,7 @@ bool test_session_reauth1(struct torture_context *tctx, struct smb2_tree *tree)
|
||||
"smb2_getinfo_file failed");
|
||||
|
||||
status = smb2_session_setup_spnego(tree->session,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
0 /* previous_session_id */);
|
||||
torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
|
||||
"smb2_session_setup_spnego failed");
|
||||
@ -341,7 +341,7 @@ bool test_session_reauth2(struct torture_context *tctx, struct smb2_tree *tree)
|
||||
/* re-authenticate as original user again */
|
||||
|
||||
status = smb2_session_setup_spnego(tree->session,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
0 /* previous_session_id */);
|
||||
torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
|
||||
"smb2_session_setup_spnego failed");
|
||||
@ -447,7 +447,7 @@ bool test_session_reauth3(struct torture_context *tctx, struct smb2_tree *tree)
|
||||
/* re-authenticate as original user again */
|
||||
|
||||
status = smb2_session_setup_spnego(tree->session,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
0 /* previous_session_id */);
|
||||
torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
|
||||
"smb2_session_setup_spnego failed");
|
||||
@ -574,7 +574,7 @@ bool test_session_reauth4(struct torture_context *tctx, struct smb2_tree *tree)
|
||||
/* re-authenticate as original user again */
|
||||
|
||||
status = smb2_session_setup_spnego(tree->session,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
0 /* previous_session_id */);
|
||||
torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
|
||||
"smb2_session_setup_spnego failed");
|
||||
@ -714,7 +714,7 @@ bool test_session_reauth5(struct torture_context *tctx, struct smb2_tree *tree)
|
||||
/* re-authenticate as original user again */
|
||||
|
||||
status = smb2_session_setup_spnego(tree->session,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
0 /* previous_session_id */);
|
||||
torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
|
||||
"smb2_session_setup_spnego failed");
|
||||
@ -847,7 +847,7 @@ bool test_session_reauth5(struct torture_context *tctx, struct smb2_tree *tree)
|
||||
/* re-authenticate as original user - again */
|
||||
|
||||
status = smb2_session_setup_spnego(tree->session,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
0 /* previous_session_id */);
|
||||
torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
|
||||
"smb2_session_setup_spnego failed");
|
||||
@ -955,7 +955,8 @@ bool test_session_reauth6(struct torture_context *tctx, struct smb2_tree *tree)
|
||||
NTSTATUS expected;
|
||||
enum credentials_use_kerberos krb_state;
|
||||
|
||||
krb_state = cli_credentials_get_kerberos_state(cmdline_credentials);
|
||||
krb_state = cli_credentials_get_kerberos_state(
|
||||
popt_get_cmdline_credentials());
|
||||
if (krb_state == CRED_MUST_USE_KERBEROS) {
|
||||
torture_skip(tctx,
|
||||
"Can't test failing session setup with kerberos.");
|
||||
@ -989,7 +990,7 @@ bool test_session_reauth6(struct torture_context *tctx, struct smb2_tree *tree)
|
||||
*/
|
||||
|
||||
broken_creds = cli_credentials_shallow_copy(mem_ctx,
|
||||
cmdline_credentials);
|
||||
popt_get_cmdline_credentials());
|
||||
torture_assert(tctx, (broken_creds != NULL), "talloc error");
|
||||
|
||||
corrupted_password = talloc_asprintf(mem_ctx, "%s%s",
|
||||
@ -1051,7 +1052,7 @@ static bool test_session_expire1(struct torture_context *tctx)
|
||||
struct smbcli_options options;
|
||||
const char *host = torture_setting_string(tctx, "host", NULL);
|
||||
const char *share = torture_setting_string(tctx, "share", NULL);
|
||||
struct cli_credentials *credentials = cmdline_credentials;
|
||||
struct cli_credentials *credentials = popt_get_cmdline_credentials();
|
||||
struct smb2_tree *tree = NULL;
|
||||
enum credentials_use_kerberos use_kerberos;
|
||||
char fname[256];
|
||||
@ -1170,7 +1171,7 @@ bool test_session_bind1(struct torture_context *tctx, struct smb2_tree *tree1)
|
||||
{
|
||||
const char *host = torture_setting_string(tctx, "host", NULL);
|
||||
const char *share = torture_setting_string(tctx, "share", NULL);
|
||||
struct cli_credentials *credentials = cmdline_credentials;
|
||||
struct cli_credentials *credentials = popt_get_cmdline_credentials();
|
||||
NTSTATUS status;
|
||||
TALLOC_CTX *mem_ctx = talloc_new(tctx);
|
||||
char fname[256];
|
||||
@ -1240,7 +1241,7 @@ bool test_session_bind1(struct torture_context *tctx, struct smb2_tree *tree1)
|
||||
torture_assert(tctx, session1_2 != NULL, "smb2_session_channel failed");
|
||||
|
||||
status = smb2_session_setup_spnego(session1_2,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
0 /* previous_session_id */);
|
||||
torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
|
||||
"smb2_session_setup_spnego failed");
|
||||
@ -1279,7 +1280,7 @@ bool test_session_bind1(struct torture_context *tctx, struct smb2_tree *tree1)
|
||||
torture_assert(tctx, session2_1 != NULL, "smb2_session_channel failed");
|
||||
|
||||
status = smb2_session_setup_spnego(session2_1,
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
0 /* previous_session_id */);
|
||||
torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
|
||||
"smb2_session_setup_spnego failed");
|
||||
|
@ -351,7 +351,7 @@ bool torture_smb2_session_setup(struct torture_context *tctx,
|
||||
{
|
||||
NTSTATUS status;
|
||||
struct smb2_session *session;
|
||||
struct cli_credentials *credentials = cmdline_credentials;
|
||||
struct cli_credentials *credentials = popt_get_cmdline_credentials();
|
||||
|
||||
session = smb2_session_init(transport,
|
||||
lpcfg_gensec_settings(tctx, tctx->lp_ctx),
|
||||
@ -385,7 +385,7 @@ bool torture_smb2_connection_ext(struct torture_context *tctx,
|
||||
NTSTATUS status;
|
||||
const char *host = torture_setting_string(tctx, "host", NULL);
|
||||
const char *share = torture_setting_string(tctx, "share", NULL);
|
||||
struct cli_credentials *credentials = cmdline_credentials;
|
||||
struct cli_credentials *credentials = popt_get_cmdline_credentials();
|
||||
|
||||
status = smb2_connect_ext(tctx,
|
||||
host,
|
||||
@ -431,7 +431,7 @@ bool torture_smb2_con_sopt(struct torture_context *tctx,
|
||||
NTSTATUS status;
|
||||
const char *host = torture_setting_string(tctx, "host", NULL);
|
||||
const char *share = torture_setting_string(tctx, soption, NULL);
|
||||
struct cli_credentials *credentials = cmdline_credentials;
|
||||
struct cli_credentials *credentials = popt_get_cmdline_credentials();
|
||||
|
||||
lpcfg_smbcli_options(tctx->lp_ctx, &options);
|
||||
|
||||
|
@ -60,7 +60,7 @@ static struct smbcli_state *connect_to_server(struct torture_context *tctx)
|
||||
status = smbcli_full_connection(tctx, &cli, host,
|
||||
lpcfg_smb_ports(tctx->lp_ctx),
|
||||
share, NULL, lpcfg_socket_options(tctx->lp_ctx),
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
lpcfg_resolve_context(tctx->lp_ctx),
|
||||
tctx->ev, &options, &session_options,
|
||||
lpcfg_gensec_settings(tctx, tctx->lp_ctx));
|
||||
|
@ -360,7 +360,7 @@ bool torture_unix_whoami(struct torture_context *torture)
|
||||
struct ldb_context *ldb;
|
||||
const char *addc, *host;
|
||||
|
||||
cli = connect_to_server(torture, cmdline_credentials);
|
||||
cli = connect_to_server(torture, popt_get_cmdline_credentials());
|
||||
torture_assert(torture, cli, "connecting to server with authenticated credentials");
|
||||
|
||||
/* Test basic authenticated mapping. */
|
||||
@ -375,7 +375,9 @@ bool torture_unix_whoami(struct torture_context *torture)
|
||||
bool guest = whoami.mapping_flags & SMB_WHOAMI_GUEST;
|
||||
torture_comment(torture, "checking whether we were logged in as guest... %s\n",
|
||||
guest ? "YES" : "NO");
|
||||
torture_assert(torture, cli_credentials_is_anonymous(cmdline_credentials) == guest,
|
||||
torture_assert(torture,
|
||||
cli_credentials_is_anonymous(
|
||||
popt_get_cmdline_credentials()) == guest,
|
||||
"login did not credentials map to guest");
|
||||
} else {
|
||||
torture_comment(torture, "server does not support SMB_WHOAMI_GUEST flag\n");
|
||||
@ -386,7 +388,7 @@ bool torture_unix_whoami(struct torture_context *torture)
|
||||
|
||||
if (addc) {
|
||||
ldb = ldb_wrap_connect(torture, torture->ev, torture->lp_ctx, talloc_asprintf(torture, "ldap://%s", addc),
|
||||
NULL, cmdline_credentials, 0);
|
||||
NULL, popt_get_cmdline_credentials(), 0);
|
||||
torture_assert(torture, ldb, "ldb connect failed");
|
||||
|
||||
/* We skip this testing if we could not contact the LDAP server */
|
||||
|
@ -456,7 +456,7 @@ _PUBLIC_ bool torture_open_connection_share(TALLOC_CTX *mem_ctx,
|
||||
lpcfg_smb_ports(tctx->lp_ctx),
|
||||
sharename, NULL,
|
||||
lpcfg_socket_options(tctx->lp_ctx),
|
||||
cmdline_credentials,
|
||||
popt_get_cmdline_credentials(),
|
||||
lpcfg_resolve_context(tctx->lp_ctx),
|
||||
ev, &options, &session_options,
|
||||
lpcfg_gensec_settings(tctx, tctx->lp_ctx));
|
||||
|
@ -57,7 +57,7 @@ static bool torture_smb2_con_share(struct torture_context *tctx,
|
||||
struct smbcli_options options;
|
||||
NTSTATUS status;
|
||||
const char *host = torture_setting_string(tctx, "host", NULL);
|
||||
struct cli_credentials *credentials = cmdline_credentials;
|
||||
struct cli_credentials *credentials = popt_get_cmdline_credentials();
|
||||
|
||||
lpcfg_smbcli_options(tctx->lp_ctx, &options);
|
||||
|
||||
|
@ -214,7 +214,8 @@ static bool torture_winbind_pac(struct torture_context *tctx,
|
||||
status = gensec_set_target_hostname(gensec_client_context, cli_credentials_get_workstation(machine_credentials));
|
||||
torture_assert_ntstatus_ok(tctx, status, "gensec_set_target_hostname (client) failed");
|
||||
|
||||
status = gensec_set_credentials(gensec_client_context, cmdline_credentials);
|
||||
status = gensec_set_credentials(gensec_client_context,
|
||||
popt_get_cmdline_credentials());
|
||||
torture_assert_ntstatus_ok(tctx, status, "gensec_set_credentials (client) failed");
|
||||
|
||||
if (sasl_mech) {
|
||||
|
Loading…
Reference in New Issue
Block a user