Unix SMB/CIFS implementation.
mask_match tester
Copyright (C) Andrew Tridgell 1999
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "includes.h"
#include "system/filesys.h"
#include "trans2.h"
+#include "libsmb/libsmb.h"
#include "libsmb/nmblib.h"
+#include "../libcli/smb/smbXcli_base.h"
static fstring password;
static fstring username;
static int got_pass;
-static int max_protocol = PROTOCOL_NT1;
+static int max_protocol = -1;
static bool showall = False;
static bool old_list = False;
static const char *maskchars = "<>\"?*abc.";
if (strcmp(file,"..") == 0) file = ".";
- return ms_fnmatch(pattern, file, cli->protocol, False) == 0;
+ return ms_fnmatch(pattern, file, smbXcli_conn_protocol(cli->conn), False) == 0;
}
static char *reg_test(struct cli_state *cli, const char *pattern, const char *long_name, const char *short_name)
static struct cli_state *connect_one(char *share)
{
struct cli_state *c;
- struct nmb_name called, calling;
char *server_n;
char *server;
- struct sockaddr_storage ss;
NTSTATUS status;
server = share+2;
server_n = server;
- zero_sockaddr(&ss);
-
- make_nmb_name(&calling, "masktest", 0x0);
- make_nmb_name(&called , server, 0x20);
-
- again:
- zero_sockaddr(&ss);
-
- /* have to open a new connection */
- if (!(c=cli_initialise())) {
- DEBUG(0,("Connection to %s failed\n", server_n));
- return NULL;
- }
-
- status = cli_connect(c, server_n, &ss);
+ status = cli_connect_nb(server, NULL, 0, 0x20, "masktest",
+ SMB_SIGNING_DEFAULT, 0, &c);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0,("Connection to %s failed. Error %s\n", server_n, nt_errstr(status) ));
+ DEBUG(0,("Connection to %s failed. Error %s\n", server_n,
+ nt_errstr(status)));
return NULL;
}
- c->protocol = max_protocol;
-
- if (!cli_session_request(c, &calling, &called)) {
- DEBUG(0,("session request to %s failed\n", called.name));
- cli_shutdown(c);
- if (strcmp(called.name, "*SMBSERVER")) {
- make_nmb_name(&called , "*SMBSERVER", 0x20);
- goto again;
- }
- return NULL;
- }
-
- DEBUG(4,(" session request ok\n"));
-
- status = cli_negprot(c);
+ status = smbXcli_negprot(c->conn, c->timeout, PROTOCOL_CORE,
+ max_protocol);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, ("protocol negotiation failed: %s\n",
nt_errstr(status)));
}
if (!got_pass) {
- char *pass = getpass("Password: ");
- if (pass) {
+ char pwd[256] = {0};
+ int rc;
+
+ rc = samba_getpass("Password: ", pwd, sizeof(pwd), false, false);
+ if (rc == 0) {
fstrcpy(password, pass);
}
}
DEBUG(4,(" session setup ok\n"));
- status = cli_tcon_andx(c, share, "?????", password,
- strlen(password)+1);
+ status = cli_tree_connect(c, share, "?????", password,
+ strlen(password)+1);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0,("tree connect failed: %s\n", nt_errstr(status)));
cli_shutdown(c);
return NT_STATUS_OK;
}
- fstrcpy(state->short_name, f->short_name);
- strlower_m(state->short_name);
+
+ fstrcpy(state->short_name, f->short_name ? f->short_name : "");
+ (void)strlower_m(state->short_name);
*state->pp_long_name = SMB_STRDUP(f->name);
if (!*state->pp_long_name) {
return NT_STATUS_NO_MEMORY;
}
- strlower_m(*state->pp_long_name);
+ (void)strlower_m(*state->pp_long_name);
return NT_STATUS_OK;
}
*pp_long_name = NULL;
/* nasty hack to force level 260 listings - tridge */
if (max_protocol <= PROTOCOL_LANMAN1) {
- cli_list_trans(cli, "\\masktest\\*.*", FILE_ATTRIBUTE_HIDDEN | aDIR,
+ cli_list_trans(cli, "\\masktest\\*.*", FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY,
SMB_FIND_FILE_BOTH_DIRECTORY_INFO, listfn,
&state);
} else {
- cli_list_trans(cli, "\\masktest\\*", FILE_ATTRIBUTE_HIDDEN | aDIR,
+ cli_list_trans(cli, "\\masktest\\*", FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY,
SMB_FIND_FILE_BOTH_DIRECTORY_INFO,
listfn, &state);
}
fstrcpy(res1, "---");
- if (!NT_STATUS_IS_OK(cli_open(cli, file, O_CREAT|O_TRUNC|O_RDWR, 0, &fnum))) {
+ if (!NT_STATUS_IS_OK(cli_openx(cli, file, O_CREAT|O_TRUNC|O_RDWR, 0, &fnum))) {
DEBUG(0,("Can't create %s\n", file));
return;
}
return;
}
fstrcpy(res1, "---");
- cli_list(cli, mask, FILE_ATTRIBUTE_HIDDEN | aDIR, listfn, NULL);
+ cli_list(cli, mask, FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY, listfn, NULL);
res2 = reg_test(cli, mask, long_name, short_name);
if (die_on_error) exit(1);
}
- cli_unlink(cli, file, aSYSTEM | FILE_ATTRIBUTE_HIDDEN);
+ cli_unlink(cli, file, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (count % 100 == 0) DEBUG(0,("%d\n", count));
SAFE_FREE(long_name);
cli_mkdir(cli, "\\masktest");
- cli_unlink(cli, "\\masktest\\*", aSYSTEM | FILE_ATTRIBUTE_HIDDEN);
+ cli_unlink(cli, "\\masktest\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (argc >= 2) {
while (argc >= 2) {
while (1) {
l1 = 1 + random() % 20;
l2 = 1 + random() % 20;
- mask = TALLOC_ARRAY(ctx, char, strlen("\\masktest\\")+1+22);
- file = TALLOC_ARRAY(ctx, char, strlen("\\masktest\\")+1+22);
+ mask = talloc_array(ctx, char, strlen("\\masktest\\")+1+22);
+ file = talloc_array(ctx, char, strlen("\\masktest\\")+1+22);
if (!mask || !file) {
goto finished;
}
argv += 1;
load_case_tables();
- lp_load(get_dyn_CONFIGFILE(),True,False,False,True);
+ lp_load_global(get_dyn_CONFIGFILE());
load_interfaces();
if (getenv("USER")) {
verbose++;
break;
case 'M':
- max_protocol = interpret_protocol(optarg, max_protocol);
+ lp_set_cmdline("client max protocol", optarg);
break;
case 'U':
fstrcpy(username,optarg);
argc -= optind;
argv += optind;
+ max_protocol = lp_client_max_protocol();
cli = connect_one(share);
if (!cli) {
git.samba.org / samba.git / blobdiff