diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-15 15:27:21 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-15 15:27:21 +0100 |
| commit | 26bc88eabac66423218809513c386635521dce5b (patch) | |
| tree | 194eaad3479021f5c70ffa158898983429442fa7 /source4/auth/gensec | |
| parent | 6c4acbbf9ee0f92ed614d872686426897dbe26bc (diff) | |
| parent | 9d9d54430aed677ae33e51fda5da7b4306c734f1 (diff) | |
| download | samba-26bc88eabac66423218809513c386635521dce5b.tar.gz samba-26bc88eabac66423218809513c386635521dce5b.tar.bz2 samba-26bc88eabac66423218809513c386635521dce5b.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
Conflicts:
source/torture/libnet/libnet_BecomeDC.c
(This used to be commit 2da0734f439ee5f4e3eb1c9416e7df4450f08534)
Diffstat (limited to 'source4/auth/gensec')
| -rw-r--r-- | source4/auth/gensec/cyrus_sasl.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source4/auth/gensec/cyrus_sasl.c b/source4/auth/gensec/cyrus_sasl.c index 64a0b2f0c7..cb7bcb71d8 100644 --- a/source4/auth/gensec/cyrus_sasl.c +++ b/source4/auth/gensec/cyrus_sasl.c @@ -362,8 +362,11 @@ int gensec_sasl_log(void *context, NTSTATUS gensec_sasl_init(void) { NTSTATUS ret; - int sasl_ret, i; + int sasl_ret; +#if 0 + int i; const char **sasl_mechs; +#endif static const sasl_callback_t callbacks[] = { { |