summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafal Szczesniak <mimir@samba.org>2005-04-22 00:32:37 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:11:36 -0500
commitf531686dc4c708b9e1563ba112430291ae9f61bf (patch)
treef92871d2b020fbf9414b211a3ac1ca7f04af4b5c
parent0fc124d7148efe3c20e322cc1b0d6f2c974c0a96 (diff)
downloadsamba-f531686dc4c708b9e1563ba112430291ae9f61bf.tar.gz
samba-f531686dc4c708b9e1563ba112430291ae9f61bf.tar.bz2
samba-f531686dc4c708b9e1563ba112430291ae9f61bf.zip
r6426: DCE/RPC bind string parsing is not needed anymore, as we use
lp_workgroup parameter as domain name to operate on. rafal (This used to be commit ea251d4f79c96145b4c14074d258aeb07c742f41)
-rw-r--r--source4/torture/libnet/userinfo.c11
-rw-r--r--source4/torture/libnet/userman.c26
2 files changed, 4 insertions, 33 deletions
diff --git a/source4/torture/libnet/userinfo.c b/source4/torture/libnet/userinfo.c
index fb54b6a184..bb8392952a 100644
--- a/source4/torture/libnet/userinfo.c
+++ b/source4/torture/libnet/userinfo.c
@@ -225,17 +225,8 @@ BOOL torture_userinfo(void)
DCERPC_SAMR_UUID,
DCERPC_SAMR_VERSION);
- if (!NT_STATUS_IS_OK(status)) {
- return False;
- }
+ if (!NT_STATUS_IS_OK(status)) return False;
- status = dcerpc_parse_binding(mem_ctx, binding, &b);
- if (!NT_STATUS_IS_OK(status)) {
- printf("failed to parse dcerpc binding '%s'\n", binding);
- talloc_free(mem_ctx);
- ret = False;
- goto done;
- }
name.string = lp_workgroup();
if (!test_opendomain(p, mem_ctx, &h, &name, &sid)) {
diff --git a/source4/torture/libnet/userman.c b/source4/torture/libnet/userman.c
index 947d671ae0..c472f00e46 100644
--- a/source4/torture/libnet/userman.c
+++ b/source4/torture/libnet/userman.c
@@ -23,7 +23,7 @@
#include "librpc/gen_ndr/ndr_samr.h"
#include "libnet/composite.h"
-#define TEST_USERNAME "libnetuserinfotest"
+#define TEST_USERNAME "libnetusermantest"
static BOOL test_opendomain(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
@@ -235,17 +235,7 @@ BOOL torture_useradd(void)
DCERPC_SAMR_UUID,
DCERPC_SAMR_VERSION);
- if (!NT_STATUS_IS_OK(status)) {
- return False;
- }
-
- status = dcerpc_parse_binding(mem_ctx, binding, &b);
- if (!NT_STATUS_IS_OK(status)) {
- printf("failed to parse dcerpc binding '%s'\n", binding);
- talloc_free(mem_ctx);
- ret = False;
- goto done;
- }
+ if (!NT_STATUS_IS_OK(status)) return False;
domain_name.string = lp_workgroup();
if (!test_opendomain(p, mem_ctx, &h, &domain_name)) {
@@ -290,17 +280,7 @@ BOOL torture_userdel(void)
DCERPC_SAMR_UUID,
DCERPC_SAMR_VERSION);
- if (!NT_STATUS_IS_OK(status)) {
- return False;
- }
-
- status = dcerpc_parse_binding(mem_ctx, binding, &b);
- if (!NT_STATUS_IS_OK(status)) {
- printf("failed to parse dcerpc binding '%s'\n", binding);
- talloc_free(mem_ctx);
- ret = False;
- goto done;
- }
+ if (!NT_STATUS_IS_OK(status)) return False;
domain_name.string = lp_workgroup();
if (!test_opendomain(p, mem_ctx, &h, &domain_name)) {