svn commit: samba r10805 - in
branches/SAMBA_4_0/source/torture/rpc: .
abartlet at samba.org
abartlet at samba.org
Fri Oct 7 08:51:36 GMT 2005
Author: abartlet
Date: 2005-10-07 08:51:35 +0000 (Fri, 07 Oct 2005)
New Revision: 10805
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10805
Log:
Move RPC-SAMLOGON to C99 initialisation
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/torture/rpc/samlogon.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/rpc/samlogon.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/samlogon.c 2005-10-07 08:12:05 UTC (rev 10804)
+++ branches/SAMBA_4_0/source/torture/rpc/samlogon.c 2005-10-07 08:51:35 UTC (rev 10805)
@@ -1529,135 +1529,135 @@
NTSTATUS expected_network_error;
} usercreds[] = {
{
- "domain\\user",
- cli_credentials_get_domain(cmdline_credentials),
- cli_credentials_get_username(cmdline_credentials),
- cli_credentials_get_password(cmdline_credentials),
- True,
- NT_STATUS_OK,
- NT_STATUS_OK
+ .comment = "domain\\user",
+ .domain = cli_credentials_get_domain(cmdline_credentials),
+ .username = cli_credentials_get_username(cmdline_credentials),
+ .password = cli_credentials_get_password(cmdline_credentials),
+ .network_login = True,
+ .expected_interactive_error = NT_STATUS_OK,
+ .expected_network_error = NT_STATUS_OK
},
{
- "realm\\user",
- cli_credentials_get_realm(cmdline_credentials),
- cli_credentials_get_username(cmdline_credentials),
- cli_credentials_get_password(cmdline_credentials),
- True,
- NT_STATUS_OK,
- 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),
+ .network_login = True,
+ .expected_interactive_error = NT_STATUS_OK,
+ .expected_network_error = NT_STATUS_OK
},
{
- "user at domain",
- NULL,
- talloc_asprintf(mem_ctx,
+ .comment = "user at domain",
+ .domain = NULL,
+ .username = talloc_asprintf(mem_ctx,
"%s@%s",
cli_credentials_get_username(cmdline_credentials),
cli_credentials_get_domain(cmdline_credentials)
),
- cli_credentials_get_password(cmdline_credentials),
- False,
- NT_STATUS_OK,
- NT_STATUS_OK
+ .password = cli_credentials_get_password(cmdline_credentials),
+ .network_login = False,
+ .expected_interactive_error = NT_STATUS_OK,
+ .expected_network_error = NT_STATUS_OK
},
{
- "user at realm",
- NULL,
- talloc_asprintf(mem_ctx,
+ .comment = "user at realm",
+ .domain = NULL,
+ .username = talloc_asprintf(mem_ctx,
"%s@%s",
cli_credentials_get_username(cmdline_credentials),
cli_credentials_get_realm(cmdline_credentials)
),
- cli_credentials_get_password(cmdline_credentials),
- True,
- NT_STATUS_OK,
- NT_STATUS_OK
+ .password = cli_credentials_get_password(cmdline_credentials),
+ .network_login = True,
+ .expected_interactive_error = NT_STATUS_OK,
+ .expected_network_error = NT_STATUS_OK
},
{
- "machine domain\\user",
- cli_credentials_get_domain(machine_credentials),
- cli_credentials_get_username(machine_credentials),
- cli_credentials_get_password(machine_credentials),
- True,
- NT_STATUS_NO_SUCH_USER,
- NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT
+ .comment = "machine domain\\user",
+ .domain = cli_credentials_get_domain(machine_credentials),
+ .username = cli_credentials_get_username(machine_credentials),
+ .password = cli_credentials_get_password(machine_credentials),
+ .network_login = True,
+ .expected_interactive_error = NT_STATUS_NO_SUCH_USER,
+ .expected_network_error = NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT
},
{
- "machine realm\\user",
- cli_credentials_get_realm(machine_credentials),
- cli_credentials_get_username(machine_credentials),
- cli_credentials_get_password(machine_credentials),
- True,
- NT_STATUS_NO_SUCH_USER,
- NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT
+ .comment = "machine realm\\user",
+ .domain = cli_credentials_get_realm(machine_credentials),
+ .username = cli_credentials_get_username(machine_credentials),
+ .password = cli_credentials_get_password(machine_credentials),
+ .network_login = True,
+ .expected_interactive_error = NT_STATUS_NO_SUCH_USER,
+ .expected_network_error = NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT
},
{
- "machine user at domain",
- NULL,
- talloc_asprintf(mem_ctx,
- "%s@%s",
- cli_credentials_get_username(machine_credentials),
- cli_credentials_get_domain(machine_credentials)
- ),
- cli_credentials_get_password(machine_credentials),
- False,
- NT_STATUS_NO_SUCH_USER,
- NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT
+ .comment = "machine user at domain",
+ .domain = NULL,
+ .username = talloc_asprintf(mem_ctx,
+ "%s@%s",
+ cli_credentials_get_username(machine_credentials),
+ cli_credentials_get_domain(machine_credentials)
+ ),
+ .password = cli_credentials_get_password(machine_credentials),
+ .network_login = False,
+ .expected_interactive_error = NT_STATUS_NO_SUCH_USER,
+ .expected_network_error = NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT
},
{
- "machine user at realm",
- NULL,
- talloc_asprintf(mem_ctx,
- "%s@%s",
- cli_credentials_get_username(machine_credentials),
- cli_credentials_get_realm(machine_credentials)
+ .comment = "machine user at realm",
+ .domain = NULL,
+ .username = talloc_asprintf(mem_ctx,
+ "%s@%s",
+ cli_credentials_get_username(machine_credentials),
+ cli_credentials_get_realm(machine_credentials)
),
- cli_credentials_get_password(machine_credentials),
- True,
- NT_STATUS_NO_SUCH_USER,
- NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT
+ .password = cli_credentials_get_password(machine_credentials),
+ .network_login = True,
+ .expected_interactive_error = NT_STATUS_NO_SUCH_USER,
+ .expected_network_error = NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT
},
{
- "test user (long pw): domain\\user",
- userdomain,
- TEST_USER_NAME,
- user_password,
- True,
- NT_STATUS_OK,
- NT_STATUS_OK
+ .comment = "test user (long pw): domain\\user",
+ .domain = userdomain,
+ .username = TEST_USER_NAME,
+ .password = user_password,
+ .network_login = True,
+ .expected_interactive_error = NT_STATUS_OK,
+ .expected_network_error = NT_STATUS_OK
},
{
- "test user (long pw): user at realm",
- NULL,
- talloc_asprintf(mem_ctx,
- "%s@%s",
- TEST_USER_NAME,
- lp_realm()),
- user_password,
- True,
- NT_STATUS_OK,
- NT_STATUS_OK
+ .comment = "test user (long pw): user at realm",
+ .domain = NULL,
+ .username = talloc_asprintf(mem_ctx,
+ "%s@%s",
+ TEST_USER_NAME,
+ lp_realm()),
+ .password = user_password,
+ .network_login = True,
+ .expected_interactive_error = NT_STATUS_OK,
+ .expected_network_error = NT_STATUS_OK
},
{
- "test user (long pw): user at domain",
- NULL,
- talloc_asprintf(mem_ctx,
- "%s@%s",
- TEST_USER_NAME,
- userdomain),
- user_password,
- False,
- NT_STATUS_OK,
- NT_STATUS_OK
+ .comment = "test user (long pw): user at domain",
+ .domain = NULL,
+ .username = talloc_asprintf(mem_ctx,
+ "%s@%s",
+ TEST_USER_NAME,
+ userdomain),
+ .password = user_password,
+ .network_login = False,
+ .expected_interactive_error = NT_STATUS_OK,
+ .expected_network_error = NT_STATUS_OK
},
/* Oddball, can we use the old password ? */
{
- "test user: user\\domain OLD PASSWORD",
- userdomain,
- TEST_USER_NAME,
- old_user_password,
- True,
- NT_STATUS_WRONG_PASSWORD,
- NT_STATUS_OK
+ .comment = "test user: user\\domain OLD PASSWORD",
+ .domain = userdomain,
+ .username = TEST_USER_NAME,
+ .password = old_user_password,
+ .network_login = True,
+ .expected_interactive_error = NT_STATUS_WRONG_PASSWORD,
+ .expected_network_error = NT_STATUS_OK
}
};
More information about the samba-cvs
mailing list