Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Sun, 18 Jan 2009 15:19:39 +0000 (16:19 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 18 Jan 2009 15:19:39 +0000 (16:19 +0100)
29 files changed:
librpc/gen_ndr/eventlog.h
librpc/gen_ndr/ndr_drsuapi.c
librpc/gen_ndr/ndr_eventlog.c
librpc/gen_ndr/ndr_lsa.c
librpc/gen_ndr/ndr_netlogon.c
librpc/gen_ndr/ndr_samr.c
librpc/gen_ndr/ndr_security.c
librpc/gen_ndr/ndr_svcctl.c
librpc/idl/eventlog.idl
pidl/lib/Parse/Pidl/Compat.pm
pidl/lib/Parse/Pidl/NDR.pm
pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
pidl/lib/Parse/Pidl/Typelist.pm
source3/include/libsmb_internal.h
source3/include/libsmbclient.h
source3/include/proto.h
source3/include/rpc_client.h
source3/lib/util_sock.c
source3/libads/ldap.c
source3/librpc/rpc/dcerpc.c
source3/libsmb/libsmb_context.c
source3/libsmb/libsmb_dir.c
source3/libsmb/libsmb_path.c
source3/libsmb/libsmb_server.c
source3/libsmb/libsmb_setget.c
source3/rpc_client/cli_pipe.c
source3/rpc_client/ndr.c
source3/rpc_parse/parse_prs.c
source3/rpc_server/srv_samr_nt.c

index 65178d203c9675c0be6a42298ae2efd18671a492..9c9a2ed2185812a0f22d58a361f4d566ed525699 100644 (file)
@@ -47,7 +47,7 @@ struct eventlog_Record {
        time_t time_written;
        uint32_t event_id;
        enum eventlogEventTypes event_type;
-       uint16_t num_of_strings;/* [max(256)] */
+       uint16_t num_of_strings;/* [range(0,256)] */
        uint16_t event_category;
        uint16_t reserved_flags;
        uint32_t closing_record_number;
index 369a1d44e01ed4e4983f3489cb1ace0b3fc8fb67..336f56f6ad211647bd42ffed222328169c161d58 100644 (file)
@@ -811,7 +811,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsReplicaCursorCtrEx(struct ndr_pull *
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->version));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->reserved1));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
-               if (r->count < 0 || r->count > 0x100000) {
+               if (r->count > 0x100000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->reserved2));
@@ -1166,7 +1166,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_drsuapi_DsReplicaOIDMapping_Ctr(struct ndr_p
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 4));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_mappings));
-               if (r->num_mappings < 0 || r->num_mappings > 0x100000) {
+               if (r->num_mappings > 0x100000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_mappings));
@@ -1700,7 +1700,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsReplicaCursor2CtrEx(struct ndr_pull
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->version));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->reserved1));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
-               if (r->count < 0 || r->count > 0x100000) {
+               if (r->count > 0x100000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->reserved2));
@@ -1764,7 +1764,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsAttributeValue(struct ndr_pull *ndr,
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 4));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->__ndr_size));
-               if (r->__ndr_size < 0 || r->__ndr_size > 10485760) {
+               if (r->__ndr_size > 10485760) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_blob));
@@ -1830,7 +1830,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsAttributeValueCtr(struct ndr_pull *n
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 4));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_values));
-               if (r->num_values < 0 || r->num_values > 10485760) {
+               if (r->num_values > 10485760) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_values));
@@ -2074,7 +2074,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsReplicaAttributeCtr(struct ndr_pull
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 4));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_attributes));
-               if (r->num_attributes < 0 || r->num_attributes > 1048576) {
+               if (r->num_attributes > 1048576) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_attributes));
@@ -2278,7 +2278,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_drsuapi_DsReplicaMetaDataCtr(struct ndr_pull
                NDR_CHECK(ndr_pull_array_size(ndr, &r->meta_data));
                NDR_CHECK(ndr_pull_align(ndr, 8));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
-               if (r->count < 0 || r->count > 1048576) {
+               if (r->count > 1048576) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_PULL_ALLOC_N(ndr, r->meta_data, ndr_get_array_size(ndr, &r->meta_data));
@@ -2710,7 +2710,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_drsuapi_DsGetNCChangesCtr6(struct ndr_pull *
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->nc_object_count));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->nc_linked_attributes_count));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->linked_attributes_count));
-               if (r->linked_attributes_count < 0 || r->linked_attributes_count > 1048576) {
+               if (r->linked_attributes_count > 1048576) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_linked_attributes));
@@ -3837,11 +3837,11 @@ static enum ndr_err_code ndr_pull_drsuapi_DsGetMembershipsCtr1(struct ndr_pull *
                NDR_CHECK(ndr_pull_align(ndr, 4));
                NDR_CHECK(ndr_pull_NTSTATUS(ndr, NDR_SCALARS, &r->status));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_memberships));
-               if (r->num_memberships < 0 || r->num_memberships > 10000) {
+               if (r->num_memberships > 10000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_sids));
-               if (r->num_sids < 0 || r->num_sids > 10000) {
+               if (r->num_sids > 10000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_info_array));
@@ -4324,7 +4324,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsGetNT4ChangeLogRequest1(struct ndr_p
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->unknown1));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->unknown2));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->length));
-               if (r->length < 0 || r->length > 0x00A00000) {
+               if (r->length > 0x00A00000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_data));
@@ -4479,11 +4479,11 @@ static enum ndr_err_code ndr_pull_drsuapi_DsGetNT4ChangeLogInfo1(struct ndr_pull
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 8));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->length1));
-               if (r->length1 < 0 || r->length1 > 0x00A00000) {
+               if (r->length1 > 0x00A00000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->length2));
-               if (r->length2 < 0 || r->length2 > 0x00A00000) {
+               if (r->length2 > 0x00A00000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_hyper(ndr, NDR_SCALARS, &r->unknown1));
@@ -5320,7 +5320,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsWriteAccountSpnRequest1(struct ndr_p
                        r->object_dn = NULL;
                }
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
-               if (r->count < 0 || r->count > 10000) {
+               if (r->count > 10000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_spn_names));
@@ -6217,7 +6217,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsGetDCInfoCtr1(struct ndr_pull *ndr,
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 4));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
-               if (r->count < 0 || r->count > 10000) {
+               if (r->count > 10000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_array));
@@ -6585,7 +6585,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsGetDCInfoCtr2(struct ndr_pull *ndr,
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 4));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
-               if (r->count < 0 || r->count > 10000) {
+               if (r->count > 10000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_array));
@@ -6956,7 +6956,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsGetDCInfoCtr3(struct ndr_pull *ndr,
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 4));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
-               if (r->count < 0 || r->count > 10000) {
+               if (r->count > 10000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_array));
@@ -7133,7 +7133,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsGetDCConnectionCtr01(struct ndr_pull
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 4));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
-               if (r->count < 0 || r->count > 10000) {
+               if (r->count > 10000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_array));
@@ -7537,7 +7537,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsAddEntryExtraErrorBuffer(struct ndr_
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 4));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->size));
-               if (r->size < 0 || r->size > 10485760) {
+               if (r->size > 10485760) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_data));
@@ -8097,7 +8097,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsAddEntryCtr2(struct ndr_pull *ndr, i
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->unknown1));
                NDR_CHECK(ndr_pull_drsuapi_DsAddEntryErrorInfoX(ndr, NDR_SCALARS, &r->error));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
-               if (r->count < 0 || r->count > 10000) {
+               if (r->count > 10000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_objects));
@@ -8227,7 +8227,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsAddEntryCtr3(struct ndr_pull *ndr, i
                        r->error = NULL;
                }
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
-               if (r->count < 0 || r->count > 10000) {
+               if (r->count > 10000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_objects));
@@ -10709,7 +10709,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsReplicaConnection04Ctr(struct ndr_pu
                NDR_CHECK(ndr_pull_array_size(ndr, &r->array));
                NDR_CHECK(ndr_pull_align(ndr, 8));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
-               if (r->count < 0 || r->count > 10000) {
+               if (r->count > 10000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->reserved));
@@ -10858,7 +10858,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsReplica06Ctr(struct ndr_pull *ndr, i
                NDR_CHECK(ndr_pull_array_size(ndr, &r->array));
                NDR_CHECK(ndr_pull_align(ndr, 8));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
-               if (r->count < 0 || r->count > 256) {
+               if (r->count > 256) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->reserved));
@@ -11863,7 +11863,7 @@ static enum ndr_err_code ndr_pull_drsuapi_QuerySitesByCostCtr1(struct ndr_pull *
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 4));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_info));
-               if (r->num_info < 0 || r->num_info > 10000) {
+               if (r->num_info > 10000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_info));
index edcdf2e3f498c31657737d7043c951b6c9b9d512..ddc93f910b208f086922396fe5adef85c4dcc6c4 100644 (file)
@@ -974,7 +974,7 @@ static enum ndr_err_code ndr_pull_eventlog_ReadEventLogW(struct ndr_pull *ndr, i
                NDR_CHECK(ndr_pull_eventlogReadFlags(ndr, NDR_SCALARS, &r->in.flags));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.offset));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.number_of_bytes));
-               if (r->in.number_of_bytes < 0 || r->in.number_of_bytes > 0x7FFFF) {
+               if (r->in.number_of_bytes > 0x7FFFF) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_PULL_ALLOC_N(ndr, r->out.data, r->in.number_of_bytes);
index 9169adfe81e238d03e6c009788106620c7be8d3f..793404a3be7c49ffbd832650850539b6006f7227 100644 (file)
@@ -1819,7 +1819,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_lsa_SidArray(struct ndr_pull *ndr, int ndr_f
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 4));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_sids));
-               if (r->num_sids < 0 || r->num_sids > 1000) {
+               if (r->num_sids > 1000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_sids));
@@ -2060,7 +2060,7 @@ static enum ndr_err_code ndr_pull_lsa_TransSidArray(struct ndr_pull *ndr, int nd
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 4));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
-               if (r->count < 0 || r->count > 1000) {
+               if (r->count > 1000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_sids));
@@ -2147,7 +2147,7 @@ static enum ndr_err_code ndr_pull_lsa_RefDomainList(struct ndr_pull *ndr, int nd
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 4));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
-               if (r->count < 0 || r->count > 1000) {
+               if (r->count > 1000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_domains));
@@ -2306,7 +2306,7 @@ static enum ndr_err_code ndr_pull_lsa_TransNameArray(struct ndr_pull *ndr, int n
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 4));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
-               if (r->count < 0 || r->count > 1000) {
+               if (r->count > 1000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_names));
@@ -2422,7 +2422,7 @@ static enum ndr_err_code ndr_pull_lsa_PrivilegeSet(struct ndr_pull *ndr, int ndr
                NDR_CHECK(ndr_pull_array_size(ndr, &r->set));
                NDR_CHECK(ndr_pull_align(ndr, 4));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
-               if (r->count < 0 || r->count > 1000) {
+               if (r->count > 1000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->unknown));
@@ -2580,7 +2580,7 @@ static enum ndr_err_code ndr_pull_lsa_DATA_BUF2(struct ndr_pull *ndr, int ndr_fl
                if (ndr_flags & NDR_SCALARS) {
                        NDR_CHECK(ndr_pull_align(ndr, 4));
                        NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->size));
-                       if (r->size < 0 || r->size > 65536) {
+                       if (r->size > 65536) {
                                return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                        }
                        NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_data));
@@ -3924,7 +3924,7 @@ static enum ndr_err_code ndr_pull_lsa_RightSet(struct ndr_pull *ndr, int ndr_fla
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 4));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
-               if (r->count < 0 || r->count > 256) {
+               if (r->count > 256) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_names));
@@ -4338,7 +4338,7 @@ static enum ndr_err_code ndr_pull_lsa_TransNameArray2(struct ndr_pull *ndr, int
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 4));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
-               if (r->count < 0 || r->count > 1000) {
+               if (r->count > 1000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_names));
@@ -4463,7 +4463,7 @@ static enum ndr_err_code ndr_pull_lsa_TransSidArray2(struct ndr_pull *ndr, int n
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 4));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
-               if (r->count < 0 || r->count > 1000) {
+               if (r->count > 1000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_sids));
@@ -4609,7 +4609,7 @@ static enum ndr_err_code ndr_pull_lsa_TransSidArray3(struct ndr_pull *ndr, int n
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 4));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
-               if (r->count < 0 || r->count > 1000) {
+               if (r->count > 1000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_sids));
@@ -4690,7 +4690,7 @@ static enum ndr_err_code ndr_pull_lsa_ForestTrustBinaryData(struct ndr_pull *ndr
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 4));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->length));
-               if (r->length < 0 || r->length > 131072) {
+               if (r->length > 131072) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_data));
@@ -5021,7 +5021,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_lsa_ForestTrustInformation(struct ndr_pull *
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 4));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
-               if (r->count < 0 || r->count > 4000) {
+               if (r->count > 4000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_entries));
@@ -6032,7 +6032,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_lsa_EnumAccounts(struct ndr_pull *ndr, int f
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->in.resume_handle));
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_resume_handle_0, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.num_entries));
-               if (r->in.num_entries < 0 || r->in.num_entries > 8192) {
+               if (r->in.num_entries > 8192) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_PULL_ALLOC(ndr, r->out.resume_handle);
@@ -6375,7 +6375,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_lsa_LookupNames(struct ndr_pull *ndr, int fl
                NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS, r->in.handle));
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_handle_0, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.num_names));
-               if (r->in.num_names < 0 || r->in.num_names > 1000) {
+               if (r->in.num_names > 1000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_array_size(ndr, &r->in.names));
@@ -10842,7 +10842,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_lsa_LookupNames2(struct ndr_pull *ndr, int f
                NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS, r->in.handle));
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_handle_0, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.num_names));
-               if (r->in.num_names < 0 || r->in.num_names > 1000) {
+               if (r->in.num_names > 1000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_array_size(ndr, &r->in.names));
@@ -11496,7 +11496,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_lsa_LookupNames3(struct ndr_pull *ndr, int f
                NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS, r->in.handle));
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_handle_0, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.num_names));
-               if (r->in.num_names < 0 || r->in.num_names > 1000) {
+               if (r->in.num_names > 1000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_array_size(ndr, &r->in.names));
@@ -12234,7 +12234,7 @@ static enum ndr_err_code ndr_pull_lsa_LookupNames4(struct ndr_pull *ndr, int fla
                ZERO_STRUCT(r->out);
 
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.num_names));
-               if (r->in.num_names < 0 || r->in.num_names > 1000) {
+               if (r->in.num_names > 1000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_array_size(ndr, &r->in.names));
index 050ee24ed59f594b10f77d1fad7638fdc6ad21ef..751967a60e04f25b2e1c920e8f6e6e27e0f7cdb2 100644 (file)
@@ -13751,7 +13751,7 @@ static enum ndr_err_code ndr_pull_netr_DsRAddressToSitenamesW(struct ndr_pull *n
                        NDR_PULL_SET_MEM_CTX(ndr, _mem_save_server_name_0, 0);
                }
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.count));
-               if (r->in.count < 0 || r->in.count > 32000) {
+               if (r->in.count > 32000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_array_size(ndr, &r->in.addresses));
@@ -14294,7 +14294,7 @@ static enum ndr_err_code ndr_pull_netr_DsRAddressToSitenamesExW(struct ndr_pull
                        NDR_PULL_SET_MEM_CTX(ndr, _mem_save_server_name_0, 0);
                }
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.count));
-               if (r->in.count < 0 || r->in.count > 32000) {
+               if (r->in.count > 32000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_array_size(ndr, &r->in.addresses));
index 83b091608eac61b92294e0a7ab8cefcbdc0f95e2..33c70ce1ff6413705cd8847017f1319686d7ee6e 100644 (file)
@@ -1191,7 +1191,7 @@ static enum ndr_err_code ndr_pull_samr_Ids(struct ndr_pull *ndr, int ndr_flags,
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 4));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
-               if (r->count < 0 || r->count > 1024) {
+               if (r->count > 1024) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_ids));
@@ -7211,7 +7211,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_samr_LookupNames(struct ndr_pull *ndr, int f
                NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS, r->in.domain_handle));
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_domain_handle_0, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.num_names));
-               if (r->in.num_names < 0 || r->in.num_names > 1000) {
+               if (r->in.num_names > 1000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_array_size(ndr, &r->in.names));
@@ -7353,7 +7353,7 @@ static enum ndr_err_code ndr_pull_samr_LookupRids(struct ndr_pull *ndr, int flag
                NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS, r->in.domain_handle));
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_domain_handle_0, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.num_rids));
-               if (r->in.num_rids < 0 || r->in.num_rids > 1000) {
+               if (r->in.num_rids > 1000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_array_size(ndr, &r->in.rids));
index 64c134dcb848281551e3ef38db3a5c7783c81972..c227170779ae5d95246022d581d01b177c76f610 100644 (file)
@@ -498,7 +498,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_security_acl(struct ndr_pull *ndr, int ndr_f
                NDR_CHECK(ndr_pull_security_acl_revision(ndr, NDR_SCALARS, &r->revision));
                NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->size));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_aces));
