[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Tue Sep 5 07:31:02 UTC 2023
The branch, master has been updated
via 0e244ff79b6 s3:torture: Remove masktest.c
from 3fbc514a2c3 docs:smbdotconf: Inform that changing 'winbind max domain connections' needs a restart
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0e244ff79b6d481ac995411070f83471b2e6ac40
Author: Andreas Schneider <asn at samba.org>
Date: Mon Sep 4 16:49:39 2023 +0200
s3:torture: Remove masktest.c
The file is not built.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Tue Sep 5 07:30:12 UTC 2023 on atb-devel-224
-----------------------------------------------------------------------
Summary of changes:
source3/torture/masktest.c | 581 ---------------------------------------------
1 file changed, 581 deletions(-)
delete mode 100644 source3/torture/masktest.c
Changeset truncated at 500 lines:
diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c
deleted file mode 100644
index d7485cfb5eb..00000000000
--- a/source3/torture/masktest.c
+++ /dev/null
@@ -1,581 +0,0 @@
-/*
- 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"
-#include "lib/util/string_wrappers.h"
-
-static fstring password;
-static fstring username;
-static int got_pass;
-static struct cli_credentials *test_creds;
-static int max_protocol = -1;
-static bool showall = False;
-static bool old_list = False;
-static const char *maskchars = "<>\"?*abc.";
-static const char *filechars = "abcdefghijklm.";
-static int verbose;
-static int die_on_error;
-static int NumLoops = 0;
-static int ignore_dot_errors = 0;
-
-extern char *optarg;
-extern int optind;
-
-/* a test fn for LANMAN mask support */
-static int ms_fnmatch_lanman_core(const char *pattern, const char *string)
-{
- const char *p = pattern, *n = string;
- char c;
-
- if (strcmp(p,"?")==0 && strcmp(n,".")==0) goto match;
-
- while ((c = *p++)) {
- switch (c) {
- case '.':
- /* if (! *n && ! *p) goto match; */
- if (*n != '.') goto nomatch;
- n++;
- break;
-
- case '?':
- if ((*n == '.' && n[1] != '.') || ! *n) goto next;
- n++;
- break;
-
- case '>':
- if (n[0] == '.') {
- if (! n[1] && ms_fnmatch_lanman_core(p, n+1) == 0) goto match;
- if (ms_fnmatch_lanman_core(p, n) == 0) goto match;
- goto nomatch;
- }
- if (! *n) goto next;
- n++;
- break;
-
- case '*':
- if (! *p) goto match;
- for (; *n; n++) {
- if (ms_fnmatch_lanman_core(p, n) == 0) goto match;
- }
- break;
-
- case '<':
- for (; *n; n++) {
- if (ms_fnmatch_lanman_core(p, n) == 0) goto match;
- if (*n == '.' && !strchr_m(n+1,'.')) {
- n++;
- break;
- }
- }
- break;
-
- case '"':
- if (*n == 0 && ms_fnmatch_lanman_core(p, n) == 0) goto match;
- if (*n != '.') goto nomatch;
- n++;
- break;
-
- default:
- if (c != *n) goto nomatch;
- n++;
- }
- }
-
- if (! *n) goto match;
-
- nomatch:
- if (verbose) printf("NOMATCH pattern=[%s] string=[%s]\n", pattern, string);
- return -1;
-
-next:
- if (ms_fnmatch_lanman_core(p, n) == 0) goto match;
- goto nomatch;
-
- match:
- if (verbose) printf("MATCH pattern=[%s] string=[%s]\n", pattern, string);
- return 0;
-}
-
-static int ms_fnmatch_lanman(const char *pattern, const char *string)
-{
- if (!strpbrk(pattern, "?*<>\"")) {
- if (strcmp(string,"..") == 0)
- string = ".";
-
- return strcmp(pattern, string);
- }
-
- if (strcmp(string,"..") == 0 || strcmp(string,".") == 0) {
- return ms_fnmatch_lanman_core(pattern, "..") &&
- ms_fnmatch_lanman_core(pattern, ".");
- }
-
- return ms_fnmatch_lanman_core(pattern, string);
-}
-
-static bool reg_match_one(struct cli_state *cli, const char *pattern, const char *file)
-{
- /* oh what a weird world this is */
- if (old_list && strcmp(pattern, "*.*") == 0) return True;
-
- if (strcmp(pattern,".") == 0) return False;
-
- if (max_protocol <= PROTOCOL_LANMAN2) {
- return ms_fnmatch_lanman(pattern, file)==0;
- }
-
- if (strcmp(file,"..") == 0) file = ".";
-
- 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 fstring ret;
- const char *new_pattern = 1+strrchr_m(pattern,'\\');
-
- fstrcpy(ret, "---");
- if (reg_match_one(cli, new_pattern, ".")) ret[0] = '+';
- if (reg_match_one(cli, new_pattern, "..")) ret[1] = '+';
- if (reg_match_one(cli, new_pattern, long_name) ||
- (*short_name && reg_match_one(cli, new_pattern, short_name))) ret[2] = '+';
- return ret;
-}
-
-
-/*****************************************************
-return a connection to a server
-*******************************************************/
-static struct cli_state *connect_one(char *share)
-{
- struct cli_state *c;
- char *server_n;
- char *server;
- NTSTATUS status;
-
- server = share+2;
- share = strchr_m(server,'\\');
- if (!share) return NULL;
- *share = 0;
- share++;
-
- server_n = server;
-
- 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)));
- return NULL;
- }
-
- 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)));
- cli_shutdown(c);
- return NULL;
- }
-
- status = cli_session_setup_creds(c, test_creds);
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("session setup failed: %s\n", nt_errstr(status)));
- return NULL;
- }
-
- /*
- * These next two lines are needed to emulate
- * old client behaviour for people who have
- * scripts based on client output.
- * QUESTION ? Do we want to have a 'client compatibility
- * mode to turn these on/off ? JRA.
- */
-
- if (*c->server_domain || *c->server_os || *c->server_type)
- DEBUG(1,("Domain=[%s] OS=[%s] Server=[%s]\n",
- c->server_domain,c->server_os,c->server_type));
-
- DEBUG(4,(" session setup ok\n"));
-
- status = cli_tree_connect_creds(c, share, "?????", test_creds);
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0,("tree connect failed: %s\n", nt_errstr(status)));
- cli_shutdown(c);
- return NULL;
- }
-
- DEBUG(4,(" tconx ok\n"));
-
- return c;
-}
-
-static char *resultp;
-
-struct rn_state {
- char **pp_long_name;
- char *short_name;
-};
-
-static NTSTATUS listfn(
- struct file_info *f,
- const char *s,
- void *private_data)
-{
- struct rn_state *state = (struct rn_state *)private_data;
- if (strcmp(f->name,".") == 0) {
- resultp[0] = '+';
- } else if (strcmp(f->name,"..") == 0) {
- resultp[1] = '+';
- } else {
- resultp[2] = '+';
- }
-
- if (state == NULL) {
- return NT_STATUS_INTERNAL_ERROR;
- }
-
- if (ISDOT(f->name) || ISDOTDOT(f->name)) {
- return NT_STATUS_OK;
- }
-
-
- 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;
- }
- (void)strlower_m(*state->pp_long_name);
- return NT_STATUS_OK;
-}
-
-static void get_real_name(struct cli_state *cli,
- char **pp_long_name, fstring short_name)
-{
- struct rn_state state;
-
- state.pp_long_name = pp_long_name;
- state.short_name = short_name;
-
- *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 | FILE_ATTRIBUTE_DIRECTORY,
- SMB_FIND_FILE_BOTH_DIRECTORY_INFO, listfn,
- &state);
- } else {
- cli_list_trans(cli, "\\masktest\\*", FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY,
- SMB_FIND_FILE_BOTH_DIRECTORY_INFO,
- listfn, &state);
- }
-
- if (*short_name == 0) {
- fstrcpy(short_name, *pp_long_name);
- }
-
-#if 0
- if (!strchr_m(short_name,'.')) {
- fstrcat(short_name,".");
- }
-#endif
-}
-
-static void testpair(struct cli_state *cli, const char *mask, const char *file)
-{
- uint16_t fnum;
- fstring res1;
- char *res2;
- static int count;
- fstring short_name;
- char *long_name = NULL;
-
- count++;
-
- fstrcpy(res1, "---");
-
- 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;
- }
- cli_close(cli, fnum);
-
- resultp = res1;
- fstrcpy(short_name, "");
- get_real_name(cli, &long_name, short_name);
- if (!long_name) {
- return;
- }
- fstrcpy(res1, "---");
- cli_list(cli, mask, FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY, listfn, NULL);
-
- res2 = reg_test(cli, mask, long_name, short_name);
-
- if (showall ||
- ((strcmp(res1, res2) && !ignore_dot_errors) ||
- (strcmp(res1+2, res2+2) && ignore_dot_errors))) {
- DEBUG(0,("%s %s %d mask=[%s] file=[%s] rfile=[%s/%s]\n",
- res1, res2, count, mask, file, long_name, short_name));
- if (die_on_error) exit(1);
- }
-
- cli_unlink(cli, file, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
-
- if (count % 100 == 0) DEBUG(0,("%d\n", count));
- SAFE_FREE(long_name);
-}
-
-static void test_mask(int argc, char *argv[],
- struct cli_state *cli)
-{
- char *mask, *file;
- int l1, l2, i, l;
- int mc_len = strlen(maskchars);
- int fc_len = strlen(filechars);
- TALLOC_CTX *ctx = talloc_tos();
-
- torture_deltree(cli, "\\masktest");
- cli_mkdir(cli, "\\masktest");
-
- if (argc >= 2) {
- while (argc >= 2) {
- mask = talloc_asprintf(ctx,
- "\\masktest\\%s",
- argv[0]);
- file = talloc_asprintf(ctx,
- "\\masktest\\%s",
- argv[1]);
- if (!mask || !file) {
- goto finished;
- }
- testpair(cli, mask, file);
- argv += 2;
- argc -= 2;
- }
- goto finished;
- }
-
- 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);
- if (!mask || !file) {
- goto finished;
- }
- memcpy(mask,"\\masktest\\",strlen("\\masktest\\")+1);
- memcpy(file,"\\masktest\\",strlen("\\masktest\\")+1);
- l = strlen(mask);
- for (i=0;i<l1;i++) {
- mask[i+l] = maskchars[random() % mc_len];
- }
- mask[l+l1] = 0;
-
- for (i=0;i<l2;i++) {
- file[i+l] = filechars[random() % fc_len];
- }
- file[l+l2] = 0;
-
- if (strcmp(file+l,".") == 0 ||
- strcmp(file+l,"..") == 0 ||
- strcmp(mask+l,"..") == 0) continue;
-
- if (strspn(file+l, ".") == strlen(file+l)) continue;
-
- testpair(cli, mask, file);
- if (NumLoops && (--NumLoops == 0))
- break;
- TALLOC_FREE(mask);
- TALLOC_FREE(file);
- }
-
- finished:
- cli_rmdir(cli, "\\masktest");
-}
-
-
-static void usage(void)
-{
- printf(
-"Usage:\n\
- masktest //server/share [options..]\n\
- options:\n\
- -d debuglevel\n\
- -n numloops\n\
- -W workgroup\n\
- -U user%%pass\n\
- -s seed\n\
- -M max protocol\n\
- -f filechars (default %s)\n\
- -m maskchars (default %s)\n\
- -v verbose mode\n\
- -E die on error\n\
- -a show all tests\n\
- -i ignore . and .. errors\n\
-\n\
- This program tests wildcard matching between two servers. It generates\n\
- random pairs of filenames/masks and tests that they match in the same\n\
- way on the servers and internally\n\
-",
- filechars, maskchars);
-}
-
-/****************************************************************************
- main program
-****************************************************************************/
- int main(int argc,char *argv[])
-{
- char *share;
- struct cli_state *cli;
- int opt;
- char *p;
- int seed;
- TALLOC_CTX *frame = talloc_stackframe();
-
- setlinebuf(stdout);
-
- lp_set_cmdline("log level", "0");
-
- if (argc < 2 || argv[1][0] == '-') {
- usage();
- exit(1);
- }
-
- share = argv[1];
-
- all_string_sub(share,"/","\\",0);
-
- setup_logging(argv[0], DEBUG_STDERR);
-
- argc -= 1;
- argv += 1;
-
- smb_init_locale();
- lp_load_global(get_dyn_CONFIGFILE());
- load_interfaces();
-
- if (getenv("USER")) {
- fstrcpy(username,getenv("USER"));
- }
-
- seed = time(NULL);
-
- while ((opt = getopt(argc, argv, "n:d:U:s:hm:f:aoW:M:vEi")) != EOF) {
- switch (opt) {
- case 'n':
- NumLoops = atoi(optarg);
- break;
- case 'd':
- lp_set_cmdline("log level", optarg);
- break;
- case 'E':
- die_on_error = 1;
- break;
--
Samba Shared Repository
More information about the samba-cvs
mailing list