Torture suite: Revert some changes because they aren't necessary

This reverts some changes made by me because they aren't necessary. The "ZERO_STRUCT"'s remain in.

diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c
index 7017233cab38cd6e11e95af8755f57aeff63ee62..17342f9b867eeb2493bb41cb1be3559227b1267a 100644 (file)
--- a/source4/torture/rpc/samba3rpc.c
+++ b/source4/torture/rpc/samba3rpc.c
@@ -2897,7 +2897,6 @@ static NTSTATUS enumvalues(struct dcerpc_pipe *p, struct policy_handle *handle,
                r.in.handle = handle;
                r.in.enum_index = enum_index;
                name.name = "";
-               name.length = 0;
                name.size = 1024;
                r.in.name = r.out.name = &name;
                size = 1024;
@@ -2928,7 +2927,6 @@ static NTSTATUS enumkeys(struct dcerpc_pipe *p, struct policy_handle *handle,
        }
 
        class.name   = "";
-       class.length = 0;
        class.size   = 1024;
 
        r.in.handle = handle;
@@ -2949,7 +2947,6 @@ static NTSTATUS enumkeys(struct dcerpc_pipe *p, struct policy_handle *handle,
                }
 
                name.name = NULL;
-               name.length = 0;
                name.size = 1024;
 
                status = dcerpc_winreg_EnumKey(p, tmp_ctx, &r);
@@ -2966,8 +2963,6 @@ static NTSTATUS enumkeys(struct dcerpc_pipe *p, struct policy_handle *handle,
 
                o.in.parent_handle = handle;
                o.in.keyname.name = r.out.name->name;
-               o.in.keyname.name_len = strlen(o.in.keyname.name);
-               o.in.keyname.name_size = 1024;
                o.in.unknown = 0;
                o.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
                o.out.handle = &key_handle;
@@ -3220,8 +3215,6 @@ static NTSTATUS torture_samba3_createshare(struct smbcli_state *cli,
                goto fail;
        }
        c.in.keyclass.name = "";
-       c.in.keyclass.name_len = 0;
-       c.in.keyclass.name_size = 1024;
        c.in.options = 0;
        c.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        c.in.secdesc = NULL;
@@ -3279,8 +3272,6 @@ static NTSTATUS torture_samba3_deleteshare(struct torture_context *torture,
                status = NT_STATUS_NO_MEMORY;
                goto fail;
        }
-       d.in.key.name_len = strlen(d.in.key.name);
-       d.in.key.name_size = 1024;
        status = dcerpc_winreg_DeleteKey(p, p, &d);
        if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(d.out.result)) {
                d_printf("(%s) OpenKey failed: %s, %s\n", __location__,
@@ -3321,8 +3312,6 @@ static NTSTATUS torture_samba3_setconfig(struct smbcli_state *cli,
                status = NT_STATUS_NO_MEMORY;
                goto done;
        }
-       o.in.keyname.name_len = strlen(o.in.keyname.name);
-       o.in.keyname.name_size = 1024;
        o.in.unknown = 0;
        o.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        o.out.handle = &key_handle;
@@ -3342,8 +3331,6 @@ static NTSTATUS torture_samba3_setconfig(struct smbcli_state *cli,
 
        s.in.handle = &key_handle;
        s.in.name.name = parameter;
-       s.in.name.name_len = strlen(s.in.name.name);
-       s.in.name.name_size = 1024;
        s.in.type = type;
        s.in.data = val.data;
        s.in.size = val.length;

diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index eb439bd5f6ab7435b7341b3ce006a92d8d043bbc..898813f807563247ee6b51cfd78f6abf55136e37 100644 (file)
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -1440,7 +1440,6 @@ static bool test_EnumKey(struct dcerpc_pipe *p, struct torture_context *tctx,
        NTTIME t = 0;
 
        class.name   = "";
-       class.length = 0;
        class.size   = 1024;
 
        ZERO_STRUCT(r);
@@ -1453,7 +1452,6 @@ static bool test_EnumKey(struct dcerpc_pipe *p, struct torture_context *tctx,
 
        do {
                name.name   = NULL;
-               name.length = 0;
                name.size   = 1024;
 
                status = dcerpc_winreg_EnumKey(p, tctx, &r);
@@ -1568,7 +1566,6 @@ static bool test_EnumValue(struct dcerpc_pipe *p, struct torture_context *tctx,
        struct winreg_StringBuf name;
 
        name.name   = "";
-       name.length = 0;
        name.size   = 1024;
 
        ZERO_STRUCT(r);