-               if (r->num_aces < 0 || r->num_aces > 1000) {
+               if (r->num_aces > 1000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_PULL_ALLOC_N(ndr, r->aces, r->num_aces);
@@ -797,7 +797,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_sec_desc_buf(struct ndr_pull *ndr, int ndr_f
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 4));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->sd_size));
-               if (r->sd_size < 0 || r->sd_size > 0x40000) {
+               if (r->sd_size > 0x40000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_sd));
index 72fee1ae23427ba8be0bae4a32ed377985bb5331..fc59371697f9e6140b5e951675410d32087b5e6b 100644 (file)
@@ -1164,7 +1164,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_SERVICE_FAILURE_ACTIONS(struct ndr_pull *ndr
                        ndr->flags = _flags_save_string;
                }
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_actions));
-               if (r->num_actions < 0 || r->num_actions > 1024) {
+               if (r->num_actions > 1024) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_actions));
@@ -1627,7 +1627,7 @@ static enum ndr_err_code ndr_pull_svcctl_QueryServiceObjectSecurity(struct ndr_p
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_handle_0, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.security_flags));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.buffer_size));
-               if (r->in.buffer_size < 0 || r->in.buffer_size > 0x40000) {
+               if (r->in.buffer_size > 0x40000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_PULL_ALLOC_N(ndr, r->out.buffer, r->in.buffer_size);
@@ -1647,7 +1647,7 @@ static enum ndr_err_code ndr_pull_svcctl_QueryServiceObjectSecurity(struct ndr_p
                _mem_save_needed_0 = NDR_PULL_GET_MEM_CTX(ndr);
                NDR_PULL_SET_MEM_CTX(ndr, r->out.needed, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.needed));
-               if (*r->out.needed < 0 || *r->out.needed > 0x40000) {
+               if (*r->out.needed > 0x40000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_needed_0, LIBNDR_FLAG_REF_ALLOC);
@@ -2729,7 +2729,7 @@ static enum ndr_err_code ndr_pull_svcctl_EnumDependentServicesW(struct ndr_pull
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_service_0, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.state));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.buf_size));
-               if (r->in.buf_size < 0 || r->in.buf_size > 0x40000) {
+               if (r->in.buf_size > 0x40000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_PULL_ALLOC_N(ndr, r->out.service_status, r->in.buf_size);
@@ -2751,7 +2751,7 @@ static enum ndr_err_code ndr_pull_svcctl_EnumDependentServicesW(struct ndr_pull
                _mem_save_bytes_needed_0 = NDR_PULL_GET_MEM_CTX(ndr);
                NDR_PULL_SET_MEM_CTX(ndr, r->out.bytes_needed, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.bytes_needed));
-               if (*r->out.bytes_needed < 0 || *r->out.bytes_needed > 0x40000) {
+               if (*r->out.bytes_needed > 0x40000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_bytes_needed_0, LIBNDR_FLAG_REF_ALLOC);
@@ -2761,7 +2761,7 @@ static enum ndr_err_code ndr_pull_svcctl_EnumDependentServicesW(struct ndr_pull
                _mem_save_services_returned_0 = NDR_PULL_GET_MEM_CTX(ndr);
                NDR_PULL_SET_MEM_CTX(ndr, r->out.services_returned, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.services_returned));
-               if (*r->out.services_returned < 0 || *r->out.services_returned > 0x40000) {
+               if (*r->out.services_returned > 0x40000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_services_returned_0, LIBNDR_FLAG_REF_ALLOC);
@@ -2870,7 +2870,7 @@ static enum ndr_err_code ndr_pull_svcctl_EnumServicesStatusW(struct ndr_pull *nd
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.type));
                NDR_CHECK(ndr_pull_svcctl_ServiceState(ndr, NDR_SCALARS, &r->in.state));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.buf_size));
-               if (r->in.buf_size < 0 || r->in.buf_size > 0x40000) {
+               if (r->in.buf_size > 0x40000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_resume_handle));
@@ -2904,7 +2904,7 @@ static enum ndr_err_code ndr_pull_svcctl_EnumServicesStatusW(struct ndr_pull *nd
                _mem_save_bytes_needed_0 = NDR_PULL_GET_MEM_CTX(ndr);
                NDR_PULL_SET_MEM_CTX(ndr, r->out.bytes_needed, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.bytes_needed));
-               if (*r->out.bytes_needed < 0 || *r->out.bytes_needed > 0x40000) {
+               if (*r->out.bytes_needed > 0x40000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_bytes_needed_0, LIBNDR_FLAG_REF_ALLOC);
@@ -2914,7 +2914,7 @@ static enum ndr_err_code ndr_pull_svcctl_EnumServicesStatusW(struct ndr_pull *nd
                _mem_save_services_returned_0 = NDR_PULL_GET_MEM_CTX(ndr);
                NDR_PULL_SET_MEM_CTX(ndr, r->out.services_returned, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.services_returned));
-               if (*r->out.services_returned < 0 || *r->out.services_returned > 0x40000) {
+               if (*r->out.services_returned > 0x40000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_services_returned_0, LIBNDR_FLAG_REF_ALLOC);
@@ -3251,7 +3251,7 @@ static enum ndr_err_code ndr_pull_svcctl_QueryServiceConfigW(struct ndr_pull *nd
                NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS, r->in.handle));
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_handle_0, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.buf_size));
-               if (r->in.buf_size < 0 || r->in.buf_size > 8192) {
+               if (r->in.buf_size > 8192) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_PULL_ALLOC(ndr, r->out.query);
@@ -3273,7 +3273,7 @@ static enum ndr_err_code ndr_pull_svcctl_QueryServiceConfigW(struct ndr_pull *nd
                _mem_save_bytes_needed_0 = NDR_PULL_GET_MEM_CTX(ndr);
                NDR_PULL_SET_MEM_CTX(ndr, r->out.bytes_needed, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.bytes_needed));
-               if (*r->out.bytes_needed < 0 || *r->out.bytes_needed > 8192) {
+               if (*r->out.bytes_needed > 8192) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_bytes_needed_0, LIBNDR_FLAG_REF_ALLOC);
@@ -6087,7 +6087,7 @@ static enum ndr_err_code ndr_pull_svcctl_QueryServiceConfig2W(struct ndr_pull *n
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_handle_0, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_svcctl_ConfigLevel(ndr, NDR_SCALARS, &r->in.info_level));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.buf_size));
-               if (r->in.buf_size < 0 || r->in.buf_size > 8192) {
+               if (r->in.buf_size > 8192) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_PULL_ALLOC_N(ndr, r->out.buffer, r->in.buf_size);
@@ -6107,7 +6107,7 @@ static enum ndr_err_code ndr_pull_svcctl_QueryServiceConfig2W(struct ndr_pull *n
                _mem_save_bytes_needed_0 = NDR_PULL_GET_MEM_CTX(ndr);
                NDR_PULL_SET_MEM_CTX(ndr, r->out.bytes_needed, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.bytes_needed));
-               if (*r->out.bytes_needed < 0 || *r->out.bytes_needed > 8192) {
+               if (*r->out.bytes_needed > 8192) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_bytes_needed_0, LIBNDR_FLAG_REF_ALLOC);
@@ -6195,7 +6195,7 @@ static enum ndr_err_code ndr_pull_svcctl_QueryServiceStatusEx(struct ndr_pull *n
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_handle_0, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_svcctl_StatusLevel(ndr, NDR_SCALARS, &r->in.info_level));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.buf_size));
-               if (r->in.buf_size < 0 || r->in.buf_size > 8192) {
+               if (r->in.buf_size > 8192) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_PULL_ALLOC_N(ndr, r->out.buffer, r->in.buf_size);
@@ -6215,7 +6215,7 @@ static enum ndr_err_code ndr_pull_svcctl_QueryServiceStatusEx(struct ndr_pull *n
                _mem_save_bytes_needed_0 = NDR_PULL_GET_MEM_CTX(ndr);
                NDR_PULL_SET_MEM_CTX(ndr, r->out.bytes_needed, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.bytes_needed));
-               if (*r->out.bytes_needed < 0 || *r->out.bytes_needed > 8192) {
+               if (*r->out.bytes_needed > 8192) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_bytes_needed_0, LIBNDR_FLAG_REF_ALLOC);
@@ -6536,7 +6536,7 @@ static enum ndr_err_code ndr_pull_EnumServicesStatusExW(struct ndr_pull *ndr, in
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.type));
                NDR_CHECK(ndr_pull_svcctl_ServiceState(ndr, NDR_SCALARS, &r->in.state));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.buf_size));
-               if (r->in.buf_size < 0 || r->in.buf_size > 0x40000) {
+               if (r->in.buf_size > 0x40000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_resume_handle));
@@ -6549,7 +6549,7 @@ static enum ndr_err_code ndr_pull_EnumServicesStatusExW(struct ndr_pull *ndr, in
                        _mem_save_resume_handle_0 = NDR_PULL_GET_MEM_CTX(ndr);
                        NDR_PULL_SET_MEM_CTX(ndr, r->in.resume_handle, 0);
                        NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->in.resume_handle));
