diff options
Diffstat (limited to 'source4/torture/basic/dfstest.c')
-rw-r--r-- | source4/torture/basic/dfstest.c | 226 |
1 files changed, 113 insertions, 113 deletions
diff --git a/source4/torture/basic/dfstest.c b/source4/torture/basic/dfstest.c index 79d49aded3..eb2d517f6d 100644 --- a/source4/torture/basic/dfstest.c +++ b/source4/torture/basic/dfstest.c @@ -23,7 +23,7 @@ #define DFS_SERVER_COUNT 6 #define DFS_FILE_COUNT 8 extern char *host, *share, *password, *username; -static struct cli_client context; +static struct smbcli_client context; static const char *sockops="TCP_NODELAY"; /* @@ -39,59 +39,59 @@ BOOL torture_dfs_basic(int dummy) const char *template = "\\\\%s\\%s\\dfstest%d.tmp"; char *filedata; int server_count = 0; - int connection_flags = CLI_FULL_CONNECTION_USE_KERBEROS - | CLI_FULL_CONNECTION_USE_DFS + int connection_flags = SMBCLI_FULL_CONNECTION_USE_KERBEROS + | SMBCLI_FULL_CONNECTION_USE_DFS ; printf("starting dfs_basic_test\n"); - cli_client_initialize(&context, sockops, username, password, lp_workgroup(), connection_flags); + smbcli_client_initialize(&context, sockops, username, password, lp_workgroup(), connection_flags); - if ((current_server = cli_dfs_open_connection(&context, host, share, connection_flags) < 0)) + if ((current_server = smbcli_dfs_open_connection(&context, host, share, connection_flags) < 0)) return False; for (i=0; i < DFS_FILE_COUNT ; i++) { file_server[i] = 0; DEBUG(4,("host=%s share=%s cli host=%s cli share=%s\n", - host, share, cli_state_get_host(context.cli[file_server[i]]), - cli_state_get_share(context.cli[file_server[i]]))); - host = cli_state_get_host(context.cli[file_server[i]]); - share = cli_state_get_share(context.cli[file_server[i]]); + host, share, smbcli_state_get_host(context.cli[file_server[i]]), + smbcli_state_get_share(context.cli[file_server[i]]))); + host = smbcli_state_get_host(context.cli[file_server[i]]); + share = smbcli_state_get_share(context.cli[file_server[i]]); asprintf(&fname[i], template, host, share, i); DEBUG(3,("unlinking %s\n", fname[i])); - cli_nt_unlink(&context, &file_server[i], fname[i], 0); + smbcli_nt_unlink(&context, &file_server[i], fname[i], 0); } for (i=0; i < DFS_FILE_COUNT ; i++) { - host = cli_state_get_host(context.cli[file_server[i]]); - share = cli_state_get_share(context.cli[file_server[i]]); + host = smbcli_state_get_host(context.cli[file_server[i]]); + share = smbcli_state_get_share(context.cli[file_server[i]]); asprintf(&fname[i], template, host, share, i); DEBUG(3,("open %s on server %s(%d)\n", fname[i], host, file_server[i])); - fnum[i] = cli_dfs_open(&context, &file_server[i], fname[i], O_RDWR|O_CREAT|O_EXCL, DENY_NONE); + fnum[i] = smbcli_dfs_open(&context, &file_server[i], fname[i], O_RDWR|O_CREAT|O_EXCL, DENY_NONE); if (fnum[i] == -1) { - printf("open of %s failed (%s)\n", fname[i], cli_errstr(context.cli[file_server[i]])); + printf("open of %s failed (%s)\n", fname[i], smbcli_errstr(context.cli[file_server[i]])); return False; } asprintf(&filedata, "%s %d", fname[i], fnum[i]); DEBUG(3,("write %d bytes (%s) to %s (fid %d) on server %s(%d)\n", strlen(filedata), filedata, fname[i], fnum[i], host, file_server[i])); - if (cli_write(context.cli[file_server[i]], fnum[i], 0, filedata, 0, strlen(filedata)) != strlen(filedata)) + if (smbcli_write(context.cli[file_server[i]], fnum[i], 0, filedata, 0, strlen(filedata)) != strlen(filedata)) { - printf("write failed (%s)\n", cli_errstr(context.cli[file_server[i]])); + printf("write failed (%s)\n", smbcli_errstr(context.cli[file_server[i]])); return False; } - if (!cli_close(context.cli[file_server[i]], fnum[i])) { - printf("close of %s failed (%s)\n", fname[i], cli_errstr(context.cli[file_server[i]])); + if (!smbcli_close(context.cli[file_server[i]], fnum[i])) { + printf("close of %s failed (%s)\n", fname[i], smbcli_errstr(context.cli[file_server[i]])); return False; } } DEBUG(3,("used Dfs servers:")); for (i=0; i < DFS_SERVER_COUNT ; i++) { server_count++; - DEBUG(3,(" %s(%d)", cli_state_get_host(context.cli[file_server[i]]), i)); + DEBUG(3,(" %s(%d)", smbcli_state_get_host(context.cli[file_server[i]]), i)); if (!torture_close_connection(context.cli[i])) return False; } @@ -119,63 +119,63 @@ BOOL torture_dfs_rename(int dummy) const char *template2new = "\\\\%s\\%s\\~dfstestnew.txt"; char *filedata, *newdata; int server_count = 0; - int connection_flags = CLI_FULL_CONNECTION_USE_KERBEROS - | CLI_FULL_CONNECTION_USE_DFS + int connection_flags = SMBCLI_FULL_CONNECTION_USE_KERBEROS + | SMBCLI_FULL_CONNECTION_USE_DFS ; printf("starting dfs_rename_test\n"); - cli_client_initialize(&context, sockops, username, password, + smbcli_client_initialize(&context, sockops, username, password, lp_workgroup(), connection_flags); - if ((current_server = cli_dfs_open_connection(&context, host, share, connection_flags)) < 0) + if ((current_server = smbcli_dfs_open_connection(&context, host, share, connection_flags)) < 0) return False; for (i=0; i < DFS_FILE_COUNT ; i++) { file_server[i] = 0; slprintf(fname[i],sizeof(fstring)-1,template, host, share, i); DEBUG(3,("unlinking %s\n", fname[i])); - cli_nt_unlink(&context, &file_server[i], fname[i], 0); + smbcli_nt_unlink(&context, &file_server[i], fname[i], 0); } /* Simple rename test */ for (i=0; i < 1 ; i++) { slprintf(fname[i],sizeof(fstring)-1,template, - cli_state_get_host(context.cli[file_server[i]]), - cli_state_get_share(context.cli[file_server[i]]), i); + smbcli_state_get_host(context.cli[file_server[i]]), + smbcli_state_get_share(context.cli[file_server[i]]), i); DEBUG(3,("open %s on server %s(%d)\n", - fname[i], cli_state_get_host(context.cli[file_server[i]]), file_server[i])); + fname[i], smbcli_state_get_host(context.cli[file_server[i]]), file_server[i])); - fnum[i] = cli_dfs_open(&context, &file_server[i], fname[i], O_RDWR|O_CREAT|O_EXCL, DENY_NONE); + fnum[i] = smbcli_dfs_open(&context, &file_server[i], fname[i], O_RDWR|O_CREAT|O_EXCL, DENY_NONE); if (fnum[i] == -1) { - printf("open of %s failed (%s)\n", fname[i], cli_errstr(context.cli[file_server[i]])); + printf("open of %s failed (%s)\n", fname[i], smbcli_errstr(context.cli[file_server[i]])); return False; } asprintf(&filedata, "%s %d", fname[i], (int)getpid()); DEBUG(3,("write %d bytes (%s) to %s (fid %d) on server %s(%d)\n", strlen(filedata), filedata, fname[i], fnum[i], - cli_state_get_host(context.cli[file_server[i]]), file_server[i])); - if (cli_write(context.cli[file_server[i]], fnum[i], 0, filedata, 0, strlen(filedata)) != strlen(filedata)) + smbcli_state_get_host(context.cli[file_server[i]]), file_server[i])); + if (smbcli_write(context.cli[file_server[i]], fnum[i], 0, filedata, 0, strlen(filedata)) != strlen(filedata)) { - printf("write failed (%s)\n", cli_errstr(context.cli[file_server[i]])); + printf("write failed (%s)\n", smbcli_errstr(context.cli[file_server[i]])); return False; } - if (!cli_close(context.cli[file_server[i]], fnum[i])) { - printf("close of %s failed (%s)\n", fname[i], cli_errstr(context.cli[file_server[i]])); + if (!smbcli_close(context.cli[file_server[i]], fnum[i])) { + printf("close of %s failed (%s)\n", fname[i], smbcli_errstr(context.cli[file_server[i]])); return False; } } // now attempt to rename the file DEBUG(3,("rename %s to %s on server %s(%d)\n", - fname[0], fname[1], cli_state_get_host(context.cli[file_server[i]]), file_server[0])); - if (!cli_dfs_rename(&context, &file_server[0], fname[0], fname[1])) { - printf("rename of %s to %s failed (%s)\n", fname[0], fname[1], cli_errstr(context.cli[file_server[0]])); + fname[0], fname[1], smbcli_state_get_host(context.cli[file_server[i]]), file_server[0])); + if (!smbcli_dfs_rename(&context, &file_server[0], fname[0], fname[1])) { + printf("rename of %s to %s failed (%s)\n", fname[0], fname[1], smbcli_errstr(context.cli[file_server[0]])); return False; } // clean up DEBUG(3,("used Dfs servers:")); for (i=0; i < DFS_SERVER_COUNT ; i++) { server_count++; - DEBUG(3,(" %s(%d)", cli_state_get_host(context.cli[file_server[i]]), i)); + DEBUG(3,(" %s(%d)", smbcli_state_get_host(context.cli[file_server[i]]), i)); if (!torture_close_connection(context.cli[i])) return False; } @@ -187,10 +187,10 @@ BOOL torture_dfs_rename(int dummy) * Then open, write to new temp name file (~x.new), close. * Then rename old file name to old temp name file (~x.old). * Then rename new temp name file to oroginal name (x). */ - cli_client_initialize(&context, sockops, username, password, + smbcli_client_initialize(&context, sockops, username, password, lp_workgroup(), connection_flags); - if ((current_server = cli_dfs_open_connection(&context, host, share, connection_flags)) < 0) + if ((current_server = smbcli_dfs_open_connection(&context, host, share, connection_flags)) < 0) return False; slprintf(fname[0],sizeof(fname[0])-1,template2orig, host, share); slprintf(fname[1],sizeof(fname[1])-1,template2old, host, share); @@ -199,99 +199,99 @@ BOOL torture_dfs_rename(int dummy) file_server[i] = 0; fnum[i] = 0; DEBUG(3,("unlinking %s\n", fname[i])); - cli_nt_unlink(&context, &file_server[i], fname[i], 0); + smbcli_nt_unlink(&context, &file_server[i], fname[i], 0); } asprintf(&fname[0],template2orig, - cli_state_get_host(context.cli[0]), - cli_state_get_share(context.cli[0]), 0); + smbcli_state_get_host(context.cli[0]), + smbcli_state_get_share(context.cli[0]), 0); asprintf(&fname[1],template2old, - cli_state_get_host(context.cli[1]), - cli_state_get_share(context.cli[1]), 1); + smbcli_state_get_host(context.cli[1]), + smbcli_state_get_share(context.cli[1]), 1); asprintf(&fname[2],template2new, - cli_state_get_host(context.cli[2]), - cli_state_get_share(context.cli[2]), 2); + smbcli_state_get_host(context.cli[2]), + smbcli_state_get_share(context.cli[2]), 2); DEBUG(3,("edit(MS Word) %s on server %s(%d)\n", - fname[0], cli_state_get_host(context.cli[0]), file_server[0])); + fname[0], smbcli_state_get_host(context.cli[0]), file_server[0])); DEBUG(3,("open %s on server %s(%d)\n", - fname[0], cli_state_get_host(context.cli[0]), file_server[0])); + fname[0], smbcli_state_get_host(context.cli[0]), file_server[0])); - fnum[0] = cli_dfs_open(&context, &file_server[0], fname[0], O_RDWR|O_CREAT|O_EXCL, DENY_NONE); + fnum[0] = smbcli_dfs_open(&context, &file_server[0], fname[0], O_RDWR|O_CREAT|O_EXCL, DENY_NONE); if (fnum[0] == -1) { - printf("open of %s failed (%s)\n", fname[0], cli_errstr(context.cli[file_server[0]])); + printf("open of %s failed (%s)\n", fname[0], smbcli_errstr(context.cli[file_server[0]])); return False; } slprintf(filedata, sizeof(fstring)-1, "%s %d", fname[0], (int)getpid()); DEBUG(3,("write %d bytes (%s) to %s (fid %d) on server %s(%d)\n", strlen(filedata), filedata, fname[0], fnum[0], - cli_state_get_host(context.cli[0]), file_server[0])); - if (cli_write(context.cli[file_server[0]], fnum[0], 0, filedata, 0, strlen(filedata)) != strlen(filedata)) + smbcli_state_get_host(context.cli[0]), file_server[0])); + if (smbcli_write(context.cli[file_server[0]], fnum[0], 0, filedata, 0, strlen(filedata)) != strlen(filedata)) { - printf("write failed (%s)\n", cli_errstr(context.cli[file_server[0]])); + printf("write failed (%s)\n", smbcli_errstr(context.cli[file_server[0]])); return False; } // read data from original file DEBUG(3,("read %s (fid %d) on server %s(%d)\n", - fname[0], fnum[0], cli_state_get_host(context.cli[0]), file_server[0])); - if (cli_read(context.cli[file_server[0]], fnum[0], filedata, 0, strlen(filedata)) != strlen(filedata)) + fname[0], fnum[0], smbcli_state_get_host(context.cli[0]), file_server[0])); + if (smbcli_read(context.cli[file_server[0]], fnum[0], filedata, 0, strlen(filedata)) != strlen(filedata)) { - printf("read failed (%s)", cli_errstr(context.cli[file_server[0]])); + printf("read failed (%s)", smbcli_errstr(context.cli[file_server[0]])); return False; } DEBUG(3,("close %s on server %s(%d)\n", - fname[0], cli_state_get_host(context.cli[0]), file_server[0])); - if (!cli_close(context.cli[file_server[0]], fnum[0])) { - printf("close of %s failed (%s)\n", fname[0], cli_errstr(context.cli[file_server[0]])); + fname[0], smbcli_state_get_host(context.cli[0]), file_server[0])); + if (!smbcli_close(context.cli[file_server[0]], fnum[0])) { + printf("close of %s failed (%s)\n", fname[0], smbcli_errstr(context.cli[file_server[0]])); return False; } // open new temp file, write data DEBUG(3,("open %s on server %s(%d)\n", - fname[2], cli_state_get_host(context.cli[2]), file_server[2])); - fnum[2] = cli_dfs_open(&context, &file_server[2], fname[2], O_RDWR|O_CREAT|O_EXCL, DENY_NONE); + fname[2], smbcli_state_get_host(context.cli[2]), file_server[2])); + fnum[2] = smbcli_dfs_open(&context, &file_server[2], fname[2], O_RDWR|O_CREAT|O_EXCL, DENY_NONE); if (fnum[2] == -1) { - printf("open of %s failed (%s)\n", fname[2], cli_errstr(context.cli[file_server[2]])); + printf("open of %s failed (%s)\n", fname[2], smbcli_errstr(context.cli[file_server[2]])); return False; } DEBUG(3,("write %d bytes (%s) to %s (fid %d) on server %s(%d)\n", strlen(filedata), filedata, fname[2], fnum[2], - cli_state_get_host(context.cli[2]), file_server[2])); - if (cli_write(context.cli[file_server[2]], fnum[2], 0, filedata, 0, strlen(filedata)) != strlen(filedata)) + smbcli_state_get_host(context.cli[2]), file_server[2])); + if (smbcli_write(context.cli[file_server[2]], fnum[2], 0, filedata, 0, strlen(filedata)) != strlen(filedata)) { - printf("write failed (%s)\n", cli_errstr(context.cli[file_server[2]])); + printf("write failed (%s)\n", smbcli_errstr(context.cli[file_server[2]])); return False; } slprintf(newdata, sizeof(fstring)-1, "new data: %s %d", fname[0], (int)getpid()); DEBUG(3,("write new data %d bytes (%s) to %s (fid %d) on server %s(%d)\n", strlen(newdata), newdata, fname[2], fnum[2], - cli_state_get_host(context.cli[2]), file_server[2])); - if (cli_write(context.cli[file_server[2]], fnum[2], 0, newdata, strlen(filedata), strlen(newdata)) != strlen(newdata)) + smbcli_state_get_host(context.cli[2]), file_server[2])); + if (smbcli_write(context.cli[file_server[2]], fnum[2], 0, newdata, strlen(filedata), strlen(newdata)) != strlen(newdata)) { - printf("write failed (%s)\n", cli_errstr(context.cli[file_server[2]])); + printf("write failed (%s)\n", smbcli_errstr(context.cli[file_server[2]])); return False; } DEBUG(3,("close %s on server %s(%d)\n", - fname[2], cli_state_get_host(context.cli[2]), file_server[2])); - if (!cli_close(context.cli[file_server[2]], fnum[2])) { - printf("close of %s failed (%s)\n", fname[2], cli_errstr(context.cli[file_server[2]])); + fname[2], smbcli_state_get_host(context.cli[2]), file_server[2])); + if (!smbcli_close(context.cli[file_server[2]], fnum[2])) { + printf("close of %s failed (%s)\n", fname[2], smbcli_errstr(context.cli[file_server[2]])); return False; } DEBUG(3,("close successful %s on server %s(%d)\n", - fname[2], cli_state_get_host(context.cli[2]), file_server[2])); + fname[2], smbcli_state_get_host(context.cli[2]), file_server[2])); // rename original file to temp DEBUG(4,("file_server[0]=%d\n", file_server[0])); - DEBUG(4,("context.cli[file_server[0]].desthost=%s\n", cli_state_get_host(context.cli[0]))); + DEBUG(4,("context.cli[file_server[0]].desthost=%s\n", smbcli_state_get_host(context.cli[0]))); DEBUG(3,("rename %s to %s on server %s(%d)\n", - fname[0], fname[1], cli_state_get_host(context.cli[0]), file_server[0])); - if (!cli_dfs_rename(&context, &file_server[0], fname[0], fname[1])) { - printf("rename of %s to %s failed (%s)\n", fname[0], fname[1], cli_errstr(context.cli[file_server[0]])); + fname[0], fname[1], smbcli_state_get_host(context.cli[0]), file_server[0])); + if (!smbcli_dfs_rename(&context, &file_server[0], fname[0], fname[1])) { + printf("rename of %s to %s failed (%s)\n", fname[0], fname[1], smbcli_errstr(context.cli[file_server[0]])); return False; } // name new temp file to original DEBUG(3,("rename %s to %s on server %s(%d)\n", - fname[2], fname[0], cli_state_get_host(context.cli[2]), file_server[2])); - if (!cli_dfs_rename(&context, &file_server[2], fname[2], fname[0])) { - printf("rename of %s to %s failed (%s)\n", fname[2], fname[0], cli_errstr(context.cli[file_server[2]])); + fname[2], fname[0], smbcli_state_get_host(context.cli[2]), file_server[2])); + if (!smbcli_dfs_rename(&context, &file_server[2], fname[2], fname[0])) { + printf("rename of %s to %s failed (%s)\n", fname[2], fname[0], smbcli_errstr(context.cli[file_server[2]])); return False; } printf("Dfstest: passed MS Word rename test\n"); @@ -299,7 +299,7 @@ BOOL torture_dfs_rename(int dummy) DEBUG(3,("used Dfs servers:")); for (i=0; i < DFS_SERVER_COUNT ; i++) { server_count++; - DEBUG(3,(" %s(%d)", cli_state_get_host(context.cli[i]), i)); + DEBUG(3,(" %s(%d)", smbcli_state_get_host(context.cli[i]), i)); if (!torture_close_connection(context.cli[i])) return False; } @@ -309,7 +309,7 @@ BOOL torture_dfs_rename(int dummy) return True; } struct list_fn_parms { - struct cli_client *context; + struct smbcli_client *context; char* rname; } list_fn_parms; @@ -321,7 +321,7 @@ void delete_file(file_info *finfo, const char *rname) DEBUG(3,("deleting file %s in %s\n", finfo->name, rname)); asprintf(&fname, "%s\\%s", rname, finfo->name); - cli_nt_unlink(&context, &server, fname, 0); + smbcli_nt_unlink(&context, &server, fname, 0); } void delete_directory(file_info *finfo, const char *rname) { @@ -330,12 +330,12 @@ void delete_directory(file_info *finfo, const char *rname) DEBUG(3,("deleting directory %s in %s\n", finfo->name, rname)); asprintf(&dname, "%s%s\\*", rname, finfo->name); - cli_nt_unlink(&context, &server, dname, 0); + smbcli_nt_unlink(&context, &server, dname, 0); asprintf(&dname, "%s%s\\*", rname, finfo->name); asprintf(&rname2, "%s%s", rname, finfo->name); - cli_search(context.cli[0], dname, FILE_ATTRIBUTE_DIRECTORY, + smbcli_search(context.cli[0], dname, FILE_ATTRIBUTE_DIRECTORY, dfs_list_fn, (void*)rname2); - cli_dfs_rmdir(&context, &server, rname2); + smbcli_dfs_rmdir(&context, &server, rname2); } void dfs_list_fn(file_info *finfo, const char *name, void* parmsp) @@ -371,47 +371,47 @@ BOOL torture_dfs_random(int dummy) char *filedata; int server_count = 0; int file_count; - int connection_flags = CLI_FULL_CONNECTION_USE_KERBEROS - | CLI_FULL_CONNECTION_USE_DFS + int connection_flags = SMBCLI_FULL_CONNECTION_USE_KERBEROS + | SMBCLI_FULL_CONNECTION_USE_DFS ; printf("starting dfs_random_test\n"); - cli_client_initialize(&context, sockops, username, password, + smbcli_client_initialize(&context, sockops, username, password, lp_workgroup(), connection_flags); - if ((dir_server[0] = cli_dfs_open_connection(&context, host, share, connection_flags)) < 0) + if ((dir_server[0] = smbcli_dfs_open_connection(&context, host, share, connection_flags)) < 0) return False; // get list of directories named dfsdir*. // delete all files in these directories using wild card, // then delete directory. asprintf(&rname, "\\\\%s\\%s\\", - cli_state_get_host(context.cli[0]), - cli_state_get_share(context.cli[0])); + smbcli_state_get_host(context.cli[0]), + smbcli_state_get_share(context.cli[0])); asprintf(&fname[0], alltemplate, - cli_state_get_host(context.cli[0]), - cli_state_get_share(context.cli[0])); + smbcli_state_get_host(context.cli[0]), + smbcli_state_get_share(context.cli[0])); DEBUG(3,("deleting files %s in %s on server %s(%d)\n", - fname[0], rname, cli_state_get_host(context.cli[0]), dir_server[0])); - file_count = cli_search(context.cli[0], fname[0], FILE_ATTRIBUTE_DIRECTORY, dfs_list_fn, (void*)rname); + fname[0], rname, smbcli_state_get_host(context.cli[0]), dir_server[0])); + file_count = smbcli_search(context.cli[0], fname[0], FILE_ATTRIBUTE_DIRECTORY, dfs_list_fn, (void*)rname); // create random directory names with 0-n levels asprintf(&dname[0], "\\\\%s\\%s\\", - cli_state_get_host(context.cli[0]), - cli_state_get_share(context.cli[0])); + smbcli_state_get_host(context.cli[0]), + smbcli_state_get_share(context.cli[0])); DEBUG(3,("creating directories in %s on server %s(%d)\n", - rname, cli_state_get_host(context.cli[0]), dir_server[0])); + rname, smbcli_state_get_host(context.cli[0]), dir_server[0])); for (i=1; i < DFS_RANDOM_DIR_COUNT; i++) { dir_server[i] = 0; asprintf(&dname[i], "\\\\%s\\%s\\dfsdir%d.tmp", - cli_state_get_host(context.cli[dir_server[i]]), - cli_state_get_share(context.cli[dir_server[i]]), + smbcli_state_get_host(context.cli[dir_server[i]]), + smbcli_state_get_share(context.cli[dir_server[i]]), (int)sys_random()%10000); DEBUG(3,("mkdir %s on server %s(%d)\n", - dname[i], cli_state_get_host(context.cli[dir_server[i]]), dir_server[i])); - if (!cli_dfs_mkdir(&context, &dir_server[i], dname[i])) { - printf("mkdir of %s failed (%s)\n", dname[i], cli_errstr(context.cli[dir_server[i]])); + dname[i], smbcli_state_get_host(context.cli[dir_server[i]]), dir_server[i])); + if (!smbcli_dfs_mkdir(&context, &dir_server[i], dname[i])) { + printf("mkdir of %s failed (%s)\n", dname[i], smbcli_errstr(context.cli[dir_server[i]])); return False; } } @@ -422,33 +422,33 @@ BOOL torture_dfs_random(int dummy) file_server[i] = dir_server[dn]; asprintf(&fname[i], ftemplate, dname[dn], i); DEBUG(3,("open %s on server %s(%d)\n", - fname[i], cli_state_get_host(context.cli[dir_server[i]]), file_server[i])); - fnum[i] = cli_dfs_open(&context, &file_server[i], fname[i], O_RDWR|O_CREAT|O_EXCL, DENY_NONE); + fname[i], smbcli_state_get_host(context.cli[dir_server[i]]), file_server[i])); + fnum[i] = smbcli_dfs_open(&context, &file_server[i], fname[i], O_RDWR|O_CREAT|O_EXCL, DENY_NONE); if (fnum[i] == -1) { - printf("open of %s failed (%s)\n", fname[i], cli_errstr(context.cli[file_server[i]])); + printf("open of %s failed (%s)\n", fname[i], smbcli_errstr(context.cli[file_server[i]])); return False; } asprintf(&filedata, "%s %d", fname[i], fnum[i]); DEBUG(3,("write %d bytes (%s) to %s (fid %d) on server %s(%d)\n", strlen(filedata), filedata, fname[i], fnum[i], - cli_state_get_host(context.cli[dir_server[i]]), file_server[i])); - if (cli_write(context.cli[file_server[i]], fnum[i], 0, filedata, 0, strlen(filedata)) != strlen(filedata)) + smbcli_state_get_host(context.cli[dir_server[i]]), file_server[i])); + if (smbcli_write(context.cli[file_server[i]], fnum[i], 0, filedata, 0, strlen(filedata)) != strlen(filedata)) { - printf("write failed (%s)\n", cli_errstr(context.cli[file_server[i]])); + printf("write failed (%s)\n", smbcli_errstr(context.cli[file_server[i]])); return False; } - if (!cli_close(context.cli[file_server[i]], fnum[i])) { - printf("close of %s failed (%s)\n", fname[i], cli_errstr(context.cli[file_server[i]])); + if (!smbcli_close(context.cli[file_server[i]], fnum[i])) { + printf("close of %s failed (%s)\n", fname[i], smbcli_errstr(context.cli[file_server[i]])); return False; } } DEBUG(3,("used Dfs servers:")); for (i=0; i < DFS_SERVER_COUNT ; i++) { server_count++; - DEBUG(3,(" %s(%d)", cli_state_get_host(context.cli[i]), i)); + DEBUG(3,(" %s(%d)", smbcli_state_get_host(context.cli[i]), i)); if (!torture_close_connection(context.cli[i])) return False; } |