Index: slimserver.pl
===================================================================
RCS file: /home/cvs/cvsroot/slim/server/slimserver.pl,v
retrieving revision 1.73
diff -u -p -B -r1.73 slimserver.pl
--- slimserver.pl	2 May 2004 06:00:02 -0000	1.73
+++ slimserver.pl	7 May 2004 08:56:08 -0000
@@ -213,6 +213,7 @@ use vars qw(
 	$priority
 	$quiet
 	$nosetup
+	$noserver
 	$stdio
 	$stop
 );
@@ -489,6 +490,7 @@ Usage: $0 [--audiodir <dir>] [--daemon] 
     --streamaddr     => Specify the _server's_ IP address to use to connect
                         to streaming audio sources
     --nosetup        => Disable setup via http.
+    --noserver       => Disable web access server settings, but leave player settings accessible. Settings changes arenot preserved.
 
 The following are debugging flags which will print various information 
 to the console via stderr:
@@ -563,6 +565,7 @@ sub initOptions {
 		'prefsfile=s' 		=> \$prefsfile,
 		'quiet'   			=> \$quiet,
 		'nosetup'			=> \$nosetup,
+		'noserver'			=> \$noserver,
 		'd_artwork'			=> \$d_artwork,
 		'd_cli'				=> \$d_cli,
 		'd_command'			=> \$d_command,
@@ -612,7 +615,7 @@ sub initOptions {
 }
 
 sub initSettings {	
-	Slim::Utils::Prefs::load($prefsfile, $nosetup);
+	Slim::Utils::Prefs::load($prefsfile, $nosetup || $noserver);
 	Slim::Utils::Prefs::checkServerPrefs();
 	Slim::Buttons::Home::updateMenu();
 	Slim::Web::Setup::initSetup();
Index: Slim/Web/Setup.pm
===================================================================
RCS file: /home/cvs/cvsroot/slim/server/Slim/Web/Setup.pm,v
retrieving revision 1.69
diff -u -p -B -r1.69 Setup.pm
--- Slim/Web/Setup.pm	7 May 2004 06:50:55 -0000	1.69
+++ Slim/Web/Setup.pm	7 May 2004 08:56:10 -0000
@@ -1813,7 +1813,7 @@ sub setup_HTTP {
 	my $changed;
 	my $rejected;
 
-	if ($::nosetup) {
+	if ($::nosetup || ($::noserver && $paramref->{'page'} eq 'server')) {
 		$response->code(RC_FORBIDDEN);
 		return Slim::Web::HTTP::filltemplatefile('html/errors/403.html',$paramref);
 	}