[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [hobbit] Alternate pageset and noconn ?



On Mon, May 29, 2006 at 07:16:12PM +0200, thomas.seglard.enata (at) cnp.fr wrote:
> Thanks for your help ! But I got this output when patching :
> 
> [hobbit (at) psi200 hobbit-4.1.2p1]$ patch -p0 </tmp/doublehost.patch 
> (Stripping trailing CRs from patch.)
> patching file bbdisplay/loadbbhosts.c

Ah - the patch I sent out is for the 4.2 snapshots currently available.

This one should work for 4.1.2p1


Henrik

--- bbdisplay/loadbbhosts.c.orig	2006-05-29 21:56:26.137663052 +0200
+++ bbdisplay/loadbbhosts.c	2006-05-29 21:57:52.147964710 +0200
@@ -659,6 +659,24 @@
 				} while (cwalk && 
 					 (strcmp(cwalk->bbhostname, bbhost->bbhostname) == 0) &&
 					 (targetpagecount < MAX_TARGETPAGES_PER_HOST) );
+
+                                /*
+                                 * HACK: Check if the pageset tag is present at all in the host
+                                 * entry. If it isn't, then drop this incarnation of the host.
+                                 *
+                                 * Without this, the following bb-hosts file will have the
+                                 * www.hswn.dk host listed twice on the alternate pageset:
+                                 *
+                                 * adminpage nyc NYC
+                                 *
+                                 * 127.0.0.1   localhost      # bbd http://localhost/ CLIENT:osiris
+                                 * 172.16.10.2 www.hswn.dk    # http://www.hswn.dk/ ADMIN:nyc ssh noinfo
+                                 *
+                                 * page superdome Superdome
+                                 * 172.16.10.2 www.hswn.dk # noconn
+                                 *
+                                 */
+                                if (strstr(inbuf, hosttag) == NULL) targetpagecount = 0;
 			}
 
 			if (strlen(pgset) == 0) {