summaryrefslogtreecommitdiff
path: root/source3/torture
diff options
context:
space:
mode:
Diffstat (limited to 'source3/torture')
-rw-r--r--source3/torture/cmd_sam.c102
-rw-r--r--source3/torture/samtest.c22
-rw-r--r--source3/torture/samtest.h9
3 files changed, 74 insertions, 59 deletions
diff --git a/source3/torture/cmd_sam.c b/source3/torture/cmd_sam.c
index a2835ed69a..2b4c21e501 100644
--- a/source3/torture/cmd_sam.c
+++ b/source3/torture/cmd_sam.c
@@ -22,27 +22,7 @@
#include "includes.h"
#include "samtest.h"
-#if 0
-static struct cmd_popt_user_opts [] = {
- { NULL, 0, POPT_ARG_CALLBACK, cmd_parse_user_opts },
- {"username", 'u', POPT_ARG_STRING, NULL, 1, "Username to use"},
-};
-
-static void cmd_parse_user_opts(poptContext con,
- enum poptCallbackReason reason,
- const struct poptOption *opt,
- const char *arg, const void *data)
-{
- SAM_ACCOUNT_HANDLE *account = (SAM_ACCOUNT_HANDLE *)data;
- switch(opt->val) {
- case 'u':
- sam_set_account_username(account, arg);
- break;
- }
-}
-#endif
-
-static NTSTATUS cmd_load_module(struct sam_context *c, TALLOC_CTX *mem_ctx, int argc, char **argv)
+static NTSTATUS cmd_load_module(struct samtest_state *st, TALLOC_CTX *mem_ctx, int argc, char **argv)
{
char *plugin_arg[2];
NTSTATUS status;
@@ -54,132 +34,158 @@ static NTSTATUS cmd_load_module(struct sam_context *c, TALLOC_CTX *mem_ctx, int
asprintf(&plugin_arg[0], "plugin:%s", argv[1]);
plugin_arg[1] = NULL;
- if(!NT_STATUS_IS_OK(status = make_sam_context_list(&c, plugin_arg)))
- {
+ if(!NT_STATUS_IS_OK(status = make_sam_context_list(&st->context, plugin_arg))) {
+ free(plugin_arg[0]);
return status;
}
+
+ free(plugin_arg[0]);
+
printf("load: ok\n");
return NT_STATUS_OK;
}
-static NTSTATUS cmd_get_sec_desc(struct sam_context *c, TALLOC_CTX *mem_ctx, int argc, char **argv)
+static NTSTATUS cmd_get_sec_desc(struct samtest_state *st, TALLOC_CTX *mem_ctx, int argc, char **argv)
{
return NT_STATUS_NOT_IMPLEMENTED;
}
-static NTSTATUS cmd_set_sec_desc(struct sam_context *c, TALLOC_CTX *mem_ctx, int argc, char **argv)
+static NTSTATUS cmd_set_sec_desc(struct samtest_state *st, TALLOC_CTX *mem_ctx, int argc, char **argv)
{
return NT_STATUS_NOT_IMPLEMENTED;
}
-static NTSTATUS cmd_lookup_sid(struct sam_context *c, TALLOC_CTX *mem_ctx, int argc, char **argv)
+static NTSTATUS cmd_lookup_sid(struct samtest_state *st, TALLOC_CTX *mem_ctx, int argc, char **argv)
{
- return NT_STATUS_NOT_IMPLEMENTED;
+ char *name;
+ uint32 type;
+ NTSTATUS status;
+ DOM_SID sid;
+ if(argc != 2) {
+ printf("Usage: lookup_sid <sid>\n");
+ return NT_STATUS_INVALID_PARAMETER;
+ }
+
+ if (!string_to_sid(&sid, argv[1])){
+ printf("Unparseable SID specified!\n");
+ return NT_STATUS_INVALID_PARAMETER;
+ }
+
+ if(!NT_STATUS_IS_OK(status = context_sam_lookup_sid(st->context, st->token, &sid, &name, &type))) {
+ printf("context_sam_lookup_sid failed!\n");
+ return status;
+ }
+
+ return NT_STATUS_OK;
}
-static NTSTATUS cmd_lookup_name(struct sam_context *c, TALLOC_CTX *mem_ctx, int argc, char **argv)
+static NTSTATUS cmd_lookup_name(struct samtest_state *st, TALLOC_CTX *mem_ctx, int argc, char **argv)
{
+ if(argc != 2) {
+ printf("Usage: lookup_name <name>\n");
+ return NT_STATUS_INVALID_PARAMETER;
+ }
return NT_STATUS_NOT_IMPLEMENTED;
}
-static NTSTATUS cmd_lookup_account(struct sam_context *c, TALLOC_CTX *mem_ctx, int argc, char **argv)
+static NTSTATUS cmd_lookup_account(struct samtest_state *st, TALLOC_CTX *mem_ctx, int argc, char **argv)
{
return NT_STATUS_NOT_IMPLEMENTED;
}
-static NTSTATUS cmd_lookup_group(struct sam_context *c, TALLOC_CTX *mem_ctx, int argc, char **argv)
+static NTSTATUS cmd_lookup_group(struct samtest_state *st, TALLOC_CTX *mem_ctx, int argc, char **argv)
{
return NT_STATUS_NOT_IMPLEMENTED;
}
-static NTSTATUS cmd_update_domain(struct sam_context *c, TALLOC_CTX *mem_ctx, int argc, char **argv)
+static NTSTATUS cmd_update_domain(struct samtest_state *st, TALLOC_CTX *mem_ctx, int argc, char **argv)
{
return NT_STATUS_NOT_IMPLEMENTED;
}
-static NTSTATUS cmd_show_domain(struct sam_context *c, TALLOC_CTX *mem_ctx, int argc, char **argv)
+static NTSTATUS cmd_show_domain(struct samtest_state *st, TALLOC_CTX *mem_ctx, int argc, char **argv)
{
return NT_STATUS_NOT_IMPLEMENTED;
}
-static NTSTATUS cmd_create_account(struct sam_context *c, TALLOC_CTX *mem_ctx, int argc, char **argv)
+static NTSTATUS cmd_create_account(struct samtest_state *st, TALLOC_CTX *mem_ctx, int argc, char **argv)
{
return NT_STATUS_NOT_IMPLEMENTED;
}
-static NTSTATUS cmd_update_account(struct sam_context *c, TALLOC_CTX *mem_ctx, int argc, char **argv)
+static NTSTATUS cmd_update_account(struct samtest_state *st, TALLOC_CTX *mem_ctx, int argc, char **argv)
{
return NT_STATUS_NOT_IMPLEMENTED;
}
-static NTSTATUS cmd_delete_account(struct sam_context *c, TALLOC_CTX *mem_ctx, int argc, char **argv)
+static NTSTATUS cmd_delete_account(struct samtest_state *st, TALLOC_CTX *mem_ctx, int argc, char **argv)
{
return NT_STATUS_NOT_IMPLEMENTED;
}
-static NTSTATUS cmd_enum_accounts(struct sam_context *c, TALLOC_CTX *mem_ctx, int argc, char **argv)
+static NTSTATUS cmd_enum_accounts(struct samtest_state *st, TALLOC_CTX *mem_ctx, int argc, char **argv)
{
return NT_STATUS_NOT_IMPLEMENTED;
}
-static NTSTATUS cmd_lookup_account_sid(struct sam_context *c, TALLOC_CTX *mem_ctx, int argc, char **argv)
+static NTSTATUS cmd_lookup_account_sid(struct samtest_state *st, TALLOC_CTX *mem_ctx, int argc, char **argv)
{
return NT_STATUS_NOT_IMPLEMENTED;
}
-static NTSTATUS cmd_lookup_account_name(struct sam_context *c, TALLOC_CTX *mem_ctx, int argc, char **argv)
+static NTSTATUS cmd_lookup_account_name(struct samtest_state *st, TALLOC_CTX *mem_ctx, int argc, char **argv)
{
return NT_STATUS_NOT_IMPLEMENTED;
}
-static NTSTATUS cmd_create_group(struct sam_context *c, TALLOC_CTX *mem_ctx, int argc, char **argv)
+static NTSTATUS cmd_create_group(struct samtest_state *st, TALLOC_CTX *mem_ctx, int argc, char **argv)
{
return NT_STATUS_NOT_IMPLEMENTED;
}
-static NTSTATUS cmd_update_group(struct sam_context *c, TALLOC_CTX *mem_ctx, int argc, char **argv)
+static NTSTATUS cmd_update_group(struct samtest_state *st, TALLOC_CTX *mem_ctx, int argc, char **argv)
{
return NT_STATUS_NOT_IMPLEMENTED;
}
-static NTSTATUS cmd_delete_group(struct sam_context *c, TALLOC_CTX *mem_ctx, int argc, char **argv)
+static NTSTATUS cmd_delete_group(struct samtest_state *st, TALLOC_CTX *mem_ctx, int argc, char **argv)
{
return NT_STATUS_NOT_IMPLEMENTED;
}
-static NTSTATUS cmd_enum_groups(struct sam_context *c, TALLOC_CTX *mem_ctx, int argc, char **argv)
+static NTSTATUS cmd_enum_groups(struct samtest_state *st, TALLOC_CTX *mem_ctx, int argc, char **argv)
{
return NT_STATUS_NOT_IMPLEMENTED;
}
-static NTSTATUS cmd_lookup_group_sid(struct sam_context *c, TALLOC_CTX *mem_ctx, int argc, char **argv)
+static NTSTATUS cmd_lookup_group_sid(struct samtest_state *st, TALLOC_CTX *mem_ctx, int argc, char **argv)
{
return NT_STATUS_NOT_IMPLEMENTED;
}
-static NTSTATUS cmd_lookup_group_name(struct sam_context *c, TALLOC_CTX *mem_ctx, int argc, char **argv)
+static NTSTATUS cmd_lookup_group_name(struct samtest_state *st, TALLOC_CTX *mem_ctx, int argc, char **argv)
{
return NT_STATUS_NOT_IMPLEMENTED;
}
-static NTSTATUS cmd_group_add_member(struct sam_context *c, TALLOC_CTX *mem_ctx, int argc, char **argv)
+static NTSTATUS cmd_group_add_member(struct samtest_state *st, TALLOC_CTX *mem_ctx, int argc, char **argv)
{
return NT_STATUS_NOT_IMPLEMENTED;
}
-static NTSTATUS cmd_group_del_member(struct sam_context *c, TALLOC_CTX *mem_ctx, int argc, char **argv)
+static NTSTATUS cmd_group_del_member(struct samtest_state *st, TALLOC_CTX *mem_ctx, int argc, char **argv)
{
return NT_STATUS_NOT_IMPLEMENTED;
}
-static NTSTATUS cmd_group_enum(struct sam_context *c, TALLOC_CTX *mem_ctx, int argc, char **argv)
+static NTSTATUS cmd_group_enum(struct samtest_state *st, TALLOC_CTX *mem_ctx, int argc, char **argv)
{
return NT_STATUS_NOT_IMPLEMENTED;
}
-static NTSTATUS cmd_get_sid_groups(struct sam_context *c, TALLOC_CTX *mem_ctx, int argc, char **argv)
+static NTSTATUS cmd_get_sid_groups(struct samtest_state *st, TALLOC_CTX *mem_ctx, int argc, char **argv)
{
return NT_STATUS_NOT_IMPLEMENTED;
}
diff --git a/source3/torture/samtest.c b/source3/torture/samtest.c
index 0275e0f002..e68ff5a0bf 100644
--- a/source3/torture/samtest.c
+++ b/source3/torture/samtest.c
@@ -54,7 +54,7 @@ static char* next_command (char** cmdstr)
}
/* Display help on commands */
-static NTSTATUS cmd_help(struct sam_context *sam, TALLOC_CTX *mem_ctx,
+static NTSTATUS cmd_help(struct samtest_state *st, TALLOC_CTX *mem_ctx,
int argc, char **argv)
{
struct cmd_list *tmp;
@@ -112,7 +112,7 @@ static NTSTATUS cmd_help(struct sam_context *sam, TALLOC_CTX *mem_ctx,
}
/* Change the debug level */
-static NTSTATUS cmd_debuglevel(struct sam_context *sam, TALLOC_CTX *mem_ctx, int argc, char **argv)
+static NTSTATUS cmd_debuglevel(struct samtest_state *st, TALLOC_CTX *mem_ctx, int argc, char **argv)
{
if (argc > 2) {
printf("Usage: %s [debuglevel]\n", argv[0]);
@@ -128,7 +128,7 @@ static NTSTATUS cmd_debuglevel(struct sam_context *sam, TALLOC_CTX *mem_ctx, int
return NT_STATUS_OK;
}
-static NTSTATUS cmd_quit(struct sam_context *sam, TALLOC_CTX *mem_ctx, int argc, char **argv)
+static NTSTATUS cmd_quit(struct samtest_state *st, TALLOC_CTX *mem_ctx, int argc, char **argv)
{
/* Cleanup */
talloc_destroy(mem_ctx);
@@ -185,7 +185,7 @@ static void add_command_set(struct cmd_set *cmd_set)
DLIST_ADD(cmd_list, entry);
}
-static NTSTATUS do_cmd(struct sam_context *sam, struct cmd_set *cmd_entry, char *cmd)
+static NTSTATUS do_cmd(struct samtest_state *st, struct cmd_set *cmd_entry, char *cmd)
{
char *p = cmd, **argv = NULL;
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -237,7 +237,7 @@ static NTSTATUS do_cmd(struct sam_context *sam, struct cmd_set *cmd_entry, char
}
/* Run command */
- result = cmd_entry->fn(sam, mem_ctx, argc, argv);
+ result = cmd_entry->fn(st, mem_ctx, argc, argv);
} else {
fprintf (stderr, "Invalid command\n");
@@ -259,7 +259,7 @@ static NTSTATUS do_cmd(struct sam_context *sam, struct cmd_set *cmd_entry, char
}
/* Process a command entered at the prompt or as part of -c */
-static NTSTATUS process_cmd(struct sam_context *sam, char *cmd)
+static NTSTATUS process_cmd(struct samtest_state *st, char *cmd)
{
struct cmd_list *temp_list;
BOOL found = False;
@@ -288,7 +288,7 @@ static NTSTATUS process_cmd(struct sam_context *sam, char *cmd)
while(temp_set->name) {
if (strequal(buf, temp_set->name)) {
found = True;
- result = do_cmd(sam, temp_set, cmd);
+ result = do_cmd(st, temp_set, cmd);
goto done;
}
@@ -339,7 +339,7 @@ int main(int argc, char *argv[])
pstring logfile;
struct cmd_set **cmd_set;
extern BOOL AllowDebugChange;
- static struct sam_context sam;
+ struct samtest_state st;
/* make sure the vars that get altered (4th field) are in
@@ -353,6 +353,8 @@ int main(int argc, char *argv[])
{ 0, 0, 0, 0}
};
+ ZERO_STRUCT(st);
+
setlinebuf(stdout);
DEBUGLEVEL = 1;
@@ -397,7 +399,7 @@ int main(int argc, char *argv[])
char *p = cmdstr;
while((cmd=next_command(&p)) != NULL) {
- process_cmd(&sam, cmd);
+ process_cmd(&st, cmd);
}
return 0;
@@ -417,7 +419,7 @@ int main(int argc, char *argv[])
break;
if (line[0] != '\n')
- process_cmd(&sam, line);
+ process_cmd(&st, line);
}
return 0;
diff --git a/source3/torture/samtest.h b/source3/torture/samtest.h
index 2a8516cfc3..a136ab191e 100644
--- a/source3/torture/samtest.h
+++ b/source3/torture/samtest.h
@@ -22,10 +22,17 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+struct samtest_state {
+ SAM_CONTEXT *context;
+ NT_USER_TOKEN *token;
+};
+
struct cmd_set {
char *name;
- NTSTATUS (*fn)(struct sam_context *sam, TALLOC_CTX *mem_ctx, int argc,
+ NTSTATUS (*fn)(struct samtest_state *sam, TALLOC_CTX *mem_ctx, int argc,
char **argv);
char *description;
char *usage;
};
+
+
generated by cgit (git 2.34.1) at 2024-11-11 08:25:59 +0000