diff -Nurp src/cachemgr.cc src-next/cachemgr.cc
--- src/cachemgr.cc 2003-02-22 01:14:32.000000000 +0100
+++ src-next/cachemgr.cc 2003-06-17 10:32:02.000000000 +0200
@@ -417,21 +417,20 @@ munge_menu_line(const char *buf, cachemg
/* no reason to give a url for a disabled action */
if (!strcmp(p, "disabled"))
- snprintf(html, sizeof(html), "%s (disabled).\n", d, a_url);
+ snprintf(html, sizeof(html), "%s (disabled)\n", d, a);
else
/* disable a hidden action (requires a password, but password is not in squid.conf) */
if (!strcmp(p, "hidden"))
- snprintf(html, sizeof(html), "%s (hidden).\n", d, a_url);
+ snprintf(html, sizeof(html), "%s (hidden)\n", d, a);
else
/* disable link if authentication is required and we have no password */
if (!strcmp(p, "protected") && !req->passwd)
- snprintf(html, sizeof(html), "%s (requires authentication).\n",
- d, menu_url(req, "authenticate"), a_url);
+ snprintf(html, sizeof(html), "%s (requires authentication)\n",
+ d, menu_url(req, "authenticate"), a);
else
/* highlight protected but probably available entries */
if (!strcmp(p, "protected"))
- snprintf(html, sizeof(html), "%s\n",
- a_url, d);
+ snprintf(html, sizeof(html), "%s\n", a_url, d);
/* public entry or unknown type of protection */
else
@@ -596,7 +595,8 @@ read_reply(int s, cachemgr_request * req
printf("CacheMgr@%s: %s\n",
req->hostname, action);
- printf("\n");
+ printf("\n");
printf("\n");
diff -Nurp src/cf.data.pre src-next/cf.data.pre
--- src/cf.data.pre 2003-06-13 00:39:14.000000000 +0200
+++ src-next/cf.data.pre 2003-06-17 10:44:02.000000000 +0200
@@ -3041,6 +3041,7 @@ DOC_START
offline_toggle *
pconn
peer_select
+ reconfigure *
redirector
refresh
server_list