diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-03-26 22:10:32 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-03-26 22:10:32 +1100 |
| commit | 7eb7f423d048e869a19d560ab0d1ba3b51b62fa9 (patch) | |
| tree | 18cb17db10e10a8d0f27d5a8e48ada2dfc16fae7 /source3/lib/avahi.c | |
| parent | 3f37342bc0e7c26b6a61490706fe8cec3e6d491e (diff) | |
| parent | 56d74b62126083dd7e2a60d1b48b03e1b1798c90 (diff) | |
| download | samba-7eb7f423d048e869a19d560ab0d1ba3b51b62fa9.tar.gz samba-7eb7f423d048e869a19d560ab0d1ba3b51b62fa9.tar.bz2 samba-7eb7f423d048e869a19d560ab0d1ba3b51b62fa9.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/lib/avahi.c')
| -rw-r--r-- | source3/lib/avahi.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source3/lib/avahi.c b/source3/lib/avahi.c index ac9867a1fc..269b329e64 100644 --- a/source3/lib/avahi.c +++ b/source3/lib/avahi.c @@ -207,6 +207,13 @@ static void avahi_timeout_update(AvahiTimeout *t, const struct timeval *tv) { TALLOC_FREE(t->te); + if (tv == NULL) { + /* + * Disable this timer + */ + return; + } + t->te = tevent_add_timer(t->ctx->ev, t, *tv, avahi_timeout_handler, t); /* * No failure mode defined here |