r5929: Use cli_credentials for the SMB functions as well.

[samba.git] / source / torture / gentest.c

diff --git a/source/torture/gentest.c b/source/torture/gentest.c
index 19fa03df8c894c0f301693e46290017ffdc5532b..92d6da9fef0e48e8be5995cc600e91d0f5c0f5b5 100644 (file)
--- a/source/torture/gentest.c
+++ b/source/torture/gentest.c
@@ -60,8 +60,7 @@ static struct {
        struct smbcli_state *cli[NINSTANCES];
        char *server_name;
        char *share_name;
-       char *username;
-       char *password;
+       struct cli_credentials credentials;
 } servers[NSERVERS];
 
 /* the seeds and flags for each operation */
@@ -176,14 +175,13 @@ static BOOL connect_servers(void)
                        NTSTATUS status;
                        printf("Connecting to \\\\%s\\%s as %s - instance %d\n",
                               servers[i].server_name, servers[i].share_name, 
-                              servers[i].username, j);
+                              servers[i].credentials.username, j);
+
                        status = smbcli_full_connection(NULL, &servers[i].cli[j],
                                                        "gentest",
                                                        servers[i].server_name, 
-                                                       servers[i].share_name, NULL,
-                                                       servers[i].username, 
-                                                       lp_workgroup(),
-                                                       servers[i].password);
+                                                       servers[i].share_name, NULL, 
+                                                       &servers[i].credentials);
                        if (!NT_STATUS_IS_OK(status)) {
                                printf("Failed to connect to \\\\%s\\%s - %s\n",
                                       servers[i].server_name, servers[i].share_name,
@@ -2137,13 +2135,8 @@ static void usage(void)
        while ((opt = getopt(argc, argv, "U:s:o:ad:i:AOhS:LFXC")) != EOF) {
                switch (opt) {
                case 'U':
-                       i = servers[0].username?1:0;
-                       if (!split_username(optarg, 
-                                           &servers[i].username, 
-                                           &servers[i].password)) {
-                               printf("Must supply USER%%PASS\n");
-                               return -1;
-                       }
+                       i = servers[0].credentials.username?1:0;
+                       cli_credentials_parse_string(&servers[0].credentials, optarg, CRED_SPECIFIED);
                        break;
                case 'd':
                        DEBUGLEVEL = atoi(optarg);
@@ -2193,13 +2186,13 @@ static void usage(void)
 
        gentest_init_subsystems;
 
-       if (!servers[0].username) {
+       if (!servers[0].credentials.username) {
                usage();
                return -1;
        }
-       if (!servers[1].username) {
-               servers[1].username = servers[0].username;
-               servers[1].password = servers[0].password;
+       if (!servers[1].credentials.username) {
+               servers[1].credentials.username = servers[0].credentials.username;
+               servers[1].credentials.password = servers[0].credentials.password;
        }
 
        printf("seed=%u\n", options.seed);