X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=blobdiff_plain;f=site.c;h=935bf38f76fb0aac273e49ae4d17865f7cf652af;hp=d0755da2fdc3cc308e412ad7d060430c0b7bec97;hb=64f5ae57aece3480ab79a93fc1b310e8b5ce22e9;hpb=83dbdd3f25ac7edca6365ca7a299e4b8eee6b83e

diff --git a/site.c b/site.c
index d0755da..935bf38 100644
--- a/site.c
+++ b/site.c
@@ -520,9 +520,10 @@ static void set_new_transform(struct site *st, char *pk)
     assert(st->sharedsecretlen);
     if (st->sharedsecretlen > st->sharedsecretallocd) {
 	st->sharedsecretallocd=st->sharedsecretlen;
-	st->sharedsecret=realloc(st->sharedsecret,st->sharedsecretallocd);
+	st->sharedsecret=safe_realloc_ary(st->sharedsecret,1,
+					  st->sharedsecretallocd,
+					  "site:sharedsecret");
     }
-    if (!st->sharedsecret) fatal_perror("site:sharedsecret");
 
     /* Generate the shared key */
     st->dh->makeshared(st->dh->st,st->dhsecret,st->dh->len,pk,
@@ -1600,7 +1601,7 @@ static int site_beforepoll(void *sst, struct pollfd *fds, int *nfds_io,
 {
     struct site *st=sst;
 
-    *nfds_io=0; /* We don't use any file descriptors */
+    BEFOREPOLL_WANT_FDS(0); /* We don't use any file descriptors */
     st->now=*now;
 
     /* Work out when our next timeout is. The earlier of 'timeout' or
@@ -2049,7 +2050,7 @@ static list_t *site_apply(closure_t *self, struct cloc loc, dict_t *context,
 
     /* We are interested in poll(), but only for timeouts. We don't have
        any fds of our own. */
-    register_for_poll(st, site_beforepoll, site_afterpoll, 0, "site");
+    register_for_poll(st, site_beforepoll, site_afterpoll, "site");
     st->timeout=0;
 
     st->remote_capabilities=0;