Also insure that we exit immediately on any error.
Signed-off-by: Volker Lendecke <vl@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Mon Jun 24 12:17:52 CEST 2013 on sn-devel-104
const char *tname;
size_t dns_len;
size_t tlen;
const char *tname;
size_t dns_len;
size_t tlen;
+ NTSTATUS nt_status = NT_STATUS_OK;
uint32_t new_fti_idx;
uint32_t i;
/* use always TDO type, until we understand when Xref can be used */
uint32_t new_fti_idx;
uint32_t i;
/* use always TDO type, until we understand when Xref can be used */
collision_type,
LSA_TLN_DISABLED_CONFLICT,
tdo_name);
collision_type,
LSA_TLN_DISABLED_CONFLICT,
tdo_name);
+ if (!NT_STATUS_IS_OK(nt_status)) {
+ goto done;
+ }
}
if (sid_conflict) {
nt_status = add_collision(c_info, new_fti_idx,
collision_type,
LSA_SID_DISABLED_CONFLICT,
tdo_name);
}
if (sid_conflict) {
nt_status = add_collision(c_info, new_fti_idx,
collision_type,
LSA_SID_DISABLED_CONFLICT,
tdo_name);
+ if (!NT_STATUS_IS_OK(nt_status)) {
+ goto done;
+ }
}
if (nb_conflict) {
nt_status = add_collision(c_info, new_fti_idx,
collision_type,
LSA_NB_DISABLED_CONFLICT,
tdo_name);
}
if (nb_conflict) {
nt_status = add_collision(c_info, new_fti_idx,
collision_type,
LSA_NB_DISABLED_CONFLICT,
tdo_name);
+ if (!NT_STATUS_IS_OK(nt_status)) {
+ goto done;
+ }
+done:
+ return nt_status;
}
static NTSTATUS add_collision(struct lsa_ForestTrustCollisionInfo *c_info,
}
static NTSTATUS add_collision(struct lsa_ForestTrustCollisionInfo *c_info,