diff options
| author | Günther Deschner <gd@samba.org> | 2008-10-29 21:04:31 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2008-10-31 02:44:29 +0100 |
| commit | 0b95cb251ce0043e393139a22a0f3ac6121406c5 (patch) | |
| tree | 8bc527f53d2abf8c8768ac7d581c3cf9ba0a5280 /source4/torture/rpc | |
| parent | 4b8606f616cdd2fe885729a044d6139fc0001780 (diff) | |
| download | samba-0b95cb251ce0043e393139a22a0f3ac6121406c5.tar.gz samba-0b95cb251ce0043e393139a22a0f3ac6121406c5.tar.bz2 samba-0b95cb251ce0043e393139a22a0f3ac6121406c5.zip | |
s4-srvsvc: merge srvsvc_NetShareInfo502 from s3.
Apparently both s3 and s4 are not entirely correct one this. metze is looking
into hand-marshalling security descriptors so this will fix this finally. For
now, just keep the two in sync.
Guenther
Diffstat (limited to 'source4/torture/rpc')
| -rw-r--r-- | source4/torture/rpc/samba3rpc.c | 2 | ||||
| -rw-r--r-- | source4/torture/rpc/srvsvc.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c index c53c4b72c7..5aff213533 100644 --- a/source4/torture/rpc/samba3rpc.c +++ b/source4/torture/rpc/samba3rpc.c @@ -2153,7 +2153,7 @@ static struct security_descriptor *get_sharesec(TALLOC_CTX *mem_ctx, return NULL; } - result = talloc_steal(mem_ctx, r.out.info.info502->sd); + result = talloc_steal(mem_ctx, r.out.info.info502->sd_buf.sd); talloc_free(tmp_ctx); return result; } diff --git a/source4/torture/rpc/srvsvc.c b/source4/torture/rpc/srvsvc.c index 1fe1221b0d..9b475ab826 100644 --- a/source4/torture/rpc/srvsvc.c +++ b/source4/torture/rpc/srvsvc.c @@ -444,6 +444,7 @@ static bool test_NetShareAddSetDel(struct torture_context *tctx, struct srvsvc_NetShareSetInfo r; struct srvsvc_NetShareGetInfo q; struct srvsvc_NetShareDel d; + struct sec_desc_buf sd_buf; struct { uint32_t level; WERROR expected; @@ -524,6 +525,7 @@ static bool test_NetShareAddSetDel(struct torture_context *tctx, r.in.info.info501->csc_policy = 0; break; case 502: + ZERO_STRUCT(sd_buf); r.in.info.info502 = talloc(tctx, struct srvsvc_NetShareInfo502); r.in.info.info502->name = r.in.share_name; r.in.info.info502->type = STYPE_DISKTREE; @@ -533,8 +535,7 @@ static bool test_NetShareAddSetDel(struct torture_context *tctx, r.in.info.info502->current_users = 1; r.in.info.info502->path = talloc_strdup(tctx, "C:\\"); r.in.info.info502->password = NULL; - r.in.info.info502->unknown = 0; - r.in.info.info502->sd = NULL; + r.in.info.info502->sd_buf = sd_buf; break; case 1004: r.in.info.info1004 = talloc(tctx, struct srvsvc_NetShareInfo1004); |