summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-01-22 02:08:30 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:09:06 -0500
commit5ffedbac3d06ef852508dde3924841a86b802295 (patch)
tree0bf3e022637bdd67c19cf95c33ec0a12fd63734f
parentd069c368fbd900f9c6e22d7dccdd84c5202997a1 (diff)
downloadsamba-5ffedbac3d06ef852508dde3924841a86b802295.tar.gz
samba-5ffedbac3d06ef852508dde3924841a86b802295.tar.bz2
samba-5ffedbac3d06ef852508dde3924841a86b802295.zip
r4922: fixed an infinite loop in the name resolve code when handling a method
in smb.conf that isn't implemented in the library (This used to be commit dd5b43ed37b37feec4708f8f13033b42eb6a838c)
-rw-r--r--source4/libcli/resolve/resolve.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/source4/libcli/resolve/resolve.c b/source4/libcli/resolve/resolve.c
index ef906d4ed0..054f10d529 100644
--- a/source4/libcli/resolve/resolve.c
+++ b/source4/libcli/resolve/resolve.c
@@ -99,10 +99,8 @@ static struct smbcli_composite *setup_next_method(struct smbcli_composite *c)
const struct resolve_method *method = find_method(state->methods[0]);
if (method) {
req = method->send_fn(&state->name, c->event_ctx);
- if (req == NULL) {
- state->methods++;
- }
}
+ if (req == NULL) state->methods++;
} while (!req && state->methods[0]);
if (req) {