-                       if (*r->in.resume_handle < 0 || *r->in.resume_handle > 0x40000) {
+                       if (*r->in.resume_handle > 0x40000) {
                                return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                        }
                        NDR_PULL_SET_MEM_CTX(ndr, _mem_save_resume_handle_0, 0);
@@ -6591,7 +6591,7 @@ static enum ndr_err_code ndr_pull_EnumServicesStatusExW(struct ndr_pull *ndr, in
                _mem_save_bytes_needed_0 = NDR_PULL_GET_MEM_CTX(ndr);
                NDR_PULL_SET_MEM_CTX(ndr, r->out.bytes_needed, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.bytes_needed));
-               if (*r->out.bytes_needed < 0 || *r->out.bytes_needed > 0x40000) {
+               if (*r->out.bytes_needed > 0x40000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_bytes_needed_0, LIBNDR_FLAG_REF_ALLOC);
@@ -6601,7 +6601,7 @@ static enum ndr_err_code ndr_pull_EnumServicesStatusExW(struct ndr_pull *ndr, in
                _mem_save_service_returned_0 = NDR_PULL_GET_MEM_CTX(ndr);
                NDR_PULL_SET_MEM_CTX(ndr, r->out.service_returned, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.service_returned));
-               if (*r->out.service_returned < 0 || *r->out.service_returned > 0x40000) {
+               if (*r->out.service_returned > 0x40000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                }
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_service_returned_0, LIBNDR_FLAG_REF_ALLOC);
@@ -6615,7 +6615,7 @@ static enum ndr_err_code ndr_pull_EnumServicesStatusExW(struct ndr_pull *ndr, in
                        _mem_save_resume_handle_0 = NDR_PULL_GET_MEM_CTX(ndr);
                        NDR_PULL_SET_MEM_CTX(ndr, r->out.resume_handle, 0);
                        NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.resume_handle));
-                       if (*r->out.resume_handle < 0 || *r->out.resume_handle > 0x40000) {
+                       if (*r->out.resume_handle > 0x40000) {
                                return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
                        }
                        NDR_PULL_SET_MEM_CTX(ndr, _mem_save_resume_handle_0, 0);
index fbdec28be734b83b58a679765a15a30f885b73fd..51b3ea706e32207deedc6756ede369cd1cff1400 100644 (file)
@@ -40,7 +40,7 @@ import "lsa.idl", "security.idl";
                time_t time_written;
                uint32 event_id;
                eventlogEventTypes event_type;
-               [max(256)] uint16 num_of_strings;
+               [range(0,256)] uint16 num_of_strings;
                uint16 event_category;
                uint16 reserved_flags;
                uint32 closing_record_number;
index 58ba136591b915c1e41ac80cafc924ea0bee62e0..1b49c439c43bd3fdc4b679c0838d4bd832000949 100644 (file)
@@ -67,7 +67,6 @@ my %supported_properties = (
 
        # array
        "range"                 => ["ELEMENT"],
-       "max"                   => ["ELEMENT"],
        "size_is"               => ["ELEMENT"],
        "string"                => ["ELEMENT"],
        "noheader"              => ["ELEMENT"],
index 89632437c10f74e1cd18d9cddb3c132cddde8be7..5ee26d16b68c76f611c4fedc832aab5671f513e1 100644 (file)
@@ -921,7 +921,6 @@ my %property_list = (
 
        # array
        "range"                 => ["ELEMENT"],
-       "max"                   => ["ELEMENT"],
        "size_is"               => ["ELEMENT"],
        "string"                => ["ELEMENT"],
        "noheader"              => ["ELEMENT"],
index e2b14c10b1e1c63f642678017ce2c08ff50f18cc..44d21f0b4a6460087ffc9c961943ef9060515580 100644 (file)
@@ -857,14 +857,16 @@ sub ParseDataPull($$$$$$$)
 
                if (my $range = has_property($e, "range")) {
                        $var_name = get_value_of($var_name);
+                       my $signed = Parse::Pidl::Typelist::is_signed($l->{DATA_TYPE});
                        my ($low, $high) = split(/,/, $range, 2);
-                       $self->pidl("if ($var_name < $low || $var_name > $high) {");
-                       $self->pidl("\treturn ndr_pull_error($ndr, NDR_ERR_RANGE, \"value out of range\");");
-                       $self->pidl("}");
-               }
-               if (my $max = has_property($e, "max")) {
-                       $var_name = get_value_of($var_name);
-                       $self->pidl("if ($var_name > $max) {");
+                       if ($low < 0 and not $signed) {
+                               warning(0, "$low is invalid for the range of an unsigned type");
+                       }
+                       if ($low == 0 and not $signed) {
+                               $self->pidl("if ($var_name > $high) {");
+                       } else {
+                               $self->pidl("if ($var_name < $low || $var_name > $high) {");
+                       }
                        $self->pidl("\treturn ndr_pull_error($ndr, NDR_ERR_RANGE, \"value out of range\");");
                        $self->pidl("}");
                }
index 0e3fd8de444c3988c04e365f6bc2d1f4e49439a2..4f9d982c215fdade246b69a4ff2aefdbfa8e9341 100644 (file)
@@ -8,7 +8,7 @@ package Parse::Pidl::Typelist;
 require Exporter;
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(hasType getType resolveType mapTypeName scalar_is_reference expandAlias
-                           mapScalarType addType typeIs is_scalar enum_type_fn
+                           mapScalarType addType typeIs is_signed is_scalar enum_type_fn
                                bitmap_type_fn mapType typeHasBody
 );
 use vars qw($VERSION);
@@ -145,6 +145,19 @@ sub hasType($)
        return 0;
 }
 
+sub is_signed($)
+{
+    my $t = shift;
+
+    return ($t eq "int8"
+           or $t eq "int16"
+           or $t eq "int32"
+           or $t eq "dlong"
+           or $t eq "int"
+           or $t eq "long"
+           or $t eq "short");
+}
+
 sub is_scalar($)
 {
        sub is_scalar($);
index b4881169396fa7e8aed3558ba834e073eab5ab96..67add074bfc15bc3982447e06f75887b787a64f2 100644 (file)
@@ -176,6 +176,11 @@ struct SMBC_internal_data {
          */
         smbc_smb_encrypt_level                  smb_encryption_level;
 
+        /*
+         * Should we request case sensitivity of file names?
+         */
+        bool                                    case_sensitive;
+
         struct smbc_server_cache * server_cache;
 
         /* POSIX emulation functions */
@@ -396,16 +401,6 @@ SMBC_errno(SMBCCTX *context,
 
 
 /* Functions in libsmb_path.c */
-int
-SMBC_urldecode(char *dest,
-               char *src,
-               size_t max_dest_len);
-
-int
-SMBC_urlencode(char *dest,
-               char *src,
-               int max_dest_len);
-
 int
 SMBC_parse_path(TALLOC_CTX *ctx,
                SMBCCTX *context,
index a8b27b709e4fb4ceec89c04f4331a3166bc874d9..b2d9483a0b9ad9098a7ed143dae521ec0012aaf4 100644 (file)
@@ -550,6 +550,27 @@ smbc_getOptionSmbEncryptionLevel(SMBCCTX *c);
 void
 smbc_setOptionSmbEncryptionLevel(SMBCCTX *c, smbc_smb_encrypt_level level);
 
+/**
+ * Get whether to treat file names as case-sensitive if we can't determine
+ * when connecting to the remote share whether the file system is case
+ * sensitive. This defaults to FALSE since it's most likely that if we can't
+ * retrieve the file system attributes, it's a very old file system that does
+ * not support case sensitivity.
+ */
+smbc_bool
+smbc_getOptionCaseSensitive(SMBCCTX *c);
+
+/**
+ * Set whether to treat file names as case-sensitive if we can't determine
+ * when connecting to the remote share whether the file system is case
+ * sensitive. This defaults to FALSE since it's most likely that if we can't
+ * retrieve the file system attributes, it's a very old file system that does
+ * not support case sensitivity.
+ */
+void
+smbc_setOptionCaseSensitive(SMBCCTX *c, smbc_bool b);
+
+
 /**
  * Get from how many local master browsers should the list of workgroups be
  * retrieved.  It can take up to 12 minutes or longer after a server becomes a
index d644b09a6acaed5965c14ecbceccf8ea60213a6b..71ad2590850b1d4c74afa156497d29eb95d27e02 100644 (file)
@@ -5197,10 +5197,22 @@ NTSTATUS rpccli_netlogon_set_trust_password(struct rpc_pipe_client *cli,
 
 /* The following definitions come from rpc_client/cli_pipe.c  */
 
-NTSTATUS rpc_api_pipe_req(struct rpc_pipe_client *cli,
+struct async_req *rpc_api_pipe_req_send(TALLOC_CTX *mem_ctx,
+                                       struct event_context *ev,
+                                       struct rpc_pipe_client *cli,
+                                       uint8_t op_num,
+                                       prs_struct *req_data);
+NTSTATUS rpc_api_pipe_req_recv(struct async_req *req, TALLOC_CTX *mem_ctx,
+                              prs_struct *reply_pdu);
+NTSTATUS rpc_api_pipe_req(TALLOC_CTX *mem_ctx, struct rpc_pipe_client *cli,
                        uint8 op_num,
                        prs_struct *in_data,
                        prs_struct *out_data);
+struct async_req *rpc_pipe_bind_send(TALLOC_CTX *mem_ctx,
+                                    struct event_context *ev,
+                                    struct rpc_pipe_client *cli,
+                                    struct cli_pipe_auth_data *auth);
+NTSTATUS rpc_pipe_bind_recv(struct async_req *req);
 NTSTATUS rpc_pipe_bind(struct rpc_pipe_client *cli,
                       struct cli_pipe_auth_data *auth);
 unsigned int rpccli_set_timeout(struct rpc_pipe_client *cli,
index 684044b87190a5ca4adffde39aa8e26cb12a704e..61b861c3b4e7ebf0896d518174b2faf112c8a1e0 100644 (file)
@@ -49,9 +49,8 @@
        if (!prs_init( &q_ps, RPC_MAX_PDU_FRAG_LEN, ctx, MARSHALL )) { \
                return WERR_NOMEM;\
        }\
-       prs_init_empty( &r_ps, ctx, UNMARSHALL );\
        if ( q_io_fn("", &q_in, &q_ps, 0) ) {\
-               NTSTATUS _smb_pipe_stat_ = rpc_api_pipe_req(pcli, opnum, &q_ps, &r_ps); \
+               NTSTATUS _smb_pipe_stat_ = rpc_api_pipe_req(ctx, pcli, opnum, &q_ps, &r_ps); \
                if (!NT_STATUS_IS_OK(_smb_pipe_stat_)) {\
                        prs_mem_free( &q_ps );\
                        prs_mem_free( &r_ps );\
index b46ff2c462de1a2fc16f3fa74689d6b7b256fd93..98c25c1e24f7c3cec9547bab8fccdce12308745a 100644 (file)
@@ -1889,6 +1889,7 @@ const char *get_mydnsfullname(void)
 bool is_myname_or_ipaddr(const char *s)
 {
        TALLOC_CTX *ctx = talloc_tos();
+       char addr[INET6_ADDRSTRLEN];
        char *name = NULL;
        const char *dnsname;
        char *servername = NULL;
@@ -1941,7 +1942,6 @@ bool is_myname_or_ipaddr(const char *s)
                /* Use DNS to resolve the name, but only the first address */
                struct sockaddr_storage ss;
                if (interpret_string_addr(&ss, servername, 0)) {
-                       char addr[INET6_ADDRSTRLEN];
                        print_sockaddr(addr,
                                        sizeof(addr),
                                        &ss);
index a598580941b5d22590cc15f3b485015e9adc6b37..f6da54f35ba74bd16faef61be092db73b9ec0fc5 100644 (file)
@@ -581,9 +581,20 @@ ADS_STATUS ads_connect(ADS_STRUCT *ads)
                TALLOC_FREE(s);
        }
 
-       if (ads->server.ldap_server &&
-           ads_try_connect(ads, ads->server.ldap_server, ads->server.gc)) {
-               goto got_connection;
+       if (ads->server.ldap_server)
+       {
+               if (ads_try_connect(ads, ads->server.ldap_server, ads->server.gc)) {
+                       goto got_connection;
+               }
+
+               /* The choice of which GC use is handled one level up in
+                  ads_connect_gc().  If we continue on from here with
+                  ads_find_dc() we will get GC searches on port 389 which
+                  doesn't work.   --jerry */
+
+               if (ads->server.gc == true) {
+                       return ADS_ERROR(LDAP_OPERATIONS_ERROR);
+               }
        }
 
        ntstatus = ads_find_dc(ads);
index 69bfc6f329a3e91d25f31c386c90e4139125618c..21a2004422c2c85bdbf42b4d2f9e7d824f01bdca 100644 (file)
@@ -84,7 +84,8 @@ NTSTATUS dcerpc_ndr_request_recv(struct rpc_request *req)
 
        prs_init_empty( &r_ps, req, UNMARSHALL );
 
-       status = rpc_api_pipe_req(req->pipe->rpc_cli, req->opnum, &req->q_ps, &r_ps); 
+       status = rpc_api_pipe_req(req, req->pipe->rpc_cli, req->opnum,
+                                 &req->q_ps, &r_ps);
 
        prs_mem_free( &req->q_ps );
 
index 66329e286053f72a465bf719bff08daf29a0a812..c2c33e53025903c6a3a2ff02c4cd781f8fdebee2 100644 (file)
@@ -69,6 +69,7 @@ smbc_new_context(void)
         smbc_setOptionFullTimeNames(context, False);
         smbc_setOptionOpenShareMode(context, SMBC_SHAREMODE_DENY_NONE);
         smbc_setOptionSmbEncryptionLevel(context, SMBC_ENCRYPTLEVEL_NONE);
+        smbc_setOptionCaseSensitive(context, False);
         smbc_setOptionBrowseMaxLmbCount(context, 3);    /* # LMBs to query */
         smbc_setOptionUrlEncodeReaddirEntries(context, False);
         smbc_setOptionOneSharePerServer(context, False);
index 770014b6f62350632a16fef274bdf37277ea4572..e9b7b4f95a9a22806906cb9d071f987b0602b99f 100644 (file)
@@ -895,7 +895,7 @@ smbc_readdir_internal(SMBCCTX * context,
 
                 /* url-encode the name.  get back remaining buffer space */
                 max_namebuf_len =
-                        SMBC_urlencode(dest->name, src->name, max_namebuf_len);
+                        smbc_urlencode(dest->name, src->name, max_namebuf_len);
 
                 /* We now know the name length */
                 dest->namelen = strlen(dest->name);
index 2c3a5f8866b6005c6891f6fc5d79402802788981..6d69924231b61b77014386e40771152ef93f1718 100644 (file)
@@ -41,7 +41,7 @@ hex2int( unsigned int _char )
 }
 
 /*
- * SMBC_urldecode()
+ * smbc_urldecode()
  * and urldecode_talloc() (internal fn.)
  *
  * Convert strings of %xx to their single character equivalent.  Each 'x' must
@@ -122,7 +122,7 @@ urldecode_talloc(TALLOC_CTX *ctx, char **pp_dest, const char *src)
 }
 
 int
-SMBC_urldecode(char *dest,
+smbc_urldecode(char *dest,
                char *src,
                size_t max_dest_len)
 {
@@ -138,7 +138,7 @@ SMBC_urldecode(char *dest,
 }
 
 /*
- * SMBC_urlencode()
+ * smbc_urlencode()
  *
  * Convert any characters not specifically allowed in a URL into their %xx
  * equivalent.
@@ -146,7 +146,7 @@ SMBC_urldecode(char *dest,
  * Returns the remaining buffer length.
  */
 int
-SMBC_urlencode(char *dest,
+smbc_urlencode(char *dest,
                char *src,
                int max_dest_len)
 {
@@ -286,7 +286,7 @@ SMBC_parse_path(TALLOC_CTX *ctx,
                 DEBUG(4, ("Found options '%s'", q));
                 
                /* Copy the options */
-               if (*pp_options != NULL) {
+               if (pp_options && *pp_options != NULL) {
                        TALLOC_FREE(*pp_options);
                        *pp_options = talloc_strdup(ctx, q);
                }
index f4714346d1d98c0027fc87f8ca7599877e6dc223..0ece5bb649e194b60055812683d98c5b7c9c6a83 100644 (file)
@@ -245,6 +245,8 @@ SMBC_server(TALLOC_CTX *ctx,
        int tried_reverse = 0;
         int port_try_first;
         int port_try_next;
+        int is_ipc = (share != NULL && strcmp(share, "IPC$") == 0);
+       uint32 fs_attrs = 0;
         const char *username_used;
        NTSTATUS status;
 
@@ -310,6 +312,38 @@ SMBC_server(TALLOC_CTX *ctx,
                                 srv = NULL;
                         }
 
+                        /* Determine if this share supports case sensitivity */
+                        if (is_ipc) {
+                                DEBUG(4,
+                                      ("IPC$ so ignore case sensitivity\n"));
+                        } else if (!cli_get_fs_attr_info(c, &fs_attrs)) {
+                                DEBUG(4, ("Could not retrieve "
+                                          "case sensitivity flag: %s.\n",
+                                          cli_errstr(c)));
+
+                                /*
+                                 * We can't determine the case sensitivity of
+                                 * the share. We have no choice but to use the
+                                 * user-specified case sensitivity setting.
+                                 */
+                                if (smbc_getOptionCaseSensitive(context)) {
+                                        cli_set_case_sensitive(c, True);
+                                } else {
+                                        cli_set_case_sensitive(c, False);
+                                }
+                        } else {
+                                DEBUG(4,
+                                      ("Case sensitive: %s\n",
+                                       (fs_attrs & FILE_CASE_SENSITIVE_SEARCH
+                                        ? "True"
+                                        : "False")));
+                                cli_set_case_sensitive(
+                                        c,
+                                        (fs_attrs & FILE_CASE_SENSITIVE_SEARCH
+                                         ? True
+                                         : False));
+                        }
+
                         /*
                          * Regenerate the dev value since it's based on both
                          * server and share
@@ -370,7 +404,7 @@ again:
          * Force use of port 139 for first try if share is $IPC, empty, or
          * null, so browse lists can work
          */
-        if (share == NULL || *share == '\0' || strcmp(share, "IPC$") == 0) {
+        if (share == NULL || *share == '\0' || is_ipc) {
                 port_try_first = 139;
                 port_try_next = 445;
         } else {
@@ -476,6 +510,34 @@ again:
 
        DEBUG(4,(" tconx ok\n"));
 
+        /* Determine if this share supports case sensitivity */
+       if (is_ipc) {
+                DEBUG(4, ("IPC$ so ignore case sensitivity\n"));
+        } else if (!cli_get_fs_attr_info(c, &fs_attrs)) {
+                DEBUG(4, ("Could not retrieve case sensitivity flag: %s.\n",
+                          cli_errstr(c)));
+
+                /*
+                 * We can't determine the case sensitivity of the share. We
+                 * have no choice but to use the user-specified case
+                 * sensitivity setting.
+                 */
+                if (smbc_getOptionCaseSensitive(context)) {
+                        cli_set_case_sensitive(c, True);
+                } else {
+                        cli_set_case_sensitive(c, False);
+                }
+       } else {
+                DEBUG(4, ("Case sensitive: %s\n",
+                          (fs_attrs & FILE_CASE_SENSITIVE_SEARCH
+                           ? "True"
+                           : "False")));
+                cli_set_case_sensitive(c,
+                                       (fs_attrs & FILE_CASE_SENSITIVE_SEARCH
+                                        ? True
+                                        : False));
+        }
+
        if (context->internal->smb_encryption_level) {
                /* Attempt UNIX smb encryption. */
                if (!NT_STATUS_IS_OK(cli_force_encryption(c,
index d0823bd77ec4125b19e6f7a8d6d6851bda4ff01a..9de49a5b3f6dca753fb9be9f403c1ce3db95a310 100644 (file)
@@ -193,6 +193,32 @@ smbc_setOptionSmbEncryptionLevel(SMBCCTX *c, smbc_smb_encrypt_level level)
         c->internal->smb_encryption_level = level;
 }
 
+/**
+ * Get whether to treat file names as case-sensitive if we can't determine
+ * when connecting to the remote share whether the file system is case
+ * sensitive. This defaults to FALSE since it's most likely that if we can't
+ * retrieve the file system attributes, it's a very old file system that does
+ * not support case sensitivity.
+ */
+smbc_bool
+smbc_getOptionCaseSensitive(SMBCCTX *c)
+{
+        return c->internal->case_sensitive;
+}
+
+/**
+ * Set whether to treat file names as case-sensitive if we can't determine
+ * when connecting to the remote share whether the file system is case
+ * sensitive. This defaults to FALSE since it's most likely that if we can't
+ * retrieve the file system attributes, it's a very old file system that does
+ * not support case sensitivity.
+ */
+void
+smbc_setOptionCaseSensitive(SMBCCTX *c, smbc_bool b)
+{
+        c->internal->case_sensitive = b;
+}
+
 /**
  * Get from how many local master browsers should the list of workgroups be
  * retrieved.  It can take up to 12 minutes or longer after a server becomes a
index 99bd85af5d110986b02d4615288149d9281c1b91..f3affd1cd894f63909176e33bdc833f31c791a45 100644 (file)
@@ -172,57 +172,6 @@ static uint32 get_rpc_call_id(void)
        return ++call_id;
 }
 
-/*******************************************************************
- Read from a RPC named pipe
- ********************************************************************/
-static NTSTATUS rpc_read_np(struct cli_state *cli, const char *pipe_name,
-                           int fnum, char *buf, size_t size,
-                           ssize_t *pnum_read)
-{
-       ssize_t num_read;
-
-       num_read = cli_read(cli, fnum, buf, 0, size);
-
-       DEBUG(5,("rpc_read_np: num_read = %d, to read: %u\n", (int)num_read,
-               (unsigned int)size));
-
-       /*
-       * A dos error of ERRDOS/ERRmoredata is not an error.
-       */
-       if (cli_is_dos_error(cli)) {
-              uint32 ecode;
-              uint8 eclass;
-              cli_dos_error(cli, &eclass, &ecode);
-              if (eclass != ERRDOS && ecode != ERRmoredata) {
-                      DEBUG(0,("rpc_read: DOS Error %d/%u (%s) in cli_read "
-                               "on fnum 0x%x\n", eclass, (unsigned int)ecode,
-                               cli_errstr(cli), fnum));
-                      return dos_to_ntstatus(eclass, ecode);
-              }
-       }
-
-       /*
-       * Likewise for NT_STATUS_BUFFER_TOO_SMALL
-       */
-       if (cli_is_nt_error(cli)) {
-              if (!NT_STATUS_EQUAL(cli_nt_error(cli),
-                                   NT_STATUS_BUFFER_TOO_SMALL)) {
-                      DEBUG(0,("rpc_read: Error (%s) in cli_read on fnum "
-                               "0x%x\n", nt_errstr(cli_nt_error(cli)), fnum));
-                      return cli_nt_error(cli);
-              }
-       }
-
-       if (num_read == -1) {
-              DEBUG(0,("rpc_read: Error - cli_read on fnum 0x%x returned "
-                       "-1\n", fnum));
-              return cli_get_nt_error(cli);
-       }
-
-       *pnum_read = num_read;
-       return NT_STATUS_OK;
-}
-
 /*
  * Realloc pdu to have a least "size" bytes
  */
@@ -254,83 +203,287 @@ static bool rpc_grow_buffer(prs_struct *pdu, size_t size)
  Reads the whole size or give an error message
  ********************************************************************/
 
-static NTSTATUS rpc_read(struct rpc_pipe_client *cli,
-                        char *pdata, size_t size)
+struct rpc_read_state {
+       struct event_context *ev;
+       struct rpc_pipe_client *cli;
+       char *data;
+       size_t size;
+       size_t num_read;
+};
+
+static void rpc_read_np_done(struct async_req *subreq);
+static void rpc_read_sock_done(struct async_req *subreq);
+
+static struct async_req *rpc_read_send(TALLOC_CTX *mem_ctx,
+                                      struct event_context *ev,
+                                      struct rpc_pipe_client *cli,
+                                      char *data, size_t size)
 {
-       ssize_t num_read = 0;
+       struct async_req *result, *subreq;
+       struct rpc_read_state *state;
 
-       DEBUG(5, ("rpc_read: data_to_read: %u\n", (unsigned int)size));
+       result = async_req_new(mem_ctx);
+       if (result == NULL) {
+               return NULL;
+       }
+       state = talloc(result, struct rpc_read_state);
+       if (state == NULL) {
+               goto fail;
+       }
+       result->private_data = state;
 
-       while (num_read < size) {
-               ssize_t thistime = 0;
-               NTSTATUS status;
+       state->ev = ev;
+       state->cli = cli;
+       state->data = data;
+       state->size = size;
+       state->num_read = 0;
 
-               switch (cli->transport_type) {
-               case NCACN_NP:
-                       status = rpc_read_np(cli->trans.np.cli,
-                                            cli->trans.np.pipe_name,
-                                            cli->trans.np.fnum,
-                                            pdata + num_read,
-                                            size - num_read, &thistime);
-                       break;
-               case NCACN_IP_TCP:
-               case NCACN_UNIX_STREAM:
-                       status = NT_STATUS_OK;
-                       thistime = sys_read(cli->trans.sock.fd,
-                                           pdata + num_read,
-                                           size - num_read);
-                       if (thistime == -1) {
-                               status = map_nt_error_from_unix(errno);
-                       }
-                       break;
-               default:
-                       DEBUG(0, ("unknown transport type %d\n",
-                                 cli->transport_type));
-                       return NT_STATUS_INTERNAL_ERROR;
-               }
+       DEBUG(5, ("rpc_read_send: data_to_read: %u\n", (unsigned int)size));
 
-               if (!NT_STATUS_IS_OK(status)) {
-                       return status;
+       if (cli->transport_type == NCACN_NP) {
+               subreq = cli_read_andx_send(
+                       state, ev, cli->trans.np.cli,
+                       cli->trans.np.fnum, 0, size);
+               if (subreq == NULL) {
+                       DEBUG(10, ("cli_read_andx_send failed\n"));
+                       goto fail;
                }
-               if (thistime == 0) {
-                       return NT_STATUS_END_OF_FILE;
+               subreq->async.fn = rpc_read_np_done;
+               subreq->async.priv = result;
+               return result;
+       }
+
+       if ((cli->transport_type == NCACN_IP_TCP)
+           || (cli->transport_type == NCACN_UNIX_STREAM)) {
+               subreq = recvall_send(state, ev, cli->trans.sock.fd,
+                                     data, size, 0);
+               if (subreq == NULL) {
+                       DEBUG(10, ("recvall_send failed\n"));
+                       goto fail;
                }
+               subreq->async.fn = rpc_read_sock_done;
+               subreq->async.priv = result;
+               return result;
+       }
+
+       if (async_post_status(result, ev, NT_STATUS_INVALID_PARAMETER)) {
+               return result;
+       }
+ fail:
+       TALLOC_FREE(result);
+       return NULL;
+}
 
-               num_read += thistime;
+static void rpc_read_np_done(struct async_req *subreq)
+{
+       struct async_req *req = talloc_get_type_abort(
+               subreq->async.priv, struct async_req);
+       struct rpc_read_state *state = talloc_get_type_abort(
+               req->private_data, struct rpc_read_state);
+       NTSTATUS status;
+       ssize_t received;
+       uint8_t *rcvbuf;
 
+       status = cli_read_andx_recv(subreq, &received, &rcvbuf);
+       /*
+        * We can't TALLOC_FREE(subreq) as usual here, as rcvbuf still is a
+        * child of that.
+        */
+       if (NT_STATUS_EQUAL(status, NT_STATUS_BUFFER_TOO_SMALL)) {
+               status = NT_STATUS_OK;
+       }
+       if (!NT_STATUS_IS_OK(status)) {
+               TALLOC_FREE(subreq);
+               async_req_error(req, status);
+               return;
        }
 
-       return NT_STATUS_OK;
+       memcpy(state->data + state->num_read, rcvbuf, received);
+       TALLOC_FREE(subreq);
+
+       state->num_read += received;
+
+       if (state->num_read == state->size) {
+               async_req_done(req);
+               return;
+       }
+
+       subreq = cli_read_andx_send(
+               state, state->ev, state->cli->trans.np.cli,
+               state->cli->trans.np.fnum, 0,
+               state->size - state->num_read);
+
+       if (async_req_nomem(subreq, req)) {
+               return;
+       }
+
+       subreq->async.fn = rpc_read_np_done;
+       subreq->async.priv = req;
 }
 
-/****************************************************************************
- Try and get a PDU's worth of data from current_pdu. If not, then read more
- from the wire.
- ****************************************************************************/
+static void rpc_read_sock_done(struct async_req *subreq)
+{
+       struct async_req *req = talloc_get_type_abort(
+               subreq->async.priv, struct async_req);
+       NTSTATUS status;
+
+       status = recvall_recv(subreq);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               async_req_error(req, status);
+               return;
+       }
 
-static NTSTATUS cli_pipe_get_current_pdu(struct rpc_pipe_client *cli, RPC_HDR *prhdr, prs_struct *current_pdu)
+       async_req_done(req);
+}
+
+static NTSTATUS rpc_read_recv(struct async_req *req)
 {
-       NTSTATUS ret = NT_STATUS_OK;
-       uint32 current_pdu_len = prs_data_size(current_pdu);
+       return async_req_simple_recv(req);
+}
 
-       /* Ensure we have at least RPC_HEADER_LEN worth of data to parse. */
-       if (current_pdu_len < RPC_HEADER_LEN) {
-               if (!rpc_grow_buffer(current_pdu, RPC_HEADER_LEN)) {
-                       return NT_STATUS_NO_MEMORY;
+struct rpc_write_state {
+       struct event_context *ev;
+       struct rpc_pipe_client *cli;
+       const char *data;
+       size_t size;
+       size_t num_written;
+};
+
+static void rpc_write_np_done(struct async_req *subreq);
+static void rpc_write_sock_done(struct async_req *subreq);
+
+static struct async_req *rpc_write_send(TALLOC_CTX *mem_ctx,
+                                       struct event_context *ev,
+                                       struct rpc_pipe_client *cli,
+                                       const char *data, size_t size)
+{
+       struct async_req *result, *subreq;
+       struct rpc_write_state *state;
+
+       result = async_req_new(mem_ctx);
+       if (result == NULL) {
+               return NULL;
+       }
+       state = talloc(result, struct rpc_write_state);
+       if (state == NULL) {
+               goto fail;
+       }
+       result->private_data = state;
+
+       state->ev = ev;
+       state->cli = cli;
+       state->data = data;
+       state->size = size;
+       state->num_written = 0;
+
+       DEBUG(5, ("rpc_write_send: data_to_write: %u\n", (unsigned int)size));
+
+       if (cli->transport_type == NCACN_NP) {
+               subreq = cli_write_andx_send(
+                       state, ev, cli->trans.np.cli,
+                       cli->trans.np.fnum, 8, /* 8 means message mode. */
+                       (uint8_t *)data, 0, size);
+               if (subreq == NULL) {
+                       DEBUG(10, ("cli_write_andx_send failed\n"));
+                       goto fail;
                }
-               ret = rpc_read(cli,
-                              prs_data_p(current_pdu) + current_pdu_len,
-                              RPC_HEADER_LEN - current_pdu_len);
-               if (!NT_STATUS_IS_OK(ret)) {
-                       return ret;
+               subreq->async.fn = rpc_write_np_done;
+               subreq->async.priv = result;
+               return result;
+       }
+
+       if ((cli->transport_type == NCACN_IP_TCP)
+           || (cli->transport_type == NCACN_UNIX_STREAM)) {
+               subreq = sendall_send(state, ev, cli->trans.sock.fd,
+                                     data, size, 0);
+               if (subreq == NULL) {
+                       DEBUG(10, ("sendall_send failed\n"));
+                       goto fail;
                }
-               current_pdu_len = RPC_HEADER_LEN;
+               subreq->async.fn = rpc_write_sock_done;
+               subreq->async.priv = result;
+               return result;
+       }
+
+       if (async_post_status(result, ev, NT_STATUS_INVALID_PARAMETER)) {
+               return result;
+       }
+ fail:
+       TALLOC_FREE(result);
+       return NULL;
+}
+
+static void rpc_write_np_done(struct async_req *subreq)
+{
+       struct async_req *req = talloc_get_type_abort(
+               subreq->async.priv, struct async_req);
+       struct rpc_write_state *state = talloc_get_type_abort(
+               req->private_data, struct rpc_write_state);
+       NTSTATUS status;
+       size_t written;
+
+       status = cli_write_andx_recv(subreq, &written);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               async_req_error(req, status);
+               return;
+       }
+
+       state->num_written += written;
+
+       if (state->num_written == state->size) {
+               async_req_done(req);
+               return;
+       }
+
+       subreq = cli_write_andx_send(
+               state, state->ev, state->cli->trans.np.cli,
+               state->cli->trans.np.fnum, 8,
+               (uint8_t *)(state->data + state->num_written),
+               0, state->size - state->num_written);
+
+       if (async_req_nomem(subreq, req)) {
+               return;
+       }
+
+       subreq->async.fn = rpc_write_np_done;
+       subreq->async.priv = req;
+}
+
+static void rpc_write_sock_done(struct async_req *subreq)
+{
+       struct async_req *req = talloc_get_type_abort(
+               subreq->async.priv, struct async_req);
+       NTSTATUS status;
+
+       status = sendall_recv(subreq);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               async_req_error(req, status);
+               return;
        }
 
-       /* This next call sets the endian bit correctly in current_pdu. */
-       /* We will propagate this to rbuf later. */
-       if(!smb_io_rpc_hdr("rpc_hdr   ", prhdr, current_pdu, 0)) {
-               DEBUG(0,("cli_pipe_get_current_pdu: Failed to unmarshall RPC_HDR.\n"));
+       async_req_done(req);
+}
+
+static NTSTATUS rpc_write_recv(struct async_req *req)
+{
+       return async_req_simple_recv(req);
+}
+
+
+static NTSTATUS parse_rpc_header(struct rpc_pipe_client *cli,
+                                struct rpc_hdr_info *prhdr,
+                                prs_struct *pdu)
+{
+       /*
+        * This next call sets the endian bit correctly in current_pdu. We
+        * will propagate this to rbuf later.
+        */
+
+       if(!smb_io_rpc_hdr("rpc_hdr   ", prhdr, pdu, 0)) {
+               DEBUG(0, ("get_current_pdu: Failed to unmarshall RPC_HDR.\n"));
                return NT_STATUS_BUFFER_TOO_SMALL;
        }
 
@@ -341,20 +494,162 @@ static NTSTATUS cli_pipe_get_current_pdu(struct rpc_pipe_client *cli, RPC_HDR *p
                return NT_STATUS_BUFFER_TOO_SMALL;
        }
 
-       /* Ensure we have frag_len bytes of data. */
-       if (current_pdu_len < prhdr->frag_len) {
-               if (!rpc_grow_buffer(current_pdu, prhdr->frag_len)) {
-                       return NT_STATUS_NO_MEMORY;
+       return NT_STATUS_OK;
+}
+
+/****************************************************************************
+ Try and get a PDU's worth of data from current_pdu. If not, then read more
+ from the wire.
+ ****************************************************************************/
+
+struct get_complete_frag_state {
+       struct event_context *ev;
+       struct rpc_pipe_client *cli;
+       struct rpc_hdr_info *prhdr;
+       prs_struct *pdu;
+};
+
+static void get_complete_frag_got_header(struct async_req *subreq);
+static void get_complete_frag_got_rest(struct async_req *subreq);
+
+static struct async_req *get_complete_frag_send(TALLOC_CTX *mem_ctx,
+                                              struct event_context *ev,
+                                              struct rpc_pipe_client *cli,
+                                              struct rpc_hdr_info *prhdr,
+                                              prs_struct *pdu)
+{
+       struct async_req *result, *subreq;
+       struct get_complete_frag_state *state;
+       uint32_t pdu_len;
+       NTSTATUS status;
+
+       result = async_req_new(mem_ctx);
+       if (result == NULL) {
+               return NULL;
+       }
+       state = talloc(result, struct get_complete_frag_state);
+       if (state == NULL) {
+               goto fail;
+       }
+       result->private_data = state;
+
+       state->ev = ev;
+       state->cli = cli;
+       state->prhdr = prhdr;
+       state->pdu = pdu;
+
+       pdu_len = prs_data_size(pdu);
+       if (pdu_len < RPC_HEADER_LEN) {
+               if (!rpc_grow_buffer(pdu, RPC_HEADER_LEN)) {
+                       status = NT_STATUS_NO_MEMORY;
+                       goto post_status;
                }
-               ret = rpc_read(cli,
-                              prs_data_p(current_pdu) + current_pdu_len,
-                              prhdr->frag_len - current_pdu_len);
-               if (!NT_STATUS_IS_OK(ret)) {
-                       return ret;
+               subreq = rpc_read_send(state, state->ev, state->cli,
+                                      prs_data_p(state->pdu) + pdu_len,
+                                      RPC_HEADER_LEN - pdu_len);
+               if (subreq == NULL) {
+                       status = NT_STATUS_NO_MEMORY;
+                       goto post_status;
                }
+               subreq->async.fn = get_complete_frag_got_header;
+               subreq->async.priv = result;
+               return result;
        }
 
-       return NT_STATUS_OK;
+       status = parse_rpc_header(cli, prhdr, pdu);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto post_status;
+       }
+
+       /*
+        * Ensure we have frag_len bytes of data.
+        */
+       if (pdu_len < prhdr->frag_len) {
+               if (!rpc_grow_buffer(pdu, prhdr->frag_len)) {
+                       status = NT_STATUS_NO_MEMORY;
+                       goto post_status;
+               }
+               subreq = rpc_read_send(state, state->ev, state->cli,
+                                      prs_data_p(pdu) + pdu_len,
+                                      prhdr->frag_len - pdu_len);
+               if (subreq == NULL) {
+                       status = NT_STATUS_NO_MEMORY;
+                       goto post_status;
+               }
+               subreq->async.fn = get_complete_frag_got_rest;
+               subreq->async.priv = result;
+               return result;
+       }
+
+       status = NT_STATUS_OK;
+ post_status:
+       if (async_post_status(result, ev, status)) {
+               return result;
+       }
+ fail:
+       TALLOC_FREE(result);
+       return NULL;
+}
+
+static void get_complete_frag_got_header(struct async_req *subreq)
+{
+       struct async_req *req = talloc_get_type_abort(
+               subreq->async.priv, struct async_req);
+       struct get_complete_frag_state *state = talloc_get_type_abort(
+               req->private_data, struct get_complete_frag_state);
+       NTSTATUS status;
+
+       status = rpc_read_recv(subreq);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               async_req_error(req, status);
+               return;
+       }
+
+       status = parse_rpc_header(state->cli, state->prhdr, state->pdu);
+       if (!NT_STATUS_IS_OK(status)) {
+               async_req_error(req, status);
+               return;
+       }
+
+       if (!rpc_grow_buffer(state->pdu, state->prhdr->frag_len)) {
+               async_req_error(req, NT_STATUS_NO_MEMORY);
+               return;
+       }
+
+       /*
+        * We're here in this piece of code because we've read exactly
+        * RPC_HEADER_LEN bytes into state->pdu.
+        */
+
+       subreq = rpc_read_send(state, state->ev, state->cli,
+                              prs_data_p(state->pdu) + RPC_HEADER_LEN,
+                              state->prhdr->frag_len - RPC_HEADER_LEN);
+       if (async_req_nomem(subreq, req)) {
+               return;
+       }
+       subreq->async.fn = get_complete_frag_got_rest;
+       subreq->async.priv = req;
+}
+
+static void get_complete_frag_got_rest(struct async_req *subreq)
+{
+       struct async_req *req = talloc_get_type_abort(
+               subreq->async.priv, struct async_req);
+       NTSTATUS status;
+
+       status = rpc_read_recv(subreq);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               async_req_error(req, status);
+               return;
+       }
+       async_req_done(req);
+}
+
+static NTSTATUS get_complete_frag_recv(struct async_req *req)
+{
+       return async_req_simple_recv(req);
 }
 
 /****************************************************************************
@@ -848,26 +1143,172 @@ static NTSTATUS cli_pipe_reset_current_pdu(struct rpc_pipe_client *cli, RPC_HDR
  Call a remote api on an arbitrary pipe.  takes param, data and setup buffers.
 ****************************************************************************/
 
-static bool cli_api_pipe(struct cli_state *cli, const char *pipe_name,
-                        uint16 *setup, uint32 setup_count,
-                        uint32 max_setup_count,
-                        char *params, uint32 param_count,
-                        uint32 max_param_count,
-                        char *data, uint32 data_count,
-                        uint32 max_data_count,
-                        char **rparam, uint32 *rparam_count,
-                        char **rdata, uint32 *rdata_count)
+struct cli_api_pipe_state {
+       struct event_context *ev;
+       struct rpc_pipe_client *cli;
+       uint32_t max_rdata_len;
+       uint8_t *rdata;
+       uint32_t rdata_len;
+};
+
+static void cli_api_pipe_np_trans_done(struct async_req *subreq);
+static void cli_api_pipe_sock_send_done(struct async_req *subreq);
+static void cli_api_pipe_sock_read_done(struct async_req *subreq);
+
+static struct async_req *cli_api_pipe_send(TALLOC_CTX *mem_ctx,
+                                          struct event_context *ev,
+                                          struct rpc_pipe_client *cli,
+                                          uint8_t *data, size_t data_len,
+                                          uint32_t max_rdata_len)
+{
+       struct async_req *result, *subreq;
+       struct cli_api_pipe_state *state;
+       NTSTATUS status;
+
+       result = async_req_new(mem_ctx);
+       if (result == NULL) {
+               return NULL;
+       }
+       state = talloc(result, struct cli_api_pipe_state);
+       if (state == NULL) {
+               goto fail;
+       }
+       result->private_data = state;
+
+       state->ev = ev;
+       state->cli = cli;
+       state->max_rdata_len = max_rdata_len;
+
+       if (state->max_rdata_len < RPC_HEADER_LEN) {
+               /*
+                * For a RPC reply we always need at least RPC_HEADER_LEN
+                * bytes. We check this here because we will receive
+                * RPC_HEADER_LEN bytes in cli_trans_sock_send_done.
+                */
+               status = NT_STATUS_INVALID_PARAMETER;
+               goto post_status;
+       }
+
+       if (cli->transport_type == NCACN_NP) {
+
+               uint16_t setup[2];
+               SSVAL(setup+0, 0, TRANSACT_DCERPCCMD);
+               SSVAL(setup+1, 0, cli->trans.np.fnum);
+
+               subreq = cli_trans_send(
+                       state, ev, cli->trans.np.cli, SMBtrans,
+                       "\\PIPE\\", 0, 0, 0, setup, 2, 0,
+                       NULL, 0, 0, data, data_len, max_rdata_len);
+               if (subreq == NULL) {
+                       status = NT_STATUS_NO_MEMORY;
+                       goto post_status;
+               }
+               subreq->async.fn = cli_api_pipe_np_trans_done;
+               subreq->async.priv = result;
+               return result;
+       }
+
+       if ((cli->transport_type == NCACN_IP_TCP)
+           || (cli->transport_type == NCACN_UNIX_STREAM)) {
+               subreq = sendall_send(state, ev, cli->trans.sock.fd,
+                                     data, data_len, 0);
+               if (subreq == NULL) {
+                       status = NT_STATUS_NO_MEMORY;
+                       goto post_status;
+               }
+               subreq->async.fn = cli_api_pipe_sock_send_done;
+               subreq->async.priv = result;
+               return result;
+       }
+
+       status = NT_STATUS_INVALID_PARAMETER;
+
+ post_status:
+       if (async_post_status(result, ev, status)) {
+               return result;
+       }
+ fail:
+       TALLOC_FREE(result);
+       return NULL;
+}
+
+static void cli_api_pipe_np_trans_done(struct async_req *subreq)
+{
+       struct async_req *req = talloc_get_type_abort(
+               subreq->async.priv, struct async_req);
+       struct cli_api_pipe_state *state = talloc_get_type_abort(
+               req->private_data, struct cli_api_pipe_state);
+       NTSTATUS status;
+
+       status = cli_trans_recv(subreq, state, NULL, NULL, NULL, NULL,
+                               &state->rdata, &state->rdata_len);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               async_req_error(req, status);
+               return;
+       }
+       async_req_done(req);
+}
+
+static void cli_api_pipe_sock_send_done(struct async_req *subreq)
+{
+       struct async_req *req = talloc_get_type_abort(
+               subreq->async.priv, struct async_req);
+       struct cli_api_pipe_state *state = talloc_get_type_abort(
+               req->private_data, struct cli_api_pipe_state);
+       NTSTATUS status;
+
+       status = sendall_recv(subreq);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               async_req_error(req, status);
+               return;
+       }
+
+       state->rdata = TALLOC_ARRAY(state, uint8_t, RPC_HEADER_LEN);
+       if (async_req_nomem(state->rdata, req)) {
+               return;
+       }
+       state->rdata_len = RPC_HEADER_LEN;
+
+       subreq = recvall_send(state, state->ev, state->cli->trans.sock.fd,
+                             state->rdata, RPC_HEADER_LEN, 0);
+       if (async_req_nomem(subreq, req)) {
+               return;
+       }
+       subreq->async.fn = cli_api_pipe_sock_read_done;
+       subreq->async.priv = req;
+}
+
+static void cli_api_pipe_sock_read_done(struct async_req *subreq)
+{
+       struct async_req *req = talloc_get_type_abort(
+               subreq->async.priv, struct async_req);
+       NTSTATUS status;
+
+       status = recvall_recv(subreq);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               async_req_error(req, status);
+               return;
+       }
+       async_req_done(req);
+}
+
+static NTSTATUS cli_api_pipe_recv(struct async_req *req, TALLOC_CTX *mem_ctx,
+                                 uint8_t **prdata, uint32_t *prdata_len)
 {
-       cli_send_trans(cli, SMBtrans,
-                 pipe_name,
-                 0,0,                         /* fid, flags */
-                 setup, setup_count, max_setup_count,
-                 params, param_count, max_param_count,
-                 data, data_count, max_data_count);
+       struct cli_api_pipe_state *state = talloc_get_type_abort(
+               req->private_data, struct cli_api_pipe_state);
+       NTSTATUS status;
+
+       if (async_req_is_error(req, &status)) {
+               return status;
+       }
 
-       return (cli_receive_trans(cli, SMBtrans,
-                            rparam, (unsigned int *)rparam_count,
-                            rdata, (unsigned int *)rdata_count));
+       *prdata = talloc_move(mem_ctx, &state->rdata);
+       *prdata_len = state->rdata_len;
+       return NT_STATUS_OK;
 }
 
 /****************************************************************************
@@ -896,199 +1337,258 @@ static bool cli_api_pipe(struct cli_state *cli, const char *pipe_name,
 
  ****************************************************************************/
 
-static NTSTATUS rpc_api_pipe(struct rpc_pipe_client *cli,
-                       prs_struct *data, /* Outgoing pdu fragment, already formatted for send. */
-                       prs_struct *rbuf, /* Incoming reply - return as an NDR stream. */
-                       uint8 expected_pkt_type)
-{
-       NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
-       char *rparam = NULL;
-       uint32 rparam_len = 0;
-       char *pdata = prs_data_p(data);
-       uint32 data_len = prs_offset(data);
-       char *prdata = NULL;
-       uint32 rdata_len = 0;
-       uint32 max_data = cli->max_xmit_frag ? cli->max_xmit_frag : RPC_MAX_PDU_FRAG_LEN;
-       uint32 current_rbuf_offset = 0;
-       prs_struct current_pdu;
+struct rpc_api_pipe_state {
+       struct event_context *ev;
+       struct rpc_pipe_client *cli;
+       uint8_t expected_pkt_type;
 
-#ifdef DEVELOPER
-       /* Ensure we're not sending too much. */
-       SMB_ASSERT(data_len <= max_data);
-#endif
+       prs_struct incoming_frag;
+       struct rpc_hdr_info rhdr;
 
-       /* Set up the current pdu parse struct. */
-       prs_init_empty(&current_pdu, prs_get_mem_context(rbuf), UNMARSHALL);
+       prs_struct incoming_pdu;        /* Incoming reply */
+       uint32_t incoming_pdu_offset;
+};
 
-       DEBUG(5,("rpc_api_pipe: %s\n", rpccli_pipe_txt(debug_ctx(), cli)));
+static int rpc_api_pipe_state_destructor(struct rpc_api_pipe_state *state)
+{
+       prs_mem_free(&state->incoming_frag);
+       prs_mem_free(&state->incoming_pdu);
+       return 0;
+}
 
-       switch (cli->transport_type) {
-       case NCACN_NP: {
-               uint16 setup[2];
-               /* Create setup parameters - must be in native byte order. */
-               setup[0] = TRANSACT_DCERPCCMD;
-               setup[1] = cli->trans.np.fnum; /* Pipe file handle. */
+static void rpc_api_pipe_trans_done(struct async_req *subreq);
+static void rpc_api_pipe_got_pdu(struct async_req *subreq);
 
-               /*
-                * Send the last (or only) fragment of an RPC request. For
-                * small amounts of data (about 1024 bytes or so) the RPC
-                * request and response appears in a SMBtrans request and
-                * response.
-                */
+static struct async_req *rpc_api_pipe_send(TALLOC_CTX *mem_ctx,
+                                          struct event_context *ev,
+                                          struct rpc_pipe_client *cli,
+                                          prs_struct *data, /* Outgoing PDU */
+                                          uint8_t expected_pkt_type)
+{
+       struct async_req *result, *subreq;
+       struct rpc_api_pipe_state *state;
+       uint16_t max_recv_frag;
+       NTSTATUS status;
 
-               if (!cli_api_pipe(cli->trans.np.cli, "\\PIPE\\",
-                                 setup, 2, 0,     /* Setup, length, max */
-                                 NULL, 0, 0,      /* Params, length, max */
-                                 pdata, data_len, max_data, /* data, length,
-                                                             * max */
-                                 &rparam, &rparam_len, /* return params,
-                                                        * len */
-                                 &prdata, &rdata_len)) /* return data, len */
-               {
-                       DEBUG(0, ("rpc_api_pipe: %s returned critical error. "
-                                 "Error was %s\n",
-                                 rpccli_pipe_txt(debug_ctx(), cli),
-                                 cli_errstr(cli->trans.np.cli)));
-                       ret = cli_get_nt_error(cli->trans.np.cli);
-                       SAFE_FREE(rparam);
-                       SAFE_FREE(prdata);
-                       goto err;
-               }
-               break;
+       result = async_req_new(mem_ctx);
+       if (result == NULL) {
+               return NULL;
        }
-       case NCACN_IP_TCP:
-       case NCACN_UNIX_STREAM:
-       {
-               ssize_t nwritten, nread;
-               nwritten = write_data(cli->trans.sock.fd, pdata, data_len);
-               if (nwritten == -1) {
-                       ret = map_nt_error_from_unix(errno);
-                       DEBUG(0, ("rpc_api_pipe: write_data returned %s\n",
-                                 strerror(errno)));
-                       goto err;
-               }
-               rparam = NULL;
-               prdata = SMB_MALLOC_ARRAY(char, 1);
-               if (prdata == NULL) {
-                       return NT_STATUS_NO_MEMORY;
-               }
-               nread = sys_read(cli->trans.sock.fd, prdata, 1);
-               if (nread == 0) {
-                       SAFE_FREE(prdata);
-               }
-               if (nread == -1) {
-                       ret = NT_STATUS_END_OF_FILE;
-                       goto err;
-               }
-               rdata_len = nread;
-               break;
+       state = talloc(result, struct rpc_api_pipe_state);
+       if (state == NULL) {
+               goto fail;
        }
-       default:
-               DEBUG(0, ("unknown transport type %d\n",
-                         cli->transport_type));
-               return NT_STATUS_INTERNAL_ERROR;
+       result->private_data = state;
+
+       state->ev = ev;
+       state->cli = cli;
+       state->expected_pkt_type = expected_pkt_type;
+       state->incoming_pdu_offset = 0;
+
+       prs_init_empty(&state->incoming_frag, state, UNMARSHALL);
+
+       prs_init_empty(&state->incoming_pdu, state, UNMARSHALL);
+       /* Make incoming_pdu dynamic with no memory. */
+       prs_give_memory(&state->incoming_pdu, 0, 0, true);
+
+       talloc_set_destructor(state, rpc_api_pipe_state_destructor);
+
+       /*
+        * Ensure we're not sending too much.
+        */
+       if (prs_offset(data) > cli->max_xmit_frag) {
+               status = NT_STATUS_INVALID_PARAMETER;
+               goto post_status;
        }
 
-       /* Throw away returned params - we know we won't use them. */
+       DEBUG(5,("rpc_api_pipe: %s\n", rpccli_pipe_txt(debug_ctx(), cli)));
 
-       SAFE_FREE(rparam);
+       max_recv_frag = cli->max_recv_frag;
+
+#ifdef DEVELOPER
+       max_recv_frag = RPC_HEADER_LEN + 10 + (sys_random() % 32);
+#endif
+
+       subreq = cli_api_pipe_send(state, ev, cli, (uint8_t *)prs_data_p(data),
+                                  prs_offset(data), max_recv_frag);
+       if (subreq == NULL) {
+               status = NT_STATUS_NO_MEMORY;
+               goto post_status;
+       }
+       subreq->async.fn = rpc_api_pipe_trans_done;
+       subreq->async.priv = result;
+       return result;
+
+ post_status:
+       if (async_post_status(result, ev, status)) {
+               return result;
+       }
+ fail:
+       TALLOC_FREE(result);
+       return NULL;
+}
+
+static void rpc_api_pipe_trans_done(struct async_req *subreq)
+{
+       struct async_req *req = talloc_get_type_abort(
+               subreq->async.priv, struct async_req);
+       struct rpc_api_pipe_state *state = talloc_get_type_abort(
+               req->private_data, struct rpc_api_pipe_state);
+       NTSTATUS status;
+       uint8_t *rdata = NULL;
+       uint32_t rdata_len = 0;
+       char *rdata_copy;
+
+       status = cli_api_pipe_recv(subreq, state, &rdata, &rdata_len);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(5, ("cli_api_pipe failed: %s\n", nt_errstr(status)));
+               async_req_error(req, status);
+               return;
+       }
 
-       if (prdata == NULL) {
+       if (rdata == NULL) {
                DEBUG(3,("rpc_api_pipe: %s failed to return data.\n",
-                        rpccli_pipe_txt(debug_ctx(), cli)));
-               /* Yes - some calls can truely return no data... */
-               prs_mem_free(&current_pdu);
-               return NT_STATUS_OK;
+                        rpccli_pipe_txt(debug_ctx(), state->cli)));
+               async_req_done(req);
+               return;
        }
 
        /*
-        * Give this memory as dynamic to the current pdu.
+        * Give the memory received from cli_trans as dynamic to the current
+        * pdu. Duplicating it sucks, but prs_struct doesn't know about talloc
+        * :-(
         */
+       rdata_copy = (char *)memdup(rdata, rdata_len);
+       TALLOC_FREE(rdata);
+       if (async_req_nomem(rdata_copy, req)) {
+               return;
+       }
+       prs_give_memory(&state->incoming_frag, rdata_copy, rdata_len, true);
 
-       prs_give_memory(&current_pdu, prdata, rdata_len, True);
-
-       /* Ensure we can mess with the return prs_struct. */
-       SMB_ASSERT(UNMARSHALLING(rbuf));
-       SMB_ASSERT(prs_data_size(rbuf) == 0);
+       /* Ensure we have enough data for a pdu. */
+       subreq = get_complete_frag_send(state, state->ev, state->cli,
+                                       &state->rhdr, &state->incoming_frag);
+       if (async_req_nomem(subreq, req)) {
+               return;
+       }
+       subreq->async.fn = rpc_api_pipe_got_pdu;
+       subreq->async.priv = req;
+}
 
-       /* Make rbuf dynamic with no memory. */
-       prs_give_memory(rbuf, 0, 0, True);
+static void rpc_api_pipe_got_pdu(struct async_req *subreq)
+{
+       struct async_req *req = talloc_get_type_abort(
+               subreq->async.priv, struct async_req);
+       struct rpc_api_pipe_state *state = talloc_get_type_abort(
+               req->private_data, struct rpc_api_pipe_state);
+       NTSTATUS status;
+       char *rdata = NULL;
+       uint32_t rdata_len = 0;
 
-       while(1) {
-               RPC_HDR rhdr;
-               char *ret_data = NULL;
-               uint32 ret_data_len = 0;
+       status = get_complete_frag_recv(subreq);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(5, ("get_complete_frag failed: %s\n",
+                         nt_errstr(status)));
+               async_req_error(req, status);
+               return;
+       }
 
-               /* Ensure we have enough data for a pdu. */
-               ret = cli_pipe_get_current_pdu(cli, &rhdr, &current_pdu);
-               if (!NT_STATUS_IS_OK(ret)) {
-                       goto err;
-               }
+       status = cli_pipe_validate_current_pdu(
+               state->cli, &state->rhdr, &state->incoming_frag,
+               state->expected_pkt_type, &rdata, &rdata_len,
+               &state->incoming_pdu);
 
-               /* We pass in rbuf here so if the alloc hint is set correctly 
-                  we can set the output size and avoid reallocs. */
+       DEBUG(10,("rpc_api_pipe: got frag len of %u at offset %u: %s\n",
+                 (unsigned)prs_data_size(&state->incoming_frag),
+                 (unsigned)state->incoming_pdu_offset,
+                 nt_errstr(status)));
 
-               ret = cli_pipe_validate_current_pdu(cli, &rhdr, &current_pdu, expected_pkt_type,
-                               &ret_data, &ret_data_len, rbuf);
+       if (!NT_STATUS_IS_OK(status)) {
+               async_req_error(req, status);
+               return;
+       }
 
-               DEBUG(10,("rpc_api_pipe: got PDU len of %u at offset %u\n",
-                       prs_data_size(&current_pdu), current_rbuf_offset ));
+       if ((state->rhdr.flags & RPC_FLG_FIRST)
+           && (state->rhdr.pack_type[0] == 0)) {
+               /*
+                * Set the data type correctly for big-endian data on the
+                * first packet.
+                */
+               DEBUG(10,("rpc_api_pipe: On %s PDU data format is "
+                         "big-endian.\n",
+                         rpccli_pipe_txt(debug_ctx(), state->cli)));
+               prs_set_endian_data(&state->incoming_pdu, RPC_BIG_ENDIAN);
+       }
+       /*
+        * Check endianness on subsequent packets.
+        */
+       if (state->incoming_frag.bigendian_data
+           != state->incoming_pdu.bigendian_data) {
+               DEBUG(0,("rpc_api_pipe: Error : Endianness changed from %s to "
+                        "%s\n",
+                        state->incoming_pdu.bigendian_data?"big":"little",
+                        state->incoming_frag.bigendian_data?"big":"little"));
+               async_req_error(req, NT_STATUS_INVALID_PARAMETER);
+               return;
+       }
 
-               if (!NT_STATUS_IS_OK(ret)) {
-                       goto err;
-               }
+       /* Now copy the data portion out of the pdu into rbuf. */
+       if (!prs_force_grow(&state->incoming_pdu, rdata_len)) {
+               async_req_error(req, NT_STATUS_NO_MEMORY);
+               return;
+       }
 
-               if ((rhdr.flags & RPC_FLG_FIRST)) {
-                       if (rhdr.pack_type[0] == 0) {
-                               /* Set the data type correctly for big-endian data on the first packet. */
-                               DEBUG(10,("rpc_api_pipe: On %s "
-                                       "PDU data format is big-endian.\n",
-                                       rpccli_pipe_txt(debug_ctx(), cli)));
+       memcpy(prs_data_p(&state->incoming_pdu) + state->incoming_pdu_offset,
+              rdata, (size_t)rdata_len);
+       state->incoming_pdu_offset += rdata_len;
 
-                               prs_set_endian_data(rbuf, RPC_BIG_ENDIAN);
-                       } else {
-                               /* Check endianness on subsequent packets. */
-                               if (current_pdu.bigendian_data != rbuf->bigendian_data) {
-                                       DEBUG(0,("rpc_api_pipe: Error : Endianness changed from %s to %s\n",
-                                               rbuf->bigendian_data ? "big" : "little",
-                                               current_pdu.bigendian_data ? "big" : "little" ));
-                                       ret = NT_STATUS_INVALID_PARAMETER;
-                                       goto err;
-                               }
-                       }
-               }
+       status = cli_pipe_reset_current_pdu(state->cli, &state->rhdr,
+                                           &state->incoming_frag);
+       if (!NT_STATUS_IS_OK(status)) {
+               async_req_error(req, status);
+               return;
+       }
 
-               /* Now copy the data portion out of the pdu into rbuf. */
-               if (!prs_force_grow(rbuf, ret_data_len)) {
-                        ret = NT_STATUS_NO_MEMORY;
-                        goto err;
-                }
-               memcpy(prs_data_p(rbuf)+current_rbuf_offset, ret_data, (size_t)ret_data_len);
-               current_rbuf_offset += ret_data_len;
-
-               /* See if we've finished with all the data in current_pdu yet ? */
-               ret = cli_pipe_reset_current_pdu(cli, &rhdr, &current_pdu);
-               if (!NT_STATUS_IS_OK(ret)) {
-                       goto err;
-               }
+       if (state->rhdr.flags & RPC_FLG_LAST) {
+               DEBUG(10,("rpc_api_pipe: %s returned %u bytes.\n",
+                         rpccli_pipe_txt(debug_ctx(), state->cli),
+                         (unsigned)prs_data_size(&state->incoming_pdu)));
+               async_req_done(req);
+               return;
+       }
 
-               if (rhdr.flags & RPC_FLG_LAST) {
-                       break; /* We're done. */
-               }
+       subreq = get_complete_frag_send(state, state->ev, state->cli,
+                                       &state->rhdr, &state->incoming_frag);
+       if (async_req_nomem(subreq, req)) {
+               return;
        }
+       subreq->async.fn = rpc_api_pipe_got_pdu;
+       subreq->async.priv = req;
+}
 
-       DEBUG(10,("rpc_api_pipe: %s returned %u bytes.\n",
-               rpccli_pipe_txt(debug_ctx(), cli),
-               (unsigned int)prs_data_size(rbuf) ));
+static NTSTATUS rpc_api_pipe_recv(struct async_req *req, TALLOC_CTX *mem_ctx,
+                                 prs_struct *reply_pdu)
+{
+       struct rpc_api_pipe_state *state = talloc_get_type_abort(
+               req->private_data, struct rpc_api_pipe_state);
+       NTSTATUS status;
 
-       prs_mem_free(&current_pdu);
-       return NT_STATUS_OK;
+       if (async_req_is_error(req, &status)) {
+               return status;
+       }
 
-  err:
+       *reply_pdu = state->incoming_pdu;
+       reply_pdu->mem_ctx = mem_ctx;
 
-       prs_mem_free(&current_pdu);
-       prs_mem_free(rbuf);
-       return ret;
+       /*
+        * Prevent state->incoming_pdu from being freed in
+        * rpc_api_pipe_state_destructor()
+        */
+       prs_init_empty(&state->incoming_pdu, state, UNMARSHALL);
+
+       return NT_STATUS_OK;
 }
 
 /*******************************************************************
@@ -1591,6 +2091,12 @@ static uint32 calculate_data_len_tosend(struct rpc_pipe_client *cli,
 {
        uint32 data_space, data_len;
 
+#ifdef DEVELOPER
+       if ((data_left > 0) && (sys_random() % 2)) {
+               data_left = MAX(data_left/2, 1);
+       }
+#endif
+
        switch (cli->auth->auth_level) {
                case PIPE_AUTH_LEVEL_NONE:
                case PIPE_AUTH_LEVEL_CONNECT:
@@ -1621,6 +2127,7 @@ static uint32 calculate_data_len_tosend(struct rpc_pipe_client *cli,
                                                RPC_HDR_AUTH_LEN - *p_auth_len;
 
                        data_len = MIN(data_space, data_left);
+                       *p_ss_padding = 0;
                        if (data_len % 8) {
                                *p_ss_padding = 8 - (data_len % 8);
                        }
@@ -1643,170 +2150,309 @@ static uint32 calculate_data_len_tosend(struct rpc_pipe_client *cli,
  and deals with signing/sealing details.
  ********************************************************************/
 
-NTSTATUS rpc_api_pipe_req(struct rpc_pipe_client *cli,
-                       uint8 op_num,
-                       prs_struct *in_data,
-                       prs_struct *out_data)
+struct rpc_api_pipe_req_state {
+       struct event_context *ev;
+       struct rpc_pipe_client *cli;
+       uint8_t op_num;
+       uint32_t call_id;
+       prs_struct *req_data;
+       uint32_t req_data_sent;
+       prs_struct outgoing_frag;
+       prs_struct reply_pdu;
+};
+
+static int rpc_api_pipe_req_state_destructor(struct rpc_api_pipe_req_state *s)
+{
+       prs_mem_free(&s->outgoing_frag);
+       prs_mem_free(&s->reply_pdu);
+       return 0;
+}
+
+static void rpc_api_pipe_req_write_done(struct async_req *subreq);
+static void rpc_api_pipe_req_done(struct async_req *subreq);
+static NTSTATUS prepare_next_frag(struct rpc_api_pipe_req_state *state,
+                                 bool *is_last_frag);
+
+struct async_req *rpc_api_pipe_req_send(TALLOC_CTX *mem_ctx,
+                                       struct event_context *ev,
+                                       struct rpc_pipe_client *cli,
+                                       uint8_t op_num,
+                                       prs_struct *req_data)
 {
-       NTSTATUS ret;
-       uint32 data_left = prs_offset(in_data);
-       uint32 alloc_hint = prs_offset(in_data);
-       uint32 data_sent_thistime = 0;
-       uint32 current_data_offset = 0;
-       uint32 call_id = get_rpc_call_id();
-       char pad[8];
-       prs_struct outgoing_pdu;
+       struct async_req *result, *subreq;
+       struct rpc_api_pipe_req_state *state;
+       NTSTATUS status;
+       bool is_last_frag;
+
+       result = async_req_new(mem_ctx);
+       if (result == NULL) {
+               return NULL;
+       }
+       state = talloc(result, struct rpc_api_pipe_req_state);
+       if (state == NULL) {
+               goto fail;
+       }
+       result->private_data = state;
 
-       memset(pad, '\0', 8);
+       state->ev = ev;
+       state->cli = cli;
+       state->op_num = op_num;
+       state->req_data = req_data;
+       state->req_data_sent = 0;
+       state->call_id = get_rpc_call_id();
 
-       if (cli->max_xmit_frag < RPC_HEADER_LEN + RPC_HDR_REQ_LEN + RPC_MAX_SIGN_SIZE) {
+       if (cli->max_xmit_frag
+           < RPC_HEADER_LEN + RPC_HDR_REQ_LEN + RPC_MAX_SIGN_SIZE) {
                /* Server is screwed up ! */
-               return NT_STATUS_INVALID_PARAMETER;
+               status = NT_STATUS_INVALID_PARAMETER;
+               goto post_status;
        }
 
-       if (!prs_init(&outgoing_pdu, cli->max_xmit_frag, prs_get_mem_context(in_data), MARSHALL))
-               return NT_STATUS_NO_MEMORY;
+       prs_init_empty(&state->reply_pdu, state, UNMARSHALL);
 
-       while (1) {
-               RPC_HDR hdr;
-               RPC_HDR_REQ hdr_req;
-               uint16 auth_len = 0;
-               uint16 frag_len = 0;
-               uint8 flags = 0;
-               uint32 ss_padding = 0;
-               ssize_t num_written;
+       if (!prs_init(&state->outgoing_frag, cli->max_xmit_frag,
+                     state, MARSHALL)) {
+               status = NT_STATUS_NO_MEMORY;
+               goto post_status;
+       }
 
-               data_sent_thistime = calculate_data_len_tosend(cli, data_left,
-                                               &frag_len, &auth_len, &ss_padding);
+       talloc_set_destructor(state, rpc_api_pipe_req_state_destructor);
 
-               if (current_data_offset == 0) {
-                       flags = RPC_FLG_FIRST;
-               }
+       status = prepare_next_frag(state, &is_last_frag);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto post_status;
+       }
 
-               if (data_sent_thistime == data_left) {
-                       flags |= RPC_FLG_LAST;
+       if (is_last_frag) {
+               subreq = rpc_api_pipe_send(state, ev, state->cli,
+                                          &state->outgoing_frag,
+                                          RPC_RESPONSE);
+               if (subreq == NULL) {
+                       status = NT_STATUS_NO_MEMORY;
+                       goto post_status;
                }
+               subreq->async.fn = rpc_api_pipe_req_done;
+               subreq->async.priv = result;
+       } else {
+               subreq = rpc_write_send(state, ev, cli,
+                                       prs_data_p(&state->outgoing_frag),
+                                       prs_offset(&state->outgoing_frag));
+               if (subreq == NULL) {
+                       status = NT_STATUS_NO_MEMORY;
+                       goto post_status;
+               }
+               subreq->async.fn = rpc_api_pipe_req_write_done;
+               subreq->async.priv = result;
+       }
+       return result;
 
-               /* Create and marshall the header and request header. */
-               init_rpc_hdr(&hdr, RPC_REQUEST, flags, call_id, frag_len, auth_len);
+ post_status:
+       if (async_post_status(result, ev, status)) {
+               return result;
+       }
+ fail:
+       TALLOC_FREE(result);
+       return NULL;
+}
 
-               if(!smb_io_rpc_hdr("hdr    ", &hdr, &outgoing_pdu, 0)) {
-                       prs_mem_free(&outgoing_pdu);
-                       return NT_STATUS_NO_MEMORY;
-               }
+static NTSTATUS prepare_next_frag(struct rpc_api_pipe_req_state *state,
+                                 bool *is_last_frag)
+{
+       RPC_HDR hdr;
+       RPC_HDR_REQ hdr_req;
+       uint32_t data_sent_thistime;
+       uint16_t auth_len;
+       uint16_t frag_len;
+       uint8_t flags = 0;
+       uint32_t ss_padding;
+       uint32_t data_left;
+       char pad[8] = { 0, };
+       NTSTATUS status;
 
-               /* Create the rpc request RPC_HDR_REQ */
-               init_rpc_hdr_req(&hdr_req, alloc_hint, op_num);
+       data_left = prs_offset(state->req_data) - state->req_data_sent;
 
-               if(!smb_io_rpc_hdr_req("hdr_req", &hdr_req, &outgoing_pdu, 0)) {
-                       prs_mem_free(&outgoing_pdu);
-                       return NT_STATUS_NO_MEMORY;
-               }
+       data_sent_thistime = calculate_data_len_tosend(
+               state->cli, data_left, &frag_len, &auth_len, &ss_padding);
 
-               /* Copy in the data, plus any ss padding. */
-               if (!prs_append_some_prs_data(&outgoing_pdu, in_data, current_data_offset, data_sent_thistime)) {
-                       prs_mem_free(&outgoing_pdu);
-                       return NT_STATUS_NO_MEMORY;
-               }
+       if (state->req_data_sent == 0) {
+               flags = RPC_FLG_FIRST;
+       }
 
-               /* Copy the sign/seal padding data. */
-               if (ss_padding) {
-                       if (!prs_copy_data_in(&outgoing_pdu, pad, ss_padding)) {
-                               prs_mem_free(&outgoing_pdu);
-                               return NT_STATUS_NO_MEMORY;
-                       }
-               }
+       if (data_sent_thistime == data_left) {
+               flags |= RPC_FLG_LAST;
+       }
 
-               /* Generate any auth sign/seal and add the auth footer. */
-               if (auth_len) {
-                       switch (cli->auth->auth_type) {
-                               case PIPE_AUTH_TYPE_NONE:
-                                       break;
-                               case PIPE_AUTH_TYPE_NTLMSSP:
-                               case PIPE_AUTH_TYPE_SPNEGO_NTLMSSP:
-                                       ret = add_ntlmssp_auth_footer(cli, &hdr, ss_padding, &outgoing_pdu);
-                                       if (!NT_STATUS_IS_OK(ret)) {
-                                               prs_mem_free(&outgoing_pdu);
-                                               return ret;
-                                       }
-                                       break;
-                               case PIPE_AUTH_TYPE_SCHANNEL:
-                                       ret = add_schannel_auth_footer(cli, &hdr, ss_padding, &outgoing_pdu);
-                                       if (!NT_STATUS_IS_OK(ret)) {
-                                               prs_mem_free(&outgoing_pdu);
-                                               return ret;
-                                       }
-                                       break;
-                               default:
-                                       smb_panic("bad auth type");
-                                       break; /* notreached */
-                       }
-               }
+       if (!prs_set_offset(&state->outgoing_frag, 0)) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
-               /* Actually send the packet. */
-               if (flags & RPC_FLG_LAST) {
-                       /* Last packet - send the data, get the reply and return. */
-                       ret = rpc_api_pipe(cli, &outgoing_pdu, out_data, RPC_RESPONSE);
-                       prs_mem_free(&outgoing_pdu);
-
-                       if ((DEBUGLEVEL >= 50)
-                           && (cli->transport_type == NCACN_NP)) {
-                               char *dump_name = NULL;
-                               /* Also capture received data */
-                               if (asprintf(&dump_name, "%s/reply_%s_%d",
-                                            get_dyn_LOGFILEBASE(),
-                                            cli->trans.np.pipe_name, op_num) > 0) {
-                                       prs_dump(dump_name, op_num, out_data);
-                                       SAFE_FREE(dump_name);
-                               }
-                       }
+       /* Create and marshall the header and request header. */
+       init_rpc_hdr(&hdr, RPC_REQUEST, flags, state->call_id, frag_len,
+                    auth_len);
 
-                       return ret;
-               }
+       if (!smb_io_rpc_hdr("hdr    ", &hdr, &state->outgoing_frag, 0)) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
-               switch (cli->transport_type) {
-               case NCACN_NP:
-                       num_written = cli_write(cli->trans.np.cli,
-                                               cli->trans.np.fnum,
-                                               8, /* 8 means message mode. */
-                                               prs_data_p(&outgoing_pdu),
-                                               (off_t)0,
-                                               (size_t)hdr.frag_len);
-
-                       if (num_written != hdr.frag_len) {
-                               prs_mem_free(&outgoing_pdu);
-                               return cli_get_nt_error(cli->trans.np.cli);
-                       }
-                       break;
-               case NCACN_IP_TCP:
-               case NCACN_UNIX_STREAM:
-                       num_written = write_data(
-                               cli->trans.sock.fd,
-                               prs_data_p(&outgoing_pdu),
-                               (size_t)hdr.frag_len);
-                       if (num_written != hdr.frag_len) {
-                               NTSTATUS status;
-                               status = map_nt_error_from_unix(errno);
-                               prs_mem_free(&outgoing_pdu);
-                               return status;
-                       }
-                       break;
-               default:
-                       DEBUG(0, ("unknown transport type %d\n",
-                                 cli->transport_type));
-                       return NT_STATUS_INTERNAL_ERROR;
-               }
+       /* Create the rpc request RPC_HDR_REQ */
+       init_rpc_hdr_req(&hdr_req, prs_offset(state->req_data),
+                        state->op_num);
 
-               current_data_offset += data_sent_thistime;
-               data_left -= data_sent_thistime;
+       if (!smb_io_rpc_hdr_req("hdr_req", &hdr_req,
+                               &state->outgoing_frag, 0)) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
-               /* Reset the marshalling position back to zero. */
-               if (!prs_set_offset(&outgoing_pdu, 0)) {
-                       prs_mem_free(&outgoing_pdu);
-                       return NT_STATUS_NO_MEMORY;
+       /* Copy in the data, plus any ss padding. */
+       if (!prs_append_some_prs_data(&state->outgoing_frag,
+                                     state->req_data, state->req_data_sent,
+                                     data_sent_thistime)) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       /* Copy the sign/seal padding data. */
+       if (!prs_copy_data_in(&state->outgoing_frag, pad, ss_padding)) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       /* Generate any auth sign/seal and add the auth footer. */
+       switch (state->cli->auth->auth_type) {
+       case PIPE_AUTH_TYPE_NONE:
+               status = NT_STATUS_OK;
+               break;
+       case PIPE_AUTH_TYPE_NTLMSSP:
+       case PIPE_AUTH_TYPE_SPNEGO_NTLMSSP:
+               status = add_ntlmssp_auth_footer(state->cli, &hdr, ss_padding,
+                                                &state->outgoing_frag);
+               break;
+       case PIPE_AUTH_TYPE_SCHANNEL:
+               status = add_schannel_auth_footer(state->cli, &hdr, ss_padding,
+                                                 &state->outgoing_frag);
+               break;
+       default:
+               status = NT_STATUS_INVALID_PARAMETER;
+               break;
+       }
+
+       state->req_data_sent += data_sent_thistime;
+       *is_last_frag = ((flags & RPC_FLG_LAST) != 0);
+
+       return status;
+}
+
+static void rpc_api_pipe_req_write_done(struct async_req *subreq)
+{
+       struct async_req *req = talloc_get_type_abort(
+               subreq->async.priv, struct async_req);
+       struct rpc_api_pipe_req_state *state = talloc_get_type_abort(
+               req->private_data, struct rpc_api_pipe_req_state);
+       NTSTATUS status;
+       bool is_last_frag;
+
+       status = rpc_write_recv(subreq);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               async_req_error(req, status);
+               return;
+       }
+
+       status = prepare_next_frag(state, &is_last_frag);
+       if (!NT_STATUS_IS_OK(status)) {
+               async_req_error(req, status);
+               return;
+       }
+
+       if (is_last_frag) {
+               subreq = rpc_api_pipe_send(state, state->ev, state->cli,
+                                          &state->outgoing_frag,
+                                          RPC_RESPONSE);
+               if (async_req_nomem(subreq, req)) {
+                       return;
                }
+               subreq->async.fn = rpc_api_pipe_req_done;
+               subreq->async.priv = req;
+       } else {
+               subreq = rpc_write_send(state, state->ev, state->cli,
+                                       prs_data_p(&state->outgoing_frag),
+                                       prs_offset(&state->outgoing_frag));
+               if (async_req_nomem(subreq, req)) {
+                       return;
+               }
+               subreq->async.fn = rpc_api_pipe_req_write_done;
+               subreq->async.priv = req;
+       }
+}
+
+static void rpc_api_pipe_req_done(struct async_req *subreq)
+{
+       struct async_req *req = talloc_get_type_abort(
+               subreq->async.priv, struct async_req);
+       struct rpc_api_pipe_req_state *state = talloc_get_type_abort(
+               req->private_data, struct rpc_api_pipe_req_state);
+       NTSTATUS status;
+
+       status = rpc_api_pipe_recv(subreq, state, &state->reply_pdu);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               async_req_error(req, status);
+               return;
+       }
+       async_req_done(req);
+}
+
+NTSTATUS rpc_api_pipe_req_recv(struct async_req *req, TALLOC_CTX *mem_ctx,
+                              prs_struct *reply_pdu)
+{
+       struct rpc_api_pipe_req_state *state = talloc_get_type_abort(
+               req->private_data, struct rpc_api_pipe_req_state);
+       NTSTATUS status;
+
+       if (async_req_is_error(req, &status)) {
+               return status;
+       }
+
+       *reply_pdu = state->reply_pdu;
+       reply_pdu->mem_ctx = mem_ctx;
+
+       /*
+        * Prevent state->req_pdu from being freed in
+        * rpc_api_pipe_req_state_destructor()
+        */
+       prs_init_empty(&state->reply_pdu, state, UNMARSHALL);
+
+       return NT_STATUS_OK;
+}
+
+NTSTATUS rpc_api_pipe_req(TALLOC_CTX *mem_ctx, struct rpc_pipe_client *cli,
+                       uint8 op_num,
+                       prs_struct *in_data,
+                       prs_struct *out_data)
+{
+       TALLOC_CTX *frame = talloc_stackframe();
+       struct event_context *ev;
+       struct async_req *req;
+       NTSTATUS status = NT_STATUS_NO_MEMORY;
+
+       ev = event_context_init(frame);
+       if (ev == NULL) {
+               goto fail;
+       }
+
+       req = rpc_api_pipe_req_send(frame, ev, cli, op_num, in_data);
+       if (req == NULL) {
+               goto fail;
+       }
+
+       while (req->state < ASYNC_REQ_DONE) {
+               event_loop_once(ev);
        }
+
+       status = rpc_api_pipe_req_recv(req, mem_ctx, out_data);
+ fail:
+       TALLOC_FREE(frame);
+       return status;
 }
+
 #if 0
 /****************************************************************************
  Set the handle state.
@@ -1942,188 +2588,342 @@ static NTSTATUS create_rpc_bind_auth3(struct rpc_pipe_client *cli,
        return NT_STATUS_OK;
 }
 
-/****************************************************************************
- Create and send the third packet in an RPC auth.
-****************************************************************************/
+/*******************************************************************
+ Creates a DCE/RPC bind alter context authentication request which
+ may contain a spnego auth blobl
+ ********************************************************************/
 
-static NTSTATUS rpc_finish_auth3_bind(struct rpc_pipe_client *cli,
-                               RPC_HDR *phdr,
-                               prs_struct *rbuf,
-                               uint32 rpc_call_id,
-                               enum pipe_auth_type auth_type,
-                               enum pipe_auth_level auth_level)
+static NTSTATUS create_rpc_alter_context(uint32 rpc_call_id,
+                                       const RPC_IFACE *abstract,
+                                       const RPC_IFACE *transfer,
+                                       enum pipe_auth_level auth_level,
+                                       const DATA_BLOB *pauth_blob, /* spnego auth blob already created. */
+                                       prs_struct *rpc_out)
 {
-       DATA_BLOB server_response = data_blob_null;
-       DATA_BLOB client_reply = data_blob_null;
        RPC_HDR_AUTH hdr_auth;
-       NTSTATUS nt_status;
-       prs_struct rpc_out;
-       ssize_t ret;
+       prs_struct auth_info;
+       NTSTATUS ret = NT_STATUS_OK;
 
-       if (!phdr->auth_len || (phdr->frag_len < phdr->auth_len + RPC_HDR_AUTH_LEN)) {
-               return NT_STATUS_INVALID_PARAMETER;
-       }
+       ZERO_STRUCT(hdr_auth);
+       if (!prs_init(&auth_info, RPC_HDR_AUTH_LEN, prs_get_mem_context(rpc_out), MARSHALL))
+               return NT_STATUS_NO_MEMORY;
 
-       /* Process the returned NTLMSSP blob first. */
-       if (!prs_set_offset(rbuf, phdr->frag_len - phdr->auth_len - RPC_HDR_AUTH_LEN)) {
-               return NT_STATUS_INVALID_PARAMETER;
+       /* We may change the pad length before marshalling. */
+       init_rpc_hdr_auth(&hdr_auth, RPC_SPNEGO_AUTH_TYPE, (int)auth_level, 0, 1);
+
+       if (pauth_blob->length) {
+               if (!prs_copy_data_in(&auth_info, (const char *)pauth_blob->data, pauth_blob->length)) {
+                       prs_mem_free(&auth_info);
+                       return NT_STATUS_NO_MEMORY;
+               }
        }
 
-       if(!smb_io_rpc_hdr_auth("hdr_auth", &hdr_auth, rbuf, 0)) {
-               return NT_STATUS_INVALID_PARAMETER;
+       ret = create_bind_or_alt_ctx_internal(RPC_ALTCONT,
+                                               rpc_out, 
+                                               rpc_call_id,
+                                               abstract,
+                                               transfer,
+                                               &hdr_auth,
+                                               &auth_info);
+       prs_mem_free(&auth_info);
+       return ret;
+}
+
+/****************************************************************************
+ Do an rpc bind.
+****************************************************************************/
+
+struct rpc_pipe_bind_state {
+       struct event_context *ev;
+       struct rpc_pipe_client *cli;
+       prs_struct rpc_out;
+       uint32_t rpc_call_id;
+};
+
+static int rpc_pipe_bind_state_destructor(struct rpc_pipe_bind_state *state)
+{
+       prs_mem_free(&state->rpc_out);
+       return 0;
+}
+
+static void rpc_pipe_bind_step_one_done(struct async_req *subreq);
+static NTSTATUS rpc_finish_auth3_bind_send(struct async_req *req,
+                                          struct rpc_pipe_bind_state *state,
+                                          struct rpc_hdr_info *phdr,
+                                          prs_struct *reply_pdu);
+static void rpc_bind_auth3_write_done(struct async_req *subreq);
+static NTSTATUS rpc_finish_spnego_ntlmssp_bind_send(struct async_req *req,
+                                                   struct rpc_pipe_bind_state *state,
+                                                   struct rpc_hdr_info *phdr,
+                                                   prs_struct *reply_pdu);
+static void rpc_bind_ntlmssp_api_done(struct async_req *subreq);
+
+struct async_req *rpc_pipe_bind_send(TALLOC_CTX *mem_ctx,
+                                    struct event_context *ev,
+                                    struct rpc_pipe_client *cli,
+                                    struct cli_pipe_auth_data *auth)
+{
+       struct async_req *result, *subreq;
+       struct rpc_pipe_bind_state *state;
+       NTSTATUS status;
+
+       result = async_req_new(mem_ctx);
+       if (result == NULL) {
+               return NULL;
        }
+       state = talloc(result, struct rpc_pipe_bind_state);
+       if (state == NULL) {
+               goto fail;
+       }
+       result->private_data = state;
 
-       /* TODO - check auth_type/auth_level match. */
+       DEBUG(5,("Bind RPC Pipe: %s auth_type %u, auth_level %u\n",
+               rpccli_pipe_txt(debug_ctx(), cli),
+               (unsigned int)auth->auth_type,
+               (unsigned int)auth->auth_level ));
 
-       server_response = data_blob(NULL, phdr->auth_len);
-       prs_copy_data_out((char *)server_response.data, rbuf, phdr->auth_len);
+       state->ev = ev;
+       state->cli = cli;
+       state->rpc_call_id = get_rpc_call_id();
 
-       nt_status = ntlmssp_update(cli->auth->a_u.ntlmssp_state,
-                                  server_response,
-                                  &client_reply);
+       prs_init_empty(&state->rpc_out, state, MARSHALL);
+       talloc_set_destructor(state, rpc_pipe_bind_state_destructor);
 
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               DEBUG(0,("rpc_finish_auth3_bind: NTLMSSP update using server blob failed.\n"));
-               data_blob_free(&server_response);
-               return nt_status;
+       cli->auth = talloc_move(cli, &auth);
+
+       /* Marshall the outgoing data. */
+       status = create_rpc_bind_req(cli, &state->rpc_out,
+                                    state->rpc_call_id,
+                                    &cli->abstract_syntax,
+                                    &cli->transfer_syntax,
+                                    cli->auth->auth_type,
+                                    cli->auth->auth_level);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               goto post_status;
+       }
+
+       subreq = rpc_api_pipe_send(state, ev, cli, &state->rpc_out,
+                                  RPC_BINDACK);
+       if (subreq == NULL) {
+               status = NT_STATUS_NO_MEMORY;
+               goto post_status;
        }
+       subreq->async.fn = rpc_pipe_bind_step_one_done;
+       subreq->async.priv = result;
+       return result;
 
-       prs_init_empty(&rpc_out, prs_get_mem_context(rbuf), MARSHALL);
+ post_status:
+       if (async_post_status(result, ev, status)) {
+               return result;
+       }
+ fail:
+       TALLOC_FREE(result);
+       return NULL;
+}
 
-       nt_status = create_rpc_bind_auth3(cli, rpc_call_id,
-                               auth_type, auth_level,
-                               &client_reply, &rpc_out);
+static void rpc_pipe_bind_step_one_done(struct async_req *subreq)
+{
+       struct async_req *req = talloc_get_type_abort(
+               subreq->async.priv, struct async_req);
+       struct rpc_pipe_bind_state *state = talloc_get_type_abort(
+               req->private_data, struct rpc_pipe_bind_state);
+       prs_struct reply_pdu;
+       struct rpc_hdr_info hdr;
+       struct rpc_hdr_ba_info hdr_ba;
+       NTSTATUS status;
 
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               prs_mem_free(&rpc_out);
-               data_blob_free(&client_reply);
-               data_blob_free(&server_response);
-               return nt_status;
+       status = rpc_api_pipe_recv(subreq, talloc_tos(), &reply_pdu);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(3, ("rpc_pipe_bind: %s bind request returned %s\n",
+                         rpccli_pipe_txt(debug_ctx(), state->cli),
+                         nt_errstr(status)));
+               async_req_error(req, status);
+               return;
        }
 
-       switch (cli->transport_type) {
-       case NCACN_NP:
-               /* 8 here is named pipe message mode. */
-               ret = cli_write(cli->trans.np.cli, cli->trans.np.fnum,
-                               0x8, prs_data_p(&rpc_out), 0,
-                               (size_t)prs_offset(&rpc_out));
+       /* Unmarshall the RPC header */
+       if (!smb_io_rpc_hdr("hdr", &hdr, &reply_pdu, 0)) {
+               DEBUG(0, ("rpc_pipe_bind: failed to unmarshall RPC_HDR.\n"));
+               async_req_error(req, NT_STATUS_BUFFER_TOO_SMALL);
+               return;
+       }
+
+       if (!smb_io_rpc_hdr_ba("", &hdr_ba, &reply_pdu, 0)) {
+               DEBUG(0, ("rpc_pipe_bind: Failed to unmarshall "
+                         "RPC_HDR_BA.\n"));
+               async_req_error(req, NT_STATUS_BUFFER_TOO_SMALL);
+               return;
+       }
+
+       if (!check_bind_response(&hdr_ba, &state->cli->transfer_syntax)) {
+               DEBUG(2, ("rpc_pipe_bind: check_bind_response failed.\n"));
+               async_req_error(req, NT_STATUS_BUFFER_TOO_SMALL);
+               return;
+       }
+
+       state->cli->max_xmit_frag = hdr_ba.bba.max_tsize;
+       state->cli->max_recv_frag = hdr_ba.bba.max_rsize;
+
+       /*
+        * For authenticated binds we may need to do 3 or 4 leg binds.
+        */
+
+       switch(state->cli->auth->auth_type) {
+
+       case PIPE_AUTH_TYPE_NONE:
+       case PIPE_AUTH_TYPE_SCHANNEL:
+               /* Bind complete. */
+               async_req_done(req);
                break;
 
-               if (ret != (ssize_t)prs_offset(&rpc_out)) {
-                       nt_status = cli_get_nt_error(cli->trans.np.cli);
+       case PIPE_AUTH_TYPE_NTLMSSP:
+               /* Need to send AUTH3 packet - no reply. */
+               status = rpc_finish_auth3_bind_send(req, state, &hdr,
+                                                   &reply_pdu);
+               if (!NT_STATUS_IS_OK(status)) {
+                       async_req_error(req, status);
                }
-       case NCACN_IP_TCP:
-       case NCACN_UNIX_STREAM:
-               ret = write_data(cli->trans.sock.fd, prs_data_p(&rpc_out),
-                                (size_t)prs_offset(&rpc_out));
-               if (ret != (ssize_t)prs_offset(&rpc_out)) {
-                       nt_status = map_nt_error_from_unix(errno);
+               break;
+
+       case PIPE_AUTH_TYPE_SPNEGO_NTLMSSP:
+               /* Need to send alter context request and reply. */
+               status = rpc_finish_spnego_ntlmssp_bind_send(req, state, &hdr,
+                                                            &reply_pdu);
+               if (!NT_STATUS_IS_OK(status)) {
+                       async_req_error(req, status);
                }
                break;
+
+       case PIPE_AUTH_TYPE_KRB5:
+               /* */
+
        default:
-               DEBUG(0, ("unknown transport type %d\n", cli->transport_type));
-               return NT_STATUS_INTERNAL_ERROR;
+               DEBUG(0,("cli_finish_bind_auth: unknown auth type %u\n",
+                        (unsigned int)state->cli->auth->auth_type));
+               async_req_error(req, NT_STATUS_INTERNAL_ERROR);
        }
+}
 
-       if (ret != (ssize_t)prs_offset(&rpc_out)) {
-               DEBUG(0,("rpc_send_auth_auth3: write failed. Return was %s\n",
-                        nt_errstr(nt_status)));
-               prs_mem_free(&rpc_out);
-               data_blob_free(&client_reply);
-               data_blob_free(&server_response);
-               return nt_status;
+static NTSTATUS rpc_finish_auth3_bind_send(struct async_req *req,
+                                          struct rpc_pipe_bind_state *state,
+                                          struct rpc_hdr_info *phdr,
+                                          prs_struct *reply_pdu)
+{
+       DATA_BLOB server_response = data_blob_null;
+       DATA_BLOB client_reply = data_blob_null;
+       struct rpc_hdr_auth_info hdr_auth;
+       struct async_req *subreq;
+       NTSTATUS status;
+
+       if ((phdr->auth_len == 0)
+           || (phdr->frag_len < phdr->auth_len + RPC_HDR_AUTH_LEN)) {
+               return NT_STATUS_INVALID_PARAMETER;
        }
 
-       DEBUG(5,("rpc_send_auth_auth3: %s sent auth3 response ok.\n",
-                rpccli_pipe_txt(debug_ctx(), cli)));
+       if (!prs_set_offset(
+                   reply_pdu,
+                   phdr->frag_len - phdr->auth_len - RPC_HDR_AUTH_LEN)) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
 
-       prs_mem_free(&rpc_out);
-       data_blob_free(&client_reply);
-       data_blob_free(&server_response);
-       return NT_STATUS_OK;
-}
+       if (!smb_io_rpc_hdr_auth("hdr_auth", &hdr_auth, reply_pdu, 0)) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
 
-/*******************************************************************
- Creates a DCE/RPC bind alter context authentication request which
- may contain a spnego auth blobl
- ********************************************************************/
+       /* TODO - check auth_type/auth_level match. */
 
-static NTSTATUS create_rpc_alter_context(uint32 rpc_call_id,
-                                       const RPC_IFACE *abstract,
-                                       const RPC_IFACE *transfer,
-                                       enum pipe_auth_level auth_level,
-                                       const DATA_BLOB *pauth_blob, /* spnego auth blob already created. */
-                                       prs_struct *rpc_out)
-{
-       RPC_HDR_AUTH hdr_auth;
-       prs_struct auth_info;
-       NTSTATUS ret = NT_STATUS_OK;
+       server_response = data_blob_talloc(talloc_tos(), NULL, phdr->auth_len);
+       prs_copy_data_out((char *)server_response.data, reply_pdu,
+                         phdr->auth_len);
 
-       ZERO_STRUCT(hdr_auth);
-       if (!prs_init(&auth_info, RPC_HDR_AUTH_LEN, prs_get_mem_context(rpc_out), MARSHALL))
-               return NT_STATUS_NO_MEMORY;
+       status = ntlmssp_update(state->cli->auth->a_u.ntlmssp_state,
+                               server_response, &client_reply);
 
-       /* We may change the pad length before marshalling. */
-       init_rpc_hdr_auth(&hdr_auth, RPC_SPNEGO_AUTH_TYPE, (int)auth_level, 0, 1);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("rpc_finish_auth3_bind: NTLMSSP update using server "
+                         "blob failed: %s.\n", nt_errstr(status)));
+               return status;
+       }
 
-       if (pauth_blob->length) {
-               if (!prs_copy_data_in(&auth_info, (const char *)pauth_blob->data, pauth_blob->length)) {
-                       prs_mem_free(&auth_info);
-                       return NT_STATUS_NO_MEMORY;
-               }
+       prs_init_empty(&state->rpc_out, talloc_tos(), MARSHALL);
+
+       status = create_rpc_bind_auth3(state->cli, state->rpc_call_id,
+                                      state->cli->auth->auth_type,
+                                      state->cli->auth->auth_level,
+                                      &client_reply, &state->rpc_out);
+       data_blob_free(&client_reply);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
-       ret = create_bind_or_alt_ctx_internal(RPC_ALTCONT,
-                                               rpc_out, 
-                                               rpc_call_id,
-                                               abstract,
-                                               transfer,
-                                               &hdr_auth,
-                                               &auth_info);
-       prs_mem_free(&auth_info);
-       return ret;
+       subreq = rpc_write_send(state, state->ev, state->cli,
+                               prs_data_p(&state->rpc_out),
+                               prs_offset(&state->rpc_out));
+       if (subreq == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       subreq->async.fn = rpc_bind_auth3_write_done;
+       subreq->async.priv = req;
+       return NT_STATUS_OK;
 }
 
-/*******************************************************************
- Third leg of the SPNEGO bind mechanism - sends alter context PDU
- and gets a response.
- ********************************************************************/
+static void rpc_bind_auth3_write_done(struct async_req *subreq)
+{
+       struct async_req *req = talloc_get_type_abort(
+               subreq->async.priv, struct async_req);
+       NTSTATUS status;
 
-static NTSTATUS rpc_finish_spnego_ntlmssp_bind(struct rpc_pipe_client *cli,
-                                RPC_HDR *phdr,
-                                prs_struct *rbuf,
-                                uint32 rpc_call_id,
-                               const RPC_IFACE *abstract,
-                               const RPC_IFACE *transfer,
-                                enum pipe_auth_type auth_type,
-                                enum pipe_auth_level auth_level)
+       status = rpc_write_recv(subreq);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               async_req_error(req, status);
+               return;
+       }
+       async_req_done(req);
+}
+
+static NTSTATUS rpc_finish_spnego_ntlmssp_bind_send(struct async_req *req,
+                                                   struct rpc_pipe_bind_state *state,
+                                                   struct rpc_hdr_info *phdr,
+                                                   prs_struct *reply_pdu)
 {
        DATA_BLOB server_spnego_response = data_blob_null;
        DATA_BLOB server_ntlm_response = data_blob_null;
        DATA_BLOB client_reply = data_blob_null;
        DATA_BLOB tmp_blob = data_blob_null;
        RPC_HDR_AUTH hdr_auth;
-       NTSTATUS nt_status;
-       prs_struct rpc_out;
+       struct async_req *subreq;
+       NTSTATUS status;
 
-       if (!phdr->auth_len || (phdr->frag_len < phdr->auth_len + RPC_HDR_AUTH_LEN)) {
+       if ((phdr->auth_len == 0)
+           || (phdr->frag_len < phdr->auth_len + RPC_HDR_AUTH_LEN)) {
                return NT_STATUS_INVALID_PARAMETER;
        }
 
        /* Process the returned NTLMSSP blob first. */
-       if (!prs_set_offset(rbuf, phdr->frag_len - phdr->auth_len - RPC_HDR_AUTH_LEN)) {
+       if (!prs_set_offset(
+                   reply_pdu,
+                   phdr->frag_len - phdr->auth_len - RPC_HDR_AUTH_LEN)) {
                return NT_STATUS_INVALID_PARAMETER;
        }
 
-       if(!smb_io_rpc_hdr_auth("hdr_auth", &hdr_auth, rbuf, 0)) {
+       if (!smb_io_rpc_hdr_auth("hdr_auth", &hdr_auth, reply_pdu, 0)) {
                return NT_STATUS_INVALID_PARAMETER;
        }
 
        server_spnego_response = data_blob(NULL, phdr->auth_len);
-       prs_copy_data_out((char *)server_spnego_response.data, rbuf, phdr->auth_len);
+       prs_copy_data_out((char *)server_spnego_response.data,
+                         reply_pdu, phdr->auth_len);
 
-       /* The server might give us back two challenges - tmp_blob is for the second. */
-       if (!spnego_parse_challenge(server_spnego_response, &server_ntlm_response, &tmp_blob)) {
+       /*
+        * The server might give us back two challenges - tmp_blob is for the
+        * second.
+        */
+       if (!spnego_parse_challenge(server_spnego_response,
+                                   &server_ntlm_response, &tmp_blob)) {
                data_blob_free(&server_spnego_response);
                data_blob_free(&server_ntlm_response);
                data_blob_free(&tmp_blob);
@@ -2134,224 +2934,142 @@ static NTSTATUS rpc_finish_spnego_ntlmssp_bind(struct rpc_pipe_client *cli,
        data_blob_free(&server_spnego_response);
        data_blob_free(&tmp_blob);
 
-       nt_status = ntlmssp_update(cli->auth->a_u.ntlmssp_state,
-                                  server_ntlm_response,
-                                  &client_reply);
+       status = ntlmssp_update(state->cli->auth->a_u.ntlmssp_state,
+                               server_ntlm_response, &client_reply);
 
        /* Finished with the server_ntlm response */
        data_blob_free(&server_ntlm_response);
 
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               DEBUG(0,("rpc_finish_spnego_ntlmssp_bind: NTLMSSP update using server blob failed.\n"));
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("rpc_finish_spnego_ntlmssp_bind: NTLMSSP update "
+                         "using server blob failed.\n"));
                data_blob_free(&client_reply);
-               return nt_status;
+               return status;
        }
 
        /* SPNEGO wrap the client reply. */
        tmp_blob = spnego_gen_auth(client_reply);
        data_blob_free(&client_reply);
        client_reply = tmp_blob;
-       tmp_blob = data_blob_null; /* Ensure it's safe to free this just in case. */
+       tmp_blob = data_blob_null;
 
        /* Now prepare the alter context pdu. */
-       prs_init_empty(&rpc_out, prs_get_mem_context(rbuf), MARSHALL);
-
-       nt_status = create_rpc_alter_context(rpc_call_id,
-                                               abstract,
-                                               transfer,
-                                               auth_level,
-                                               &client_reply,
-                                               &rpc_out);
-
+       prs_init_empty(&state->rpc_out, state, MARSHALL);
+
+       status = create_rpc_alter_context(state->rpc_call_id,
+                                         &state->cli->abstract_syntax,
+                                         &state->cli->transfer_syntax,
+                                         state->cli->auth->auth_level,
+                                         &client_reply,
+                                         &state->rpc_out);
        data_blob_free(&client_reply);
 
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               prs_mem_free(&rpc_out);
-               return nt_status;
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
-       /* Initialize the returning data struct. */
-       prs_mem_free(rbuf);
-       prs_init_empty(rbuf, talloc_tos(), UNMARSHALL);
-
-       nt_status = rpc_api_pipe(cli, &rpc_out, rbuf, RPC_ALTCONTRESP);
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               prs_mem_free(&rpc_out);
-               return nt_status;
+       subreq = rpc_api_pipe_send(state, state->ev, state->cli,
+                                  &state->rpc_out, RPC_ALTCONTRESP);
+       if (subreq == NULL) {
+               return NT_STATUS_NO_MEMORY;
        }
+       subreq->async.fn = rpc_bind_ntlmssp_api_done;
+       subreq->async.priv = req;
+       return NT_STATUS_OK;
+}
+
+static void rpc_bind_ntlmssp_api_done(struct async_req *subreq)
+{
+       struct async_req *req = talloc_get_type_abort(
+               subreq->async.priv, struct async_req);
+       struct rpc_pipe_bind_state *state = talloc_get_type_abort(
+               req->private_data, struct rpc_pipe_bind_state);
+       DATA_BLOB server_spnego_response = data_blob_null;
+       DATA_BLOB tmp_blob = data_blob_null;
+       prs_struct reply_pdu;
+       struct rpc_hdr_info hdr;
+       struct rpc_hdr_auth_info hdr_auth;
+       NTSTATUS status;
 
-       prs_mem_free(&rpc_out);
+       status = rpc_api_pipe_recv(subreq, talloc_tos(), &reply_pdu);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               async_req_error(req, status);
+               return;
+       }
 
        /* Get the auth blob from the reply. */
-       if(!smb_io_rpc_hdr("rpc_hdr   ", phdr, rbuf, 0)) {
-               DEBUG(0,("rpc_finish_spnego_ntlmssp_bind: Failed to unmarshall RPC_HDR.\n"));
-               return NT_STATUS_BUFFER_TOO_SMALL;
+       if (!smb_io_rpc_hdr("rpc_hdr   ", &hdr, &reply_pdu, 0)) {
+               DEBUG(0, ("rpc_finish_spnego_ntlmssp_bind: Failed to "
+                         "unmarshall RPC_HDR.\n"));
+               async_req_error(req, NT_STATUS_BUFFER_TOO_SMALL);
+               return;
        }
 
-       if (!prs_set_offset(rbuf, phdr->frag_len - phdr->auth_len - RPC_HDR_AUTH_LEN)) {
-               return NT_STATUS_INVALID_PARAMETER;
+       if (!prs_set_offset(
+                   &reply_pdu,
+                   hdr.frag_len - hdr.auth_len - RPC_HDR_AUTH_LEN)) {
+               async_req_error(req, NT_STATUS_INVALID_PARAMETER);
+               return;
        }
 
-       if(!smb_io_rpc_hdr_auth("hdr_auth", &hdr_auth, rbuf, 0)) {
-               return NT_STATUS_INVALID_PARAMETER;
+       if (!smb_io_rpc_hdr_auth("hdr_auth", &hdr_auth, &reply_pdu, 0)) {
+               async_req_error(req, NT_STATUS_INVALID_PARAMETER);
+               return;
        }
 
-       server_spnego_response = data_blob(NULL, phdr->auth_len);
-       prs_copy_data_out((char *)server_spnego_response.data, rbuf, phdr->auth_len);
+       server_spnego_response = data_blob(NULL, hdr.auth_len);
+       prs_copy_data_out((char *)server_spnego_response.data, &reply_pdu,
+                         hdr.auth_len);
 
        /* Check we got a valid auth response. */
-       if (!spnego_parse_auth_response(server_spnego_response, NT_STATUS_OK, OID_NTLMSSP, &tmp_blob)) {
+       if (!spnego_parse_auth_response(server_spnego_response, NT_STATUS_OK,
+                                       OID_NTLMSSP, &tmp_blob)) {
                data_blob_free(&server_spnego_response);
                data_blob_free(&tmp_blob);
-               return NT_STATUS_INVALID_PARAMETER;
+               async_req_error(req, NT_STATUS_INVALID_PARAMETER);
+               return;
        }
 
        data_blob_free(&server_spnego_response);
        data_blob_free(&tmp_blob);
 
        DEBUG(5,("rpc_finish_spnego_ntlmssp_bind: alter context request to "
-                "%s.\n", rpccli_pipe_txt(debug_ctx(), cli)));
-
-       return NT_STATUS_OK;
+                "%s.\n", rpccli_pipe_txt(debug_ctx(), state->cli)));
+       async_req_done(req);
 }
 
-/****************************************************************************
- Do an rpc bind.
-****************************************************************************/
+NTSTATUS rpc_pipe_bind_recv(struct async_req *req)
+{
+       return async_req_simple_recv(req);
+}
 
 NTSTATUS rpc_pipe_bind(struct rpc_pipe_client *cli,
                       struct cli_pipe_auth_data *auth)
 {
-       RPC_HDR hdr;
-       RPC_HDR_BA hdr_ba;
-       prs_struct rpc_out;
-       prs_struct rbuf;
-       uint32 rpc_call_id;
-       NTSTATUS status;
-
-       DEBUG(5,("Bind RPC Pipe: %s auth_type %u, auth_level %u\n",
-               rpccli_pipe_txt(debug_ctx(), cli),
-               (unsigned int)auth->auth_type,
-               (unsigned int)auth->auth_level ));
-
-       cli->auth = talloc_move(cli, &auth);
-
-       prs_init_empty(&rpc_out, talloc_tos(), MARSHALL);
-
-       rpc_call_id = get_rpc_call_id();
-
-       /* Marshall the outgoing data. */
-       status = create_rpc_bind_req(cli, &rpc_out, rpc_call_id,
-                               &cli->abstract_syntax,
-                               &cli->transfer_syntax,
-                               cli->auth->auth_type,
-                               cli->auth->auth_level);
-
-       if (!NT_STATUS_IS_OK(status)) {
-               prs_mem_free(&rpc_out);
-               return status;
-       }
-
-       /* Initialize the incoming data struct. */
-       prs_init_empty(&rbuf, talloc_tos(), UNMARSHALL);
+       TALLOC_CTX *frame = talloc_stackframe();
+       struct event_context *ev;
+       struct async_req *req;
+       NTSTATUS status = NT_STATUS_NO_MEMORY;
 
-       /* send data on \PIPE\.  receive a response */
-       status = rpc_api_pipe(cli, &rpc_out, &rbuf, RPC_BINDACK);
-       if (!NT_STATUS_IS_OK(status)) {
-               prs_mem_free(&rpc_out);
-               return status;
-       }
-
-       prs_mem_free(&rpc_out);
-
-       DEBUG(3,("rpc_pipe_bind: %s bind request returned ok.\n",
-                rpccli_pipe_txt(debug_ctx(), cli)));
-
-       /* Unmarshall the RPC header */
-       if(!smb_io_rpc_hdr("hdr"   , &hdr, &rbuf, 0)) {
-               DEBUG(0,("rpc_pipe_bind: failed to unmarshall RPC_HDR.\n"));
-               prs_mem_free(&rbuf);
-               return NT_STATUS_BUFFER_TOO_SMALL;
-       }
-
-       if(!smb_io_rpc_hdr_ba("", &hdr_ba, &rbuf, 0)) {
-               DEBUG(0,("rpc_pipe_bind: Failed to unmarshall RPC_HDR_BA.\n"));
-               prs_mem_free(&rbuf);
-               return NT_STATUS_BUFFER_TOO_SMALL;
-       }
-
-       if(!check_bind_response(&hdr_ba, &cli->transfer_syntax)) {
-               DEBUG(2,("rpc_pipe_bind: check_bind_response failed.\n"));
-               prs_mem_free(&rbuf);
-               return NT_STATUS_BUFFER_TOO_SMALL;
+       ev = event_context_init(frame);
+       if (ev == NULL) {
+               goto fail;
        }
 
-       cli->max_xmit_frag = hdr_ba.bba.max_tsize;
-       cli->max_recv_frag = hdr_ba.bba.max_rsize;
-
-       /* For authenticated binds we may need to do 3 or 4 leg binds. */
-       switch(cli->auth->auth_type) {
-
-               case PIPE_AUTH_TYPE_NONE:
-               case PIPE_AUTH_TYPE_SCHANNEL:
-                       /* Bind complete. */
-                       break;
-
-               case PIPE_AUTH_TYPE_NTLMSSP:
-                       /* Need to send AUTH3 packet - no reply. */
-                       status = rpc_finish_auth3_bind(
-                               cli, &hdr, &rbuf, rpc_call_id,
-                               cli->auth->auth_type,
-                               cli->auth->auth_level);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               prs_mem_free(&rbuf);
-                               return status;
-                       }
-                       break;
-
-               case PIPE_AUTH_TYPE_SPNEGO_NTLMSSP:
-                       /* Need to send alter context request and reply. */
-                       status = rpc_finish_spnego_ntlmssp_bind(
-                               cli, &hdr, &rbuf, rpc_call_id,
-                               &cli->abstract_syntax, &cli->transfer_syntax,
-                               cli->auth->auth_type, cli->auth->auth_level);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               prs_mem_free(&rbuf);
-                               return status;
-                       }
-                       break;
-
-               case PIPE_AUTH_TYPE_KRB5:
-                       /* */
-
-               default:
-                       DEBUG(0,("cli_finish_bind_auth: unknown auth type "
-                                "%u\n", (unsigned int)cli->auth->auth_type));
-                       prs_mem_free(&rbuf);
-                       return NT_STATUS_INVALID_INFO_CLASS;
+       req = rpc_pipe_bind_send(frame, ev, cli, auth);
+       if (req == NULL) {
+               goto fail;
        }
 
-       /* For NTLMSSP ensure the server gave us the auth_level we wanted. */
-       if (cli->auth->auth_type == PIPE_AUTH_TYPE_NTLMSSP
-           || cli->auth->auth_type == PIPE_AUTH_TYPE_SPNEGO_NTLMSSP) {
-               if (cli->auth->auth_level == PIPE_AUTH_LEVEL_INTEGRITY) {
-                       if (!(cli->auth->a_u.ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SIGN)) {
-                               DEBUG(0,("cli_finish_bind_auth: requested NTLMSSSP signing and server refused.\n"));
-                               prs_mem_free(&rbuf);
-                               return NT_STATUS_INVALID_PARAMETER;
-                       }
-               }
-               if (cli->auth->auth_level == PIPE_AUTH_LEVEL_INTEGRITY) {
-                       if (!(cli->auth->a_u.ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SEAL)) {
-                               DEBUG(0,("cli_finish_bind_auth: requested NTLMSSSP sealing and server refused.\n"));
-                               prs_mem_free(&rbuf);
-                               return NT_STATUS_INVALID_PARAMETER;
-                       }
-               }
+       while (req->state < ASYNC_REQ_DONE) {
+               event_loop_once(ev);
        }
 
-       prs_mem_free(&rbuf);
-       return NT_STATUS_OK;
+       status = rpc_pipe_bind_recv(req);
+ fail:
+       TALLOC_FREE(frame);
+       return status;
 }
 
 unsigned int rpccli_set_timeout(struct rpc_pipe_client *cli,
index 9ada47a3f5d901aeecbe456dd82a990e4ee0b771..9c3205eca3ec567803f77998c8ffa68e1caf1586 100644 (file)
@@ -59,9 +59,7 @@ NTSTATUS cli_do_rpc_ndr(struct rpc_pipe_client *cli,
 
        talloc_free(push);
 
-       prs_init_empty( &r_ps, mem_ctx, UNMARSHALL );
-
-       status = rpc_api_pipe_req(cli, opnum, &q_ps, &r_ps); 
+       status = rpc_api_pipe_req(mem_ctx, cli, opnum, &q_ps, &r_ps);
 
        prs_mem_free( &q_ps );
 
index d549265fa11b07016504486f622ffb125f109013..1332a8311a1d5eb3bd82ed4810b9cfeb28bb05b2 100644 (file)
@@ -361,13 +361,10 @@ uint32 prs_offset(prs_struct *ps)
 
 bool prs_set_offset(prs_struct *ps, uint32 offset)
 {
-       if(offset <= ps->data_offset) {
-               ps->data_offset = offset;
-               return True;
-       }
-
-       if(!prs_grow(ps, offset - ps->data_offset))
+       if ((offset > ps->data_offset)
+           && !prs_grow(ps, offset - ps->data_offset)) {
                return False;
+       }
 
        ps->data_offset = offset;
        return True;
index 9984bf0cfcd4bc4064a4f45d0cc07e768a43d12e..5f616ecd19c5ffd3f9f703075fde781ad1d6e637 100644 (file)
@@ -1918,6 +1918,7 @@ NTSTATUS _samr_ChangePasswordUser3(pipes_struct *p,
        uint32 reject_reason;
        struct samr_DomInfo1 *dominfo = NULL;
        struct samr_ChangeReject *reject = NULL;
+       uint32_t tmp;
 
        DEBUG(5,("_samr_ChangePasswordUser3: %d\n", __LINE__));
 
@@ -1967,11 +1968,11 @@ NTSTATUS _samr_ChangePasswordUser3(pipes_struct *p,
 
                /* AS ROOT !!! */
 
-               pdb_get_account_policy(AP_MIN_PASSWORD_LEN,
-                                      (uint32_t *)&dominfo->min_password_length);
+               pdb_get_account_policy(AP_MIN_PASSWORD_LEN, &tmp);
+               dominfo->min_password_length = tmp;
 
-               pdb_get_account_policy(AP_PASSWORD_HISTORY,
-                                      (uint32_t *)&dominfo->password_history_length);
+               pdb_get_account_policy(AP_PASSWORD_HISTORY, &tmp);
+               dominfo->password_history_length = tmp;
 
                pdb_get_account_policy(AP_USER_MUST_LOGON_TO_CHG_PASS,
                                       &dominfo->password_properties);
@@ -2833,10 +2834,11 @@ NTSTATUS _samr_QueryDomainInfo(pipes_struct *p,
                        /* AS ROOT !!! */
 
                        pdb_get_account_policy(AP_MIN_PASSWORD_LEN,
-                              (uint32_t *)&dom_info->info1.min_password_length);
+                                              &account_policy_temp);
+                       dom_info->info1.min_password_length = account_policy_temp;
 
-                       pdb_get_account_policy(AP_PASSWORD_HISTORY,
-                               (uint32_t *)&dom_info->info1.password_history_length);
+                       pdb_get_account_policy(AP_PASSWORD_HISTORY, &account_policy_temp);
+                       dom_info->info1.password_history_length = account_policy_temp;
 
                        pdb_get_account_policy(AP_USER_MUST_LOGON_TO_CHG_PASS,
                                &dom_info->info1.password_properties);
@@ -2965,7 +2967,8 @@ NTSTATUS _samr_QueryDomainInfo(pipes_struct *p,
                        u_reset_time = account_policy_temp * 60;
 
                        pdb_get_account_policy(AP_BAD_ATTEMPT_LOCKOUT,
-                               (uint32_t *)&dom_info->info12.lockout_threshold);
+                                              &account_policy_temp);
+                       dom_info->info12.lockout_threshold = account_policy_temp;
 
                        /* !AS ROOT */