#include "auth/credentials/credentials.h"
#include "auth/gensec/gensec.h"
#include "param/param.h"
+#include "dynconfig.h"
+
+#define MAX_STRING_LEN 1024
static struct cli_credentials *credentials;
-static BOOL showall = False;
-static BOOL old_list = False;
+static bool showall = false;
+static bool old_list = false;
static const char *maskchars = "<>\"?*abc.";
static const char *filechars = "abcdefghijklm.";
static int verbose;
static int NumLoops = 0;
static int max_length = 20;
-static BOOL reg_match_one(struct smbcli_state *cli, const char *pattern, const char *file)
+static bool reg_match_one(struct smbcli_state *cli, const char *pattern, const char *file)
{
/* oh what a weird world this is */
- if (old_list && strcmp(pattern, "*.*") == 0) return True;
+ if (old_list && strcmp(pattern, "*.*") == 0) return true;
- if (ISDOT(pattern)) return False;
+ if (ISDOT(pattern)) return false;
if (ISDOTDOT(file)) file = ".";
/*****************************************************
return a connection to a server
*******************************************************/
-static struct smbcli_state *connect_one(char *share)
+static struct smbcli_state *connect_one(char *share, const char **ports)
{
struct smbcli_state *c;
fstring server;
status = smbcli_full_connection(NULL, &c,
server,
+ ports,
share, NULL,
credentials, NULL);
static char *resultp;
static struct {
- pstring long_name;
- pstring short_name;
+ char *long_name;
+ char *short_name;
} last_hit;
-static BOOL f_info_hit;
+static bool f_info_hit;
static void listfn(struct clilist_file_info *f, const char *s, void *state)
{
if (ISDOT(f->name)) {
resultp[0] = '+';
} else if (ISDOTDOT(f->name)) {
- resultp[1] = '+';
+ resultp[1] = '+';
} else {
resultp[2] = '+';
}
- pstrcpy(last_hit.long_name, f->name);
- pstrcpy(last_hit.short_name, f->short_name);
- f_info_hit = True;
+ safe_strcpy(last_hit.long_name, f->name, MAX_STRING_LEN);
+ safe_strcpy(last_hit.short_name, f->short_name, MAX_STRING_LEN);
+ f_info_hit = true;
}
-static void get_real_name(struct smbcli_state *cli,
- pstring long_name, fstring short_name)
+static void get_real_name(TALLOC_CTX *mem_ctx, struct smbcli_state *cli,
+ char *long_name, fstring short_name)
{
const char *mask;
if (cli->transport->negotiate.protocol <= PROTOCOL_LANMAN1) {
mask = "\\masktest\\*";
}
- f_info_hit = False;
+ f_info_hit = false;
+ last_hit.short_name = talloc_array(mem_ctx, char, MAX_STRING_LEN);
+ last_hit.long_name = talloc_array(mem_ctx, char, MAX_STRING_LEN);
- smbcli_list_new(cli->tree, mask,
- FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY,
+ smbcli_list_new(cli->tree, mask,
+ FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY,
RAW_SEARCH_DATA_BOTH_DIRECTORY_INFO,
listfn, NULL);
if (f_info_hit) {
fstrcpy(short_name, last_hit.short_name);
strlower(short_name);
- pstrcpy(long_name, last_hit.long_name);
+ safe_strcpy(long_name, last_hit.long_name, MAX_STRING_LEN);
strlower(long_name);
}
}
}
-static void testpair(struct smbcli_state *cli, char *mask, char *file)
+static void testpair(TALLOC_CTX *mem_ctx, struct smbcli_state *cli, char *mask,
+ char *file)
{
int fnum;
fstring res1;
char *res2;
static int count;
fstring short_name;
- pstring long_name;
+ char *long_name;
+ long_name = talloc_array(mem_ctx, char, MAX_STRING_LEN);
count++;
fstrcpy(res1, "---");
resultp = res1;
fstrcpy(short_name, "");
- get_real_name(cli, long_name, short_name);
+ get_real_name(mem_ctx, cli, long_name, short_name);
fstrcpy(res1, "---");
smbcli_list_new(cli->tree, mask,
FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY,
resultp = NULL;
}
-static void test_mask(int argc, char *argv[],
+static void test_mask(int argc, char *argv[],
struct smbcli_state *cli)
{
- pstring mask, file;
+ TALLOC_CTX *mem_ctx;
+ char *mask, *file;
int l1, l2, i, l;
int mc_len = strlen(maskchars);
int fc_len = strlen(filechars);
+ mem_ctx = talloc_init("test_mask");
+ mask = talloc_array(mem_ctx, char, MAX_STRING_LEN);
+ file = talloc_array(mem_ctx, char, MAX_STRING_LEN);
+
smbcli_mkdir(cli->tree, "\\masktest");
smbcli_unlink(cli->tree, "\\masktest\\*");
if (argc >= 2) {
while (argc >= 2) {
- pstrcpy(mask,"\\masktest\\");
- pstrcpy(file,"\\masktest\\");
- pstrcat(mask, argv[0]);
- pstrcat(file, argv[1]);
- testpair(cli, mask, file);
+ safe_strcpy(mask,"\\masktest\\", MAX_STRING_LEN);
+ safe_strcpy(file,"\\masktest\\", MAX_STRING_LEN);
+ safe_strcat(mask, argv[0], MAX_STRING_LEN);
+ safe_strcat(file, argv[1], MAX_STRING_LEN);
+ testpair(mem_ctx, cli, mask, file);
argv += 2;
argc -= 2;
}
while (1) {
l1 = 1 + random() % max_length;
l2 = 1 + random() % max_length;
- pstrcpy(mask,"\\masktest\\");
- pstrcpy(file,"\\masktest\\");
+ safe_strcpy(mask,"\\masktest\\", MAX_STRING_LEN);
+ safe_strcpy(file,"\\masktest\\", MAX_STRING_LEN);
l = strlen(mask);
for (i=0;i<l1;i++) {
mask[i+l] = maskchars[random() % mc_len];
if (strspn(file+l, ".") == strlen(file+l)) continue;
- testpair(cli, mask, file);
+ testpair(mem_ctx, cli, mask, file);
if (NumLoops && (--NumLoops == 0))
break;
}
finished:
smbcli_rmdir(cli->tree, "\\masktest");
+ talloc_free(mem_ctx);
}
struct smbcli_state *cli;
int opt;
int seed;
+ struct loadparm_context *lp_ctx;
setlinebuf(stdout);
setup_logging("masktest", DEBUG_STDOUT);
- lp_set_cmdline(global_loadparm, "log level", "0");
-
if (argc < 2 || argv[1][0] == '-') {
usage();
exit(1);
argc -= 1;
argv += 1;
- lp_load();
+ lp_ctx = loadparm_init(talloc_autofree_context());
+ lp_load(lp_ctx, dyn_CONFIGFILE);
credentials = cli_credentials_init(talloc_autofree_context());
- cli_credentials_guess(credentials);
+ cli_credentials_guess(credentials, lp_ctx);
seed = time(NULL);
- init_iconv();
-
while ((opt = getopt(argc, argv, "n:d:U:s:hm:f:aoW:M:vEl:")) != EOF) {
switch (opt) {
case 'n':
verbose++;
break;
case 'M':
- lp_set_cmdline(global_loadparm, "max protocol", optarg);
+ lp_set_cmdline(lp_ctx, "max protocol", optarg);
break;
case 'U':
cli_credentials_parse_string(credentials, optarg, CRED_SPECIFIED);
showall = 1;
break;
case 'o':
- old_list = True;
+ old_list = true;
break;
default:
printf("Unknown option %c (%d)\n", (char)opt, opt);
}
}
- gensec_init();
+ gensec_init(lp_ctx);
argc -= optind;
argv += optind;
- cli = connect_one(share);
+ cli = connect_one(share, lp_smb_ports(lp_ctx));
if (!cli) {
DEBUG(0,("Failed to connect to %s\n", share));
exit(1);
git.samba.org / ira / wip.git / blobdiff