diff options
| author | Volker Lendecke <vl@samba.org> | 2015-03-03 08:48:00 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2015-03-03 13:14:53 +0100 |
| commit | 38628b1e32cb480cbd0cef57a34a9fe0216f344c (patch) | |
| tree | d39fb17f31ef0f0c0f42f39c829d3d050a7e0f7e /source4/rpc_server/samr | |
| parent | b3385f74db54bd8a07a0be5515151b633c067da4 (diff) | |
| download | samba-38628b1e32cb480cbd0cef57a34a9fe0216f344c.tar.gz samba-38628b1e32cb480cbd0cef57a34a9fe0216f344c.tar.xz samba-38628b1e32cb480cbd0cef57a34a9fe0216f344c.zip | |
Fix the O3 developer build
Different gcc versions complain at different places
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Tue Mar 3 13:14:53 CET 2015 on sn-devel-104
Diffstat (limited to 'source4/rpc_server/samr')
| -rw-r--r-- | source4/rpc_server/samr/dcesrv_samr.c | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c index c0bec437c2..bf2174c771 100644 --- a/source4/rpc_server/samr/dcesrv_samr.c +++ b/source4/rpc_server/samr/dcesrv_samr.c @@ -1239,13 +1239,16 @@ static NTSTATUS dcesrv_samr_CreateUser(struct dcesrv_call_state *dce_call, TALLO /* a simple wrapper around samr_CreateUser2 works nicely */ - r2.in.domain_handle = r->in.domain_handle; - r2.in.account_name = r->in.account_name; - r2.in.acct_flags = ACB_NORMAL; - r2.in.access_mask = r->in.access_mask; - r2.out.user_handle = r->out.user_handle; - r2.out.access_granted = &access_granted; - r2.out.rid = r->out.rid; + + r2 = (struct samr_CreateUser2) { + .in.domain_handle = r->in.domain_handle, + .in.account_name = r->in.account_name, + .in.acct_flags = ACB_NORMAL, + .in.access_mask = r->in.access_mask, + .out.user_handle = r->out.user_handle, + .out.access_granted = &access_granted, + .out.rid = r->out.rid + }; return dcesrv_samr_CreateUser2(dce_call, mem_ctx, &r2); } @@ -4007,9 +4010,11 @@ static NTSTATUS dcesrv_samr_QueryUserInfo2(struct dcesrv_call_state *dce_call, T struct samr_QueryUserInfo r1; NTSTATUS status; - r1.in.user_handle = r->in.user_handle; - r1.in.level = r->in.level; - r1.out.info = r->out.info; + r1 = (struct samr_QueryUserInfo) { + .in.user_handle = r->in.user_handle, + .in.level = r->in.level, + .out.info = r->out.info + }; status = dcesrv_samr_QueryUserInfo(dce_call, mem_ctx, &r1); |