Merge commit '65d49df865f60511d22d86fb15c33a082176e7ab'

pull/1/head
orbiter 12 years ago
commit a3d5959981

@ -13,7 +13,7 @@ you can validate it with http://validator.w3.org/
<head profile="http://www.w3.org/2003/g/data-view">
<link rel="transformation" href="http://www-sop.inria.fr/acacia/soft/RDFa2RDFXML.xsl"/>
<div id="api">
<a href="yacydoc.xml"><img src="env/grafics/api.png" width="60" height="40" alt="API" /></a>
<a href="yacydoc.xml"><img src="../env/grafics/api.png" width="60" height="40" alt="API" /></a>
<span>This search result can also be retrieved as XML.
Click the API icon to see an example call to the search rss API.
To see a list of all APIs, please visit the <a href="http://www.yacy-websuche.de/wiki/index.php/Dev:API">API wiki page</a>.</span>

@ -775,7 +775,7 @@ public final class Switchboard extends serverSwitch
// that an automatic authorization of localhost is done, because in this case crawls from local
// addresses are blocked to prevent attack szenarios where remote pages contain links to localhost
// addresses that can steer a YaCy peer
if ( (getConfigBool("adminAccountForLocalhost", false)) ) {
if ( !getConfigBool("adminAccountForLocalhost", false) ) {
if ( getConfig(SwitchboardConstants.ADMIN_ACCOUNT_B64MD5, "").startsWith("0000") ) {
// the password was set automatically with a random value.
// We must remove that here to prevent that a user cannot log in any more
@ -3449,4 +3449,4 @@ public final class Switchboard extends serverSwitch
this.shutdownSync.acquire();
return this.terminate;
}
}
}

Loading…
Cancel
Save