diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-04-23 17:28:39 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-04-23 14:29:44 +0200 |
| commit | 5960b7b2a44161dba5dc96e6973e1fcc92b14bdd (patch) | |
| tree | 92a0ad6094a0ee97d1a5d6e49c5a7dbc62dd3d41 /source4 | |
| parent | 4f7666f97120a01e5bbbf335cf3effbddd2b5cd2 (diff) | |
| download | samba-5960b7b2a44161dba5dc96e6973e1fcc92b14bdd.tar.gz samba-5960b7b2a44161dba5dc96e6973e1fcc92b14bdd.tar.bz2 samba-5960b7b2a44161dba5dc96e6973e1fcc92b14bdd.zip | |
s4-libnet Always return after composite_error()
These instances should not cause a problem, but make it easier to audit for
this kind of problem in the future with grep.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Mon Apr 23 14:29:45 CEST 2012 on sn-devel-104
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/libnet/libnet_group.c | 3 | ||||
| -rw-r--r-- | source4/libnet/libnet_user.c | 2 | ||||
| -rw-r--r-- | source4/winbind/wb_sid2gid.c | 2 | ||||
| -rw-r--r-- | source4/winbind/wb_sid2uid.c | 2 |
4 files changed, 8 insertions, 1 deletions
diff --git a/source4/libnet/libnet_group.c b/source4/libnet/libnet_group.c index b12037e1f3..928ce69225 100644 --- a/source4/libnet/libnet_group.c +++ b/source4/libnet/libnet_group.c @@ -680,10 +680,11 @@ static void continue_groups_enumerated(struct tevent_req *subreq) /* that's it */ composite_done(c); - + return; } else { /* something went wrong */ composite_error(c, c->status); + return; } } diff --git a/source4/libnet/libnet_user.c b/source4/libnet/libnet_user.c index e56ed498c2..dc0691ac22 100644 --- a/source4/libnet/libnet_user.c +++ b/source4/libnet/libnet_user.c @@ -1146,10 +1146,12 @@ static void continue_users_enumerated(struct tevent_req *subreq) /* that's it */ composite_done(c); + return; } else { /* something went wrong */ composite_error(c, c->status); + return; } } diff --git a/source4/winbind/wb_sid2gid.c b/source4/winbind/wb_sid2gid.c index 0b3589561f..e1061544d2 100644 --- a/source4/winbind/wb_sid2gid.c +++ b/source4/winbind/wb_sid2gid.c @@ -84,8 +84,10 @@ static void sid2gid_recv_gid(struct composite_context *ctx) ids->xid.type == ID_TYPE_GID) { state->gid = ids->xid.id; composite_done(state->ctx); + return; } else { composite_error(state->ctx, NT_STATUS_INVALID_SID); + return; } } diff --git a/source4/winbind/wb_sid2uid.c b/source4/winbind/wb_sid2uid.c index f1d9bdd677..2b5fec5381 100644 --- a/source4/winbind/wb_sid2uid.c +++ b/source4/winbind/wb_sid2uid.c @@ -84,8 +84,10 @@ static void sid2uid_recv_uid(struct composite_context *ctx) ids->xid.type == ID_TYPE_UID) { state->uid = ids->xid.id; composite_done(state->ctx); + return; } else { composite_error(state->ctx, NT_STATUS_INVALID_SID); + return; } } |