diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-10-17 15:57:07 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-10-17 15:57:07 +1100 |
| commit | c35b0d9ab5d01e37cb06d02083a329e18ae59566 (patch) | |
| tree | 20dd5885cf3da8d030ef69ab0d32bd2fb4207777 /source3/rpcclient/cmd_drsuapi.c | |
| parent | 4fb64f13d5101c960a7a234ff2b0b79283de5589 (diff) | |
| parent | c783d8a32e4d958aec6d943d0fa3de2e7d3a68c2 (diff) | |
| download | samba-c35b0d9ab5d01e37cb06d02083a329e18ae59566.tar.gz samba-c35b0d9ab5d01e37cb06d02083a329e18ae59566.tar.xz samba-c35b0d9ab5d01e37cb06d02083a329e18ae59566.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel
Diffstat (limited to 'source3/rpcclient/cmd_drsuapi.c')
| -rw-r--r-- | source3/rpcclient/cmd_drsuapi.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/source3/rpcclient/cmd_drsuapi.c b/source3/rpcclient/cmd_drsuapi.c index 71757f5ea3..004810eba0 100644 --- a/source3/rpcclient/cmd_drsuapi.c +++ b/source3/rpcclient/cmd_drsuapi.c @@ -495,9 +495,9 @@ static WERROR cmd_drsuapi_getncchanges(struct rpc_pipe_client *cli, if (level_out == 1) { out_level = 1; ctr1 = &ctr.ctr1; - } else if (level_out == 2) { + } else if (level_out == 2 && ctr.ctr2.mszip1.ts) { out_level = 1; - ctr1 = ctr.ctr2.ctr.mszip1.ctr1; + ctr1 = &ctr.ctr2.mszip1.ts->ctr1; } status = cli_get_session_key(mem_ctx, cli, &session_key); @@ -527,9 +527,16 @@ static WERROR cmd_drsuapi_getncchanges(struct rpc_pipe_client *cli, ctr6 = &ctr.ctr6; } else if (level_out == 7 && ctr.ctr7.level == 6 - && ctr.ctr7.type == DRSUAPI_COMPRESSION_TYPE_MSZIP) { + && ctr.ctr7.type == DRSUAPI_COMPRESSION_TYPE_MSZIP + && ctr.ctr7.ctr.mszip6.ts) { out_level = 6; - ctr6 = ctr.ctr7.ctr.mszip6.ctr6; + ctr6 = &ctr.ctr7.ctr.mszip6.ts->ctr6; + } else if (level_out == 7 + && ctr.ctr7.level == 6 + && ctr.ctr7.type == DRSUAPI_COMPRESSION_TYPE_XPRESS + && ctr.ctr7.ctr.xpress6.ts) { + out_level = 6; + ctr6 = &ctr.ctr7.ctr.xpress6.ts->ctr6; } if (out_level == 6) { |