From fdfda2fab0921d409789174556582db28141448e Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Thu, 21 May 2015 16:03:25 +0200
Subject: inets: Add profile option

To enable the HTTP server to run in a virtualized environment,
where there can be more that one server that has the same
bind_address and port, we add a new option profile.
The profile name will be used in concatenation with bind_address and port
to identify the HTTP server instance.

The name profile was chosen as there is a similar concept in the HTTP client
where profile names can be used to instantiate client configurations.
---
 lib/inets/doc/src/httpd.xml                       |  23 ++-
 lib/inets/src/http_server/httpd.erl               | 116 ++++-------
 lib/inets/src/http_server/httpd_acceptor_sup.erl  |  36 ++--
 lib/inets/src/http_server/httpd_conf.erl          |  13 +-
 lib/inets/src/http_server/httpd_instance_sup.erl  |  60 +++---
 lib/inets/src/http_server/httpd_internal.hrl      |   2 +
 lib/inets/src/http_server/httpd_manager.erl       |  23 ++-
 lib/inets/src/http_server/httpd_misc_sup.erl      |  38 ++--
 lib/inets/src/http_server/httpd_sup.erl           |  54 ++---
 lib/inets/src/http_server/httpd_util.erl          |  15 +-
 lib/inets/src/http_server/mod_auth.erl            | 228 ++++++++-------------
 lib/inets/src/http_server/mod_auth_dets.erl       |   5 +-
 lib/inets/src/http_server/mod_auth_plain.erl      |   2 +
 lib/inets/src/http_server/mod_auth_server.erl     | 136 +++++++------
 lib/inets/src/http_server/mod_security.erl        | 199 +++++++++---------
 lib/inets/src/http_server/mod_security_server.erl | 235 +++++++++++-----------
 lib/inets/test/httpd_block.erl                    |   2 +-
 lib/inets/test/inets_sup_SUITE.erl                | 226 +++++++++------------
 18 files changed, 671 insertions(+), 742 deletions(-)

(limited to 'lib/inets')

diff --git a/lib/inets/doc/src/httpd.xml b/lib/inets/doc/src/httpd.xml
index 435f99ee23..e6aa8d5e07 100644
--- a/lib/inets/doc/src/httpd.xml
+++ b/lib/inets/doc/src/httpd.xml
@@ -162,6 +162,20 @@
 	in the apache like configuration file. </p>
       </item>
 
+      <marker id="profile"></marker>
+      <tag>{profile, atom()}</tag>
+      <item>
+        <p>Used together with <seealso marker="prop_bind_address"><c>bind_address</c></seealso>
+	and <seealso marker="prop_port"><c>port</c></seealso> to uniquely identify
+	a HTTP server. This can be useful in a virtualized environment,
+	where there can
+	be more that one server that has the same bind_address and port.
+	If this property is not explicitly set, it is assumed that the
+	<seealso marker="prop_bind_address"><c>bind_address</c></seealso> and
+	<seealso marker="prop_port"><c>port</c></seealso>uniquely identifies the HTTP server.
+	</p>
+      </item>
+
       <marker id="prop_socket_type"></marker>
       <tag>{socket_type, ip_comm | {essl, Config::proplist()}}</tag>
       <item>
@@ -176,6 +190,8 @@
         <p>Note that this option is only used when the option 
 	<c>socket_type</c> has the value <c>ip_comm</c>. </p>
       </item>
+
+      
       <marker id="prop_minimum_bytes_per_second"></marker>
       <tag>{minimum_bytes_per_second, integer()}</tag>
       <item>
@@ -935,19 +951,22 @@ bytes
     <func>
       <marker id="info2"></marker>
       <name>info(Address, Port) ->  </name>
+      <name>info(Address, Port, Profile) ->  </name>
+      <name>info(Address, Port, Profile, Properties) -> [{Option, Value}] </name>
       <name>info(Address, Port, Properties) -> [{Option, Value}] </name>
       <fsummary>Fetches information about the HTTP server</fsummary>
       <type>
 	<v>Address = ip_address()</v>
 	<v>Port = integer()</v>
+	<v>Profile = atom()</v>
 	<v>Properties = [property()]</v>
         <v>Option = property()</v>
 	<v>Value = term()</v>
       </type>
       <desc>
         <p>Fetches information about the HTTP server. When called with
-	only the Address and Port all properties are fetched, when
-	called with a list of specific properties they are fetched.
+	only the Address, Port and Profile, if relevant, all properties are fetched.
+	When called with a list of specific properties they are fetched.
 	Available properties are the same as the server's start
 	options.
 	</p>
diff --git a/lib/inets/src/http_server/httpd.erl b/lib/inets/src/http_server/httpd.erl
index e8148ea362..71be6dde00 100644
--- a/lib/inets/src/http_server/httpd.erl
+++ b/lib/inets/src/http_server/httpd.erl
@@ -23,6 +23,7 @@
 -behaviour(inets_service).
 
 -include("httpd.hrl").
+-include("httpd_internal.hrl").
 
 %% Behavior callbacks
 -export([
@@ -61,18 +62,27 @@ info(Pid, Properties) when is_pid(Pid) andalso is_list(Properties) ->
     {ok, ServiceInfo} = service_info(Pid), 
     Address = proplists:get_value(bind_address, ServiceInfo),
     Port = proplists:get_value(port, ServiceInfo),
+    Profile = proplists:get_value(profile, ServiceInfo, default),
     case Properties of
 	[] ->
-	    info(Address, Port);
+	    info(Address, Port, Profile);
 	_ ->
-	    info(Address, Port, Properties)
+	    info(Address, Port, Profile, Properties)
     end; 
+
 info(Address, Port) when is_integer(Port) ->    
-    httpd_conf:get_config(Address, Port).
+    info(Address, Port, default).
+
+info(Address, Port, Profile) when is_integer(Port), is_atom(Profile) ->    
+    httpd_conf:get_config(Address, Port, Profile);
 
 info(Address, Port, Properties) when is_integer(Port) andalso 
 				     is_list(Properties) ->    
-    httpd_conf:get_config(Address, Port, Properties).
+    httpd_conf:get_config(Address, Port, default, Properties).
+
+info(Address, Port, Profile, Properties) when is_integer(Port) andalso 
+					      is_atom(Profile) andalso is_list(Properties) ->    
+    httpd_conf:get_config(Address, Port, Profile, Properties).
 
 
 %%%========================================================================
@@ -86,14 +96,16 @@ start_service(Conf) ->
     httpd_sup:start_child(Conf).
 
 stop_service({Address, Port}) ->
-    httpd_sup:stop_child(Address, Port);
-
+    stop_service({Address, Port, ?DEFAULT_PROFILE});
+stop_service({Address, Port, Profile}) ->
+     httpd_sup:stop_child(Address, Port, Profile);
 stop_service(Pid) when is_pid(Pid) ->
     case service_info(Pid)  of
 	{ok, Info} ->	   
 	    Address = proplists:get_value(bind_address, Info),
 	    Port = proplists:get_value(port, Info),
-	    stop_service({Address, Port});
+	    Profile = proplists:get_value(profile, Info, ?DEFAULT_PROFILE),
+	    stop_service({Address, Port, Profile});
 	Error ->
 	    Error
     end.
@@ -101,7 +113,6 @@ stop_service(Pid) when is_pid(Pid) ->
 services() ->
     [{httpd, ChildPid} || {_, ChildPid, _, _} <- 
 			      supervisor:which_children(httpd_sup)].
-
 service_info(Pid) ->
     try
 	[{ChildName, ChildPid} || 
@@ -114,7 +125,6 @@ service_info(Pid) ->
 	    {error, service_not_available} 
     end.
 
-
 %%%--------------------------------------------------------------
 %%% Internal functions
 %%%--------------------------------------------------------------------
@@ -128,12 +138,12 @@ child_name(Pid, [_ | Children]) ->
 
 child_name2info(undefined) ->
     {error, no_such_service};
-child_name2info({httpd_instance_sup, any, Port}) ->
+child_name2info({httpd_instance_sup, any, Port, Profile}) ->
     {ok, Host} = inet:gethostname(),
-    Info = info(any, Port, [server_name]),
+    Info = info(any, Port, Profile, [server_name]),
     {ok, [{bind_address,  any}, {host, Host}, {port, Port} | Info]};
-child_name2info({httpd_instance_sup, Address, Port}) ->
-    Info = info(Address, Port, [server_name]),
+child_name2info({httpd_instance_sup, Address, Port, Profile}) ->
+    Info = info(Address, Port, Profile, [server_name]),
     case inet:gethostbyaddr(Address) of
 	{ok, {_, Host, _, _,_, _}} ->
 	    {ok, [{bind_address, Address}, 
@@ -143,8 +153,8 @@ child_name2info({httpd_instance_sup, Address, Port}) ->
     end.
 
 
-reload(Config, Address, Port) ->
-    Name = make_name(Address,Port),
+reload(Config, Address, Port, Profile) ->
+    Name = make_name(Address,Port, Profile),
     case whereis(Name) of
 	Pid when is_pid(Pid) ->
 	    httpd_manager:reload(Pid, Config);
@@ -191,51 +201,19 @@ reload(Config, Address, Port) ->
 %%%              Timeout    -> integer()
 %%%
 
-block(Addr, Port, disturbing) when is_integer(Port) ->
-    do_block(Addr, Port, disturbing);
-block(Addr, Port, non_disturbing) when is_integer(Port) ->
-    do_block(Addr, Port, non_disturbing);
-
-block(ConfigFile, Mode, Timeout) 
-  when is_list(ConfigFile) andalso 
-       is_atom(Mode) andalso 
-       is_integer(Timeout) ->
-    case get_addr_and_port(ConfigFile) of
-	{ok, Addr, Port} ->
-	    block(Addr, Port, Mode, Timeout);
-	Error ->
-	    Error
-    end.
-
-
-block(Addr, Port, non_disturbing, Timeout) 
-  when is_integer(Port) andalso is_integer(Timeout) ->
-    do_block(Addr, Port, non_disturbing, Timeout);
-block(Addr,Port,disturbing,Timeout) 
-  when is_integer(Port) andalso is_integer(Timeout) ->
-    do_block(Addr, Port, disturbing, Timeout).
-
-do_block(Addr, Port, Mode) when is_integer(Port) andalso is_atom(Mode) -> 
-    Name = make_name(Addr,Port),
+block(Addr, Port, Profile, disturbing) when is_integer(Port) ->
+    do_block(Addr, Port, Profile, disturbing);
+block(Addr, Port, Profile, non_disturbing) when is_integer(Port) ->
+    do_block(Addr, Port, Profile, non_disturbing).
+do_block(Addr, Port, Profile, Mode) when is_integer(Port) andalso is_atom(Mode) -> 
+    Name = make_name(Addr, Port, Profile),
     case whereis(Name) of
 	Pid when is_pid(Pid) ->
-	    httpd_manager:block(Pid,Mode);
+	    httpd_manager:block(Pid, Mode);
 	_ ->
 	    {error,not_started}
     end.
     
-
-do_block(Addr, Port, Mode, Timeout) 
-  when is_integer(Port) andalso is_atom(Mode) -> 
-    Name = make_name(Addr,Port),
-    case whereis(Name) of
-	Pid when is_pid(Pid) ->
-	    httpd_manager:block(Pid,Mode,Timeout);
-	_ ->
-	    {error,not_started}
-    end.
-    
-
 %%% =========================================================
 %%% Function:    unblock/2
 %%%              unblock(Addr, Port)
@@ -248,8 +226,8 @@ do_block(Addr, Port, Mode, Timeout)
 %%%              ConfigFile -> string()
 %%%
 
-unblock(Addr, Port) when is_integer(Port) -> 
-    Name = make_name(Addr,Port),
+unblock(Addr, Port, Profile) when is_integer(Port) -> 
+    Name = make_name(Addr,Port, Profile),
     case whereis(Name) of
 	Pid when is_pid(Pid) ->
 	    httpd_manager:unblock(Pid);
@@ -269,24 +247,9 @@ foreach([KeyValue|Rest]) ->
       foreach(Rest)
   end.
 
-get_addr_and_port(ConfigFile) ->
-    case httpd_conf:load(ConfigFile) of
-	{ok, ConfigList} ->
-	    case (catch httpd_conf:validate_properties(ConfigList)) of
-		{ok, Config} ->
-		    Address = proplists:get_value(bind_address, Config, any), 
-		    Port    = proplists:get_value(port, Config, 80),
-		    {ok, Address, Port};
-		Error ->
-		    Error
-	    end;
-	Error ->
-	    Error
-    end.
-
 
-make_name(Addr, Port) ->
-    httpd_util:make_name("httpd", Addr, Port).
+make_name(Addr, Port, Profile) ->
+    httpd_util:make_name("httpd", Addr, Port, Profile).
 
 
 do_reload_config(ConfigList, Mode) ->
@@ -294,10 +257,11 @@ do_reload_config(ConfigList, Mode) ->
 	{ok, Config} ->
 	    Address = proplists:get_value(bind_address, Config, any), 
 	    Port    = proplists:get_value(port, Config, 80),
-	    case block(Address, Port, Mode) of
+	    Profile = proplists:get_value(profile, Config, default),
+	    case block(Address, Port, Profile, Mode) of
 		ok ->
-		    reload(Config, Address, Port),
-		    unblock(Address, Port);
+		    reload(Config, Address, Port, Profile),
+		    unblock(Address, Port, Profile);
 		Error ->
 		    Error
 	    end;
diff --git a/lib/inets/src/http_server/httpd_acceptor_sup.erl b/lib/inets/src/http_server/httpd_acceptor_sup.erl
index cc2b582b52..a6a0fe2eea 100644
--- a/lib/inets/src/http_server/httpd_acceptor_sup.erl
+++ b/lib/inets/src/http_server/httpd_acceptor_sup.erl
@@ -26,6 +26,8 @@
 
 -behaviour(supervisor).
 
+-include("httpd_internal.hrl").
+
 %% API
 -export([start_link/1]).
 %%, start_acceptor/6, start_acceptor/7, stop_acceptor/2]).
@@ -36,8 +38,9 @@
 %%%=========================================================================
 %%%  API
 %%%=========================================================================
-start_link([Addr, Port| _] = Args) ->
-    SupName = make_name(Addr, Port),
+start_link([Addr, Port, Config| _] = Args) ->
+    Profile = proplists:get_value(profile, Config, ?DEFAULT_PROFILE),
+    SupName = make_name(Addr, Port, Profile),
     supervisor:start_link({local, SupName}, ?MODULE, [Args]).
 
 %%%=========================================================================
@@ -54,20 +57,23 @@ init([Args]) ->
 %%%  Internal functions
 %%%=========================================================================  
 child_spec([Address, Port, ConfigList, AcceptTimeout, ListenInfo]) ->
-    Name = id(Address, Port),
-    Manager = httpd_util:make_name("httpd", Address, Port),
+    Profile = proplists:get_value(profile, ConfigList, ?DEFAULT_PROFILE),
+    Name = id(Address, Port, Profile),
+    Manager = httpd_util:make_name("httpd", Address, Port, Profile),
     SockType = proplists:get_value(socket_type, ConfigList, ip_comm),
     IpFamily = proplists:get_value(ipfamily, ConfigList, inet),
     StartFunc = case ListenInfo of
 		    undefined ->
-			{httpd_acceptor, start_link, [Manager, SockType, Address, Port, IpFamily,
-						      httpd_util:make_name("httpd_conf", Address, Port), 
-						      AcceptTimeout]};
+			{httpd_acceptor, start_link, 
+			 [Manager, SockType, Address, Port, IpFamily,
+			  httpd_util:make_name("httpd_conf", Address, Port, Profile), 
+			  AcceptTimeout]};
 		    _ ->
-			{httpd_acceptor, start_link, [Manager, SockType, Address, Port, ListenInfo,
-						      IpFamily,
-						      httpd_util:make_name("httpd_conf", Address, Port), 
-						      AcceptTimeout]}
+			{httpd_acceptor, start_link, 
+			 [Manager, SockType, Address, Port, ListenInfo,
+			  IpFamily,
+			  httpd_util:make_name("httpd_conf", Address, Port, Profile), 
+			  AcceptTimeout]}
 		end,
     Restart = transient, 
     Shutdown = brutal_kill,
@@ -75,9 +81,9 @@ child_spec([Address, Port, ConfigList, AcceptTimeout, ListenInfo]) ->
     Type = worker,
     {Name, StartFunc, Restart, Shutdown, Type, Modules}.
 
-id(Address, Port) ->
-    {httpd_acceptor_sup, Address, Port}.
+id(Address, Port, Profile) ->
+    {httpd_acceptor_sup, Address, Port, Profile}.
 
-make_name(Addr,Port) ->
-    httpd_util:make_name("httpd_acceptor_sup", Addr, Port).
+make_name(Addr, Port, Profile) ->
+    httpd_util:make_name("httpd_acceptor_sup", Addr, Port, Profile).
 
diff --git a/lib/inets/src/http_server/httpd_conf.erl b/lib/inets/src/http_server/httpd_conf.erl
index a21eb915d4..9c70f8d1b8 100644
--- a/lib/inets/src/http_server/httpd_conf.erl
+++ b/lib/inets/src/http_server/httpd_conf.erl
@@ -25,7 +25,7 @@
 
 %% Application internal API
 -export([load/1, load/2, load_mime_types/1, store/1, store/2,
-	 remove/1, remove_all/1, get_config/2, get_config/3,
+	 remove/1, remove_all/1, get_config/3, get_config/4,
 	 lookup_socket_type/1, 
 	 lookup/2, lookup/3, lookup/4, 
 	 validate_properties/1]).
@@ -757,8 +757,9 @@ store(ConfigList0) ->
 	    ?hdrt("store", [{modules, Modules}]),
 	    Port = proplists:get_value(port, ConfigList0),
 	    Addr = proplists:get_value(bind_address, ConfigList0, any),
+	    Profile = proplists:get_value(profile, ConfigList0, default),
 	    ConfigList = fix_mime_types(ConfigList0),
-	    Name = httpd_util:make_name("httpd_conf", Addr, Port),
+	    Name = httpd_util:make_name("httpd_conf", Addr, Port, Profile),
 	    ConfigDB = ets:new(Name, [named_table, bag, protected]),
 	    store(ConfigDB, ConfigList, 
 		  lists:append(Modules, [?MODULE]), 
@@ -909,15 +910,15 @@ remove(ConfigDB) ->
 %%     end.
 
 
-get_config(Address, Port) ->    
-    Tab = httpd_util:make_name("httpd_conf", Address, Port),
+get_config(Address, Port, Profile) ->    
+    Tab = httpd_util:make_name("httpd_conf", Address, Port, Profile),
     Properties =  ets:tab2list(Tab),
     MimeTab = proplists:get_value(mime_types, Properties),
     NewProperties = proplists:delete(mime_types, Properties),
     [{mime_types, ets:tab2list(MimeTab)} | NewProperties].
      
-get_config(Address, Port, Properties) ->    
-    Tab = httpd_util:make_name("httpd_conf", Address, Port),
+get_config(Address, Port, Profile, Properties) ->    
+    Tab = httpd_util:make_name("httpd_conf", Address, Port, Profile),
     Config = 
 	lists:map(fun(Prop) -> {Prop, httpd_util:lookup(Tab, Prop)} end,
 		  Properties),
diff --git a/lib/inets/src/http_server/httpd_instance_sup.erl b/lib/inets/src/http_server/httpd_instance_sup.erl
index b95be44b2a..90800f2724 100644
--- a/lib/inets/src/http_server/httpd_instance_sup.erl
+++ b/lib/inets/src/http_server/httpd_instance_sup.erl
@@ -27,6 +27,8 @@
 
 -behaviour(supervisor).
 
+-include("httpd_internal.hrl").
+
 %% Internal application API
 -export([start_link/3, start_link/4]).
 
@@ -41,7 +43,8 @@ start_link([{_, _}| _] = Config, AcceptTimeout, Debug)  ->
 	{ok, Config2} ->
 	    Address = proplists:get_value(bind_address, Config2),
 	    Port    = proplists:get_value(port, Config2), 
-	    Name = make_name(Address, Port),
+	    Profile = proplists:get_value(profile, Config2, ?DEFAULT_PROFILE), 
+	    Name = make_name(Address, Port, Profile),
 	    SupName = {local, Name},
 	    supervisor:start_link(SupName, ?MODULE, 
 				  [undefined, Config2, AcceptTimeout,
@@ -54,7 +57,8 @@ start_link([{_, _}| _] = Config, AcceptTimeout, Debug)  ->
 start_link(ConfigFile, AcceptTimeout, Debug) ->
     case file_2_config(ConfigFile) of
 	{ok, ConfigList, Address, Port} ->
-	    Name    = make_name(Address, Port),
+	    Profile = proplists:get_value(profile, ConfigList, ?DEFAULT_PROFILE), 
+	    Name    = make_name(Address, Port, Profile),
 	    SupName = {local, Name},
 	    supervisor:start_link(SupName, ?MODULE, 
 				  [ConfigFile, ConfigList, AcceptTimeout,
@@ -70,7 +74,8 @@ start_link([{_, _}| _] = Config, AcceptTimeout, ListenInfo, Debug) ->
 	{ok, Config2} ->
 	    Address = proplists:get_value(bind_address, Config2),
 	    Port    = proplists:get_value(port, Config2), 
-	    Name = make_name(Address, Port),
+	    Profile = proplists:get_value(profile, Config2, ?DEFAULT_PROFILE), 
+	    Name = make_name(Address, Port, Profile),
 	    SupName = {local, Name},
 	    supervisor:start_link(SupName, ?MODULE, 
 				  [undefined, Config2, AcceptTimeout,
@@ -83,7 +88,8 @@ start_link([{_, _}| _] = Config, AcceptTimeout, ListenInfo, Debug) ->
 start_link(ConfigFile, AcceptTimeout, ListenInfo, Debug) ->
     case file_2_config(ConfigFile) of
 	{ok, ConfigList, Address, Port} ->
-	    Name    = make_name(Address, Port),
+	    Profile = proplists:get_value(profile, ConfigList, ?DEFAULT_PROFILE), 
+	    Name    = make_name(Address, Port, Profile),
 	    SupName = {local, Name},
 	    supervisor:start_link(SupName, ?MODULE, 
 				  [ConfigFile, ConfigList, AcceptTimeout,
@@ -99,22 +105,24 @@ start_link(ConfigFile, AcceptTimeout, ListenInfo, Debug) ->
 %%%=========================================================================
 init([ConfigFile, ConfigList, AcceptTimeout, Debug, Address, Port]) -> 
     httpd_util:enable_debug(Debug), 
+    Profile = proplists:get_value(profile, ConfigList, ?DEFAULT_PROFILE),
     Flags = {one_for_one, 0, 1},
-    Children  = [httpd_connection_sup_spec(Address, Port), 
-		 httpd_acceptor_sup_spec(Address, Port, ConfigList, AcceptTimeout,
+    Children  = [httpd_connection_sup_spec(Address, Port, Profile), 
+		 httpd_acceptor_sup_spec(Address, Port, Profile, ConfigList, AcceptTimeout,
 					 undefined), 
-		 sup_spec(httpd_misc_sup, Address, Port), 
-		 worker_spec(httpd_manager, Address, Port, 
+		 sup_spec(httpd_misc_sup, Address, Port, Profile), 
+		 worker_spec(httpd_manager, Address, Port, Profile, 
 			     ConfigFile, ConfigList,AcceptTimeout)],
     {ok, {Flags, Children}};
 init([ConfigFile, ConfigList, AcceptTimeout, Debug, Address, Port, ListenInfo]) -> 
     httpd_util:enable_debug(Debug), 
+    Profile = proplists:get_value(profile, ConfigList, ?DEFAULT_PROFILE),
     Flags = {one_for_one, 0, 1},
-    Children  = [httpd_connection_sup_spec(Address, Port), 
-		 httpd_acceptor_sup_spec(Address, Port, ConfigList, AcceptTimeout,
-					ListenInfo), 
-		 sup_spec(httpd_misc_sup, Address, Port), 
-		 worker_spec(httpd_manager, Address, Port, ListenInfo, 
+    Children  = [httpd_connection_sup_spec(Address, Port, Profile), 
+		 httpd_acceptor_sup_spec(Address, Port, Profile, ConfigList, AcceptTimeout,
+					 ListenInfo), 
+		 sup_spec(httpd_misc_sup, Address, Port, Profile), 
+		 worker_spec(httpd_manager, Address, Port, Profile, ListenInfo, 
 			     ConfigFile, ConfigList, AcceptTimeout)],
     {ok, {Flags, Children}}.
 
@@ -122,8 +130,8 @@ init([ConfigFile, ConfigList, AcceptTimeout, Debug, Address, Port, ListenInfo])
 %%%=========================================================================
 %%%  Internal functions
 %%%=========================================================================
-httpd_connection_sup_spec(Address, Port) -> 
-    Name = {httpd_connection_sup, Address, Port},
+httpd_connection_sup_spec(Address, Port, Profile) -> 
+    Name = {httpd_connection_sup, Address, Port, Profile},
     StartFunc = {httpd_connection_sup, start_link, [[Address, Port]]},
     Restart = permanent,
     Shutdown = 5000,
@@ -131,8 +139,8 @@ httpd_connection_sup_spec(Address, Port) ->
     Type = supervisor,
     {Name, StartFunc, Restart, Shutdown, Type, Modules}.
 
-httpd_acceptor_sup_spec(Address, Port, ConfigList, AcceptTimeout, ListenInfo) ->
-    Name = {httpd_acceptor_sup, Address, Port},
+httpd_acceptor_sup_spec(Address, Port, Profile, ConfigList, AcceptTimeout, ListenInfo) ->
+    Name = {httpd_acceptor_sup, Address, Port, Profile},
     StartFunc = {httpd_acceptor_sup, start_link, [[Address, Port, ConfigList, AcceptTimeout, ListenInfo]]},
     Restart = permanent, 
     Shutdown = infinity,
@@ -140,18 +148,18 @@ httpd_acceptor_sup_spec(Address, Port, ConfigList, AcceptTimeout, ListenInfo) ->
     Type = supervisor,
     {Name, StartFunc, Restart, Shutdown, Type, Modules}.
     
-sup_spec(SupModule, Address, Port) ->
-    Name = {SupModule, Address, Port},
-    StartFunc = {SupModule, start_link, [Address, Port]},
+sup_spec(SupModule, Address, Port, Profile) ->
+    Name = {SupModule, Address, Port, Profile},
+    StartFunc = {SupModule, start_link, [Address, Port, Profile]},
     Restart = permanent, 
     Shutdown = infinity,
     Modules = [SupModule],
     Type = supervisor,
     {Name, StartFunc, Restart, Shutdown, Type, Modules}.
     
-worker_spec(WorkerModule, Address, Port, ConfigFile, 
+worker_spec(WorkerModule, Address, Port, Profile, ConfigFile, 
 	    ConfigList, AcceptTimeout) ->
-    Name = {WorkerModule, Address, Port},
+    Name = {WorkerModule, Address, Port, Profile},
     StartFunc = {WorkerModule, start_link, 
 		 [ConfigFile, ConfigList, AcceptTimeout]}, 
     Restart = permanent, 
@@ -160,9 +168,9 @@ worker_spec(WorkerModule, Address, Port, ConfigFile,
     Type = worker,
     {Name, StartFunc, Restart, Shutdown, Type, Modules}.
 
-worker_spec(WorkerModule, Address, Port, ListenInfo, ConfigFile, 
+worker_spec(WorkerModule, Address, Port, Profile, ListenInfo, ConfigFile, 
 	    ConfigList, AcceptTimeout) ->
-    Name = {WorkerModule, Address, Port},
+    Name = {WorkerModule, Address, Port, Profile},
     StartFunc = {WorkerModule, start_link, 
 		 [ConfigFile, ConfigList, AcceptTimeout, ListenInfo]}, 
     Restart = permanent, 
@@ -171,8 +179,8 @@ worker_spec(WorkerModule, Address, Port, ListenInfo, ConfigFile,
     Type = worker,
     {Name, StartFunc, Restart, Shutdown, Type, Modules}.
 
-make_name(Address,Port) ->
-    httpd_util:make_name("httpd_instance_sup", Address, Port).
+make_name(Address, Port, Profile) ->
+    httpd_util:make_name("httpd_instance_sup", Address, Port, Profile).
 
 
 file_2_config(ConfigFile) ->
diff --git a/lib/inets/src/http_server/httpd_internal.hrl b/lib/inets/src/http_server/httpd_internal.hrl
index 108469ea0a..9829ca255c 100644
--- a/lib/inets/src/http_server/httpd_internal.hrl
+++ b/lib/inets/src/http_server/httpd_internal.hrl
@@ -31,6 +31,8 @@
 -define(SOCKET_MAX_POLL,25).
 -define(FILE_CHUNK_SIZE,64*1024).
 -define(GATEWAY_INTERFACE,"CGI/1.1").
+-define(DEFAULT_PROFILE, default).
+
 -define(NICE(Reason),lists:flatten(atom_to_list(?MODULE)++": "++Reason)).
 -define(DEFAULT_CONTEXT,
 	[{errmsg,"[an error occurred while processing this directive]"},
diff --git a/lib/inets/src/http_server/httpd_manager.erl b/lib/inets/src/http_server/httpd_manager.erl
index 3da0343401..995316d5e8 100644
--- a/lib/inets/src/http_server/httpd_manager.erl
+++ b/lib/inets/src/http_server/httpd_manager.erl
@@ -28,7 +28,7 @@
 -export([start/2, start_link/2, start_link/3, start_link/4, 
 	 stop/1, reload/2]).
 -export([new_connection/1]).
--export([config_match/2, config_match/3]).
+-export([config_match/3, config_match/4]).
 -export([block/2, block/3, unblock/1]).
 
 %% gen_server exports
@@ -54,7 +54,8 @@
 start(ConfigFile, ConfigList) ->
     Port = proplists:get_value(port,ConfigList,80),
     Addr = proplists:get_value(bind_address, ConfigList),
-    Name = make_name(Addr,Port),
+    Profile = proplists:get_value(profile, ConfigList, default),
+    Name = make_name(Addr, Port, Profile),
     gen_server:start({local,Name},?MODULE,
 		     [ConfigFile, ConfigList, 15000, Addr, Port],[]).
 
@@ -65,7 +66,8 @@ start_link(ConfigFile, ConfigList) ->
 start_link(ConfigFile, ConfigList, AcceptTimeout) ->
     Port = proplists:get_value(port, ConfigList, 80),
     Addr = proplists:get_value(bind_address, ConfigList),
-    Name = make_name(Addr, Port),
+    Profile = proplists:get_value(profile, ConfigList, default),
+    Name = make_name(Addr, Port, Profile),
     
     gen_server:start_link({local, Name},?MODULE,
 			  [ConfigFile, ConfigList, 
@@ -74,7 +76,8 @@ start_link(ConfigFile, ConfigList, AcceptTimeout) ->
 start_link(ConfigFile, ConfigList, AcceptTimeout, ListenSocket) ->
     Port = proplists:get_value(port, ConfigList, 80),
     Addr = proplists:get_value(bind_address, ConfigList),
-    Name = make_name(Addr, Port),
+    Profile = proplists:get_value(profile, ConfigList, default),
+    Name = make_name(Addr, Port, Profile),
     
     gen_server:start_link({local, Name},?MODULE,
 			  [ConfigFile, ConfigList, AcceptTimeout, Addr, 
@@ -97,10 +100,10 @@ unblock(ServerRef) ->
 new_connection(Manager) ->
     call(Manager, {new_connection, self()}).
 
-config_match(Port, Pattern) ->
-    config_match(undefined,Port,Pattern).
-config_match(Addr, Port, Pattern) ->
-    Name = httpd_util:make_name("httpd",Addr,Port),
+config_match(Port, Profile, Pattern) ->
+    config_match(undefined,Port, Profile, Pattern).
+config_match(Addr, Port, Profile, Pattern) ->
+    Name = httpd_util:make_name("httpd",Addr,Port, Profile),
     call(whereis(Name), {config_match, Pattern}).
 
 %%%--------------------------------------------------------------------
@@ -446,8 +449,8 @@ get_ustate(ConnectionCnt,State) ->
 	    active
     end.
 
-make_name(Addr,Port) ->
-    httpd_util:make_name("httpd",Addr,Port).
+make_name(Addr, Port, Profile) ->
+    httpd_util:make_name("httpd", Addr, Port, Profile).
 
 
 report_error(State,String) ->
diff --git a/lib/inets/src/http_server/httpd_misc_sup.erl b/lib/inets/src/http_server/httpd_misc_sup.erl
index fd7c28bd7d..e5de66d773 100644
--- a/lib/inets/src/http_server/httpd_misc_sup.erl
+++ b/lib/inets/src/http_server/httpd_misc_sup.erl
@@ -27,8 +27,8 @@
 -behaviour(supervisor).
 
 %% API 
--export([start_link/2, start_auth_server/2, stop_auth_server/2, 
-	 start_sec_server/2,  stop_sec_server/2]).
+-export([start_link/3, start_auth_server/3, stop_auth_server/3, 
+	 start_sec_server/3,  stop_sec_server/3]).
 
 %% Supervisor callback
 -export([init/1]).
@@ -37,26 +37,26 @@
 %%%  API
 %%%=========================================================================
 
-start_link(Addr, Port) ->
-    SupName = make_name(Addr, Port),
+start_link(Addr, Port, Profile) ->
+    SupName = make_name(Addr, Port, Profile),
     supervisor:start_link({local, SupName}, ?MODULE, []).
 
 %%----------------------------------------------------------------------
 %% Function: [start|stop]_[auth|sec]_server/3
 %% Description: Starts a [auth | security] worker (child) process
 %%----------------------------------------------------------------------
-start_auth_server(Addr, Port) ->
-    start_permanent_worker(mod_auth_server, Addr, Port, [gen_server]).
+start_auth_server(Addr, Port, Profile) ->
+    start_permanent_worker(mod_auth_server, Addr, Port, Profile, [gen_server]).
 
-stop_auth_server(Addr, Port) ->
-    stop_permanent_worker(mod_auth_server, Addr, Port).
+stop_auth_server(Addr, Port, Profile) ->
+    stop_permanent_worker(mod_auth_server, Addr, Port, Profile).
 
 
-start_sec_server(Addr, Port) ->
-    start_permanent_worker(mod_security_server, Addr, Port, [gen_server]).
+start_sec_server(Addr, Port, Profile) ->
+    start_permanent_worker(mod_security_server, Addr, Port, Profile, [gen_server]).
 
-stop_sec_server(Addr, Port) ->
-    stop_permanent_worker(mod_security_server, Addr, Port).
+stop_sec_server(Addr, Port, Profile) ->
+    stop_permanent_worker(mod_security_server, Addr, Port, Profile).
 
 
 %%%=========================================================================
@@ -70,15 +70,15 @@ init(_) ->
 %%%=========================================================================
 %%%  Internal functions
 %%%=========================================================================
-start_permanent_worker(Mod, Addr, Port, Modules) ->
-    SupName = make_name(Addr, Port),
+start_permanent_worker(Mod, Addr, Port, Profile, Modules) ->
+    SupName = make_name(Addr, Port, Profile),
     Spec    = {{Mod, Addr, Port},
-	       {Mod, start_link, [Addr, Port]}, 
+	       {Mod, start_link, [Addr, Port, Profile]}, 
 	       permanent, timer:seconds(1), worker, [Mod] ++ Modules},
     supervisor:start_child(SupName, Spec).
 
-stop_permanent_worker(Mod, Addr, Port) ->
-    SupName = make_name(Addr, Port),
+stop_permanent_worker(Mod, Addr, Port, Profile) ->
+    SupName = make_name(Addr, Port, Profile),
     Name    = {Mod, Addr, Port},
     case supervisor:terminate_child(SupName, Name) of
 	ok ->
@@ -87,5 +87,5 @@ stop_permanent_worker(Mod, Addr, Port) ->
 	    Error
     end.
     
-make_name(Addr,Port) ->
-    httpd_util:make_name("httpd_misc_sup",Addr,Port).
+make_name(Addr,Port, Profile) ->
+    httpd_util:make_name("httpd_misc_sup",Addr,Port, Profile).
diff --git a/lib/inets/src/http_server/httpd_sup.erl b/lib/inets/src/http_server/httpd_sup.erl
index 3b1e16cf78..20b9b6b315 100644
--- a/lib/inets/src/http_server/httpd_sup.erl
+++ b/lib/inets/src/http_server/httpd_sup.erl
@@ -28,7 +28,7 @@
 
 %% Internal application API
 -export([start_link/1, start_link/2]).
--export([start_child/1, restart_child/2, stop_child/2]).
+-export([start_child/1, restart_child/3, stop_child/3]).
 
 %% Supervisor callback
 -export([init/1]).
@@ -64,26 +64,26 @@ start_child(Config) ->
     end.
     
 
-restart_child(Address, Port) ->
-    Name = id(Address, Port),
+restart_child(Address, Port, Profile) ->
+    Name = id(Address, Port, Profile),
     case supervisor:terminate_child(?MODULE, Name) of
-        ok ->
-            supervisor:restart_child(?MODULE, Name);
-        Error ->
-            Error
-    end.
-    
-stop_child(Address, Port) ->
-    Name = id(Address, Port),
+	ok ->
+             supervisor:restart_child(?MODULE, Name);
+	Error ->
+             Error
+     end.
+
+stop_child(Address, Port, Profile) ->
+    Name = id(Address, Port, Profile),
     case supervisor:terminate_child(?MODULE, Name) of
-        ok ->
-            supervisor:delete_child(?MODULE, Name);
-        Error ->
+         ok ->
+	    supervisor:delete_child(?MODULE, Name);
+         Error ->
             Error
     end.
-    
-id(Address, Port) ->
-    {httpd_instance_sup, Address, Port}.
+
+id(Address, Port, Profile) ->
+    {httpd_instance_sup, Address, Port, Profile}.
 
 
 %%%=========================================================================
@@ -166,7 +166,8 @@ httpd_child_spec([Value| _] = Config, AcceptTimeout, Debug)
 				       {debug,          Debug}]),
     Address = proplists:get_value(bind_address, Config, any),
     Port    = proplists:get_value(port, Config, 80),
-    httpd_child_spec(Config, AcceptTimeout, Debug, Address, Port);
+    Profile =  proplists:get_value(profile, Config, ?DEFAULT_PROFILE),
+    httpd_child_spec(Config, AcceptTimeout, Debug, Address, Port, Profile);
 
 %% In this case the AcceptTimeout and Debug will only have default values...
 httpd_child_spec(ConfigFile, AcceptTimeoutDef, DebugDef) ->
@@ -181,13 +182,14 @@ httpd_child_spec(ConfigFile, AcceptTimeoutDef, DebugDef) ->
 		    ?hdrt("httpd_child_spec - validated", [{config, Config}]),
 		    Address = proplists:get_value(bind_address, Config, any), 
 		    Port    = proplists:get_value(port, Config, 80),
+		    Profile = proplists:get_value(profile, Config, ?DEFAULT_PROFILE),
 		    AcceptTimeout = 
 			proplists:get_value(accept_timeout, Config, 
 					    AcceptTimeoutDef),
 		    Debug   = 
 			proplists:get_value(debug, Config, DebugDef),
 		    httpd_child_spec([{file, ConfigFile} | Config], 
-				     AcceptTimeout, Debug, Address, Port);
+				     AcceptTimeout, Debug, Address, Port, Profile);
 		Error ->
 		    Error
 	    end;
@@ -195,19 +197,19 @@ httpd_child_spec(ConfigFile, AcceptTimeoutDef, DebugDef) ->
 	    Error
     end.
 
-httpd_child_spec(Config, AcceptTimeout, Debug, Addr, Port) ->
+httpd_child_spec(Config, AcceptTimeout, Debug, Addr, Port, Profile) ->
     Fd  = proplists:get_value(fd, Config, undefined),
     case Port == 0 orelse Fd =/= undefined of
 	true ->
-	    httpd_child_spec_listen(Config, AcceptTimeout, Debug, Addr, Port);
+	    httpd_child_spec_listen(Config, AcceptTimeout, Debug, Addr, Port, Profile);
 	false ->
-	    httpd_child_spec_nolisten(Config, AcceptTimeout, Debug, Addr, Port)
+	    httpd_child_spec_nolisten(Config, AcceptTimeout, Debug, Addr, Port, Profile)
     end.
 
-httpd_child_spec_listen(Config, AcceptTimeout, Debug, Addr, Port) ->
+httpd_child_spec_listen(Config, AcceptTimeout, Debug, Addr, Port, Profile) ->
     case start_listen(Addr, Port, Config) of
 	{Pid, {NewPort, NewConfig, ListenSocket}} ->
-	    Name      = {httpd_instance_sup, Addr, NewPort},
+	    Name      = {httpd_instance_sup, Addr, NewPort, Profile},
 	    StartFunc = {httpd_instance_sup, start_link,
 			 [NewConfig, AcceptTimeout, 
 			  {Pid, ListenSocket}, Debug]},
@@ -221,8 +223,8 @@ httpd_child_spec_listen(Config, AcceptTimeout, Debug, Addr, Port) ->
 	    {error, Reason}
     end.
 		    
-httpd_child_spec_nolisten(Config, AcceptTimeout, Debug, Addr, Port) ->
-    Name = {httpd_instance_sup, Addr, Port},
+httpd_child_spec_nolisten(Config, AcceptTimeout, Debug, Addr, Port, Profile) ->    
+    Name = {httpd_instance_sup, Addr, Port, Profile},
     StartFunc = {httpd_instance_sup, start_link,
 		 [Config, AcceptTimeout, Debug]},
     Restart = permanent, 
diff --git a/lib/inets/src/http_server/httpd_util.erl b/lib/inets/src/http_server/httpd_util.erl
index 0d04a75205..b1ddc1abbb 100644
--- a/lib/inets/src/http_server/httpd_util.erl
+++ b/lib/inets/src/http_server/httpd_util.erl
@@ -572,7 +572,10 @@ make_name(Prefix,Port) ->
 
 make_name(Prefix,Addr,Port) ->
     make_name(Prefix,Addr,Port,"").
-    
+
+make_name(Prefix, Addr,Port,Postfix) when is_atom(Postfix)->
+    make_name(Prefix, Addr,Port, atom_to_list(Postfix));
+
 make_name(Prefix,"*",Port,Postfix) ->
     make_name(Prefix,undefined,Port,Postfix);
 
@@ -595,15 +598,7 @@ make_name2({A,B,C,D}) ->
     io_lib:format("~w_~w_~w_~w", [A,B,C,D]);
 
 make_name2({A, B, C, D, E, F, G, H}) ->
-    io_lib:format("~s_~s_~s_~s_~s_~s_~s_~s", [integer_to_hexlist(A),
-					      integer_to_hexlist(B),
-					      integer_to_hexlist(C),
-					      integer_to_hexlist(D),
-					      integer_to_hexlist(E),
-					      integer_to_hexlist(F),
-					      integer_to_hexlist(G),
-					      integer_to_hexlist(H)
-					     ]);
+    io_lib:format("~w_~w_~w_~w_~w_~w_~w_~w", [A,B,C,D,E,F,G,H]);
 make_name2(Addr) ->
     search_and_replace(Addr,$.,$_).
 
diff --git a/lib/inets/src/http_server/mod_auth.erl b/lib/inets/src/http_server/mod_auth.erl
index 85a87ab884..eeacd451f0 100644
--- a/lib/inets/src/http_server/mod_auth.erl
+++ b/lib/inets/src/http_server/mod_auth.erl
@@ -38,7 +38,6 @@
 -include("httpd.hrl").
 -include("mod_auth.hrl").
 -include("httpd_internal.hrl").
--include("inets_internal.hrl").
 
 -define(VMODULE,"AUTH").
 
@@ -46,7 +45,6 @@
 
 %% do
 do(Info) ->
-    ?hdrt("do", [{info, Info}]),
     case proplists:get_value(status,Info#mod.data) of
 	%% A status code has been generated!
 	{_StatusCode, _PhraseArgs, _Reason} ->
@@ -61,22 +59,16 @@ do(Info) ->
 		    %% Is it a secret area?
 		    case secretp(Path,Info#mod.config_db) of
 			{yes, {Directory, DirectoryData}} ->
-			    ?hdrt("secret area", 
-				  [{directory, Directory},
-				   {directory_data, DirectoryData}]),
-
-			    %% Authenticate (allow)
+			   %% Authenticate (allow)
 			    case allow((Info#mod.init_data)#init_data.peername,
 				       Info#mod.socket_type,Info#mod.socket,
 				       DirectoryData) of
 				allowed ->
-				    ?hdrt("allowed", []),
 				    case deny((Info#mod.init_data)#init_data.peername,
 					      Info#mod.socket_type, 
 					      Info#mod.socket,
 					      DirectoryData) of
 					not_denied ->
-					    ?hdrt("not denied", []),
 					    case proplists:get_value(auth_type,
 								     DirectoryData) of
 						undefined ->
@@ -90,15 +82,13 @@ do(Info) ->
 							    AuthType)
 					    end;
 					{denied, Reason} ->
-					    ?hdrt("denied", [{reason, Reason}]),
 					    {proceed,
 					     [{status, {403,
-						       Info#mod.request_uri,
-						       Reason}}|
+							Info#mod.request_uri,
+							Reason}}|
 					      Info#mod.data]}
 				    end;
 				{not_allowed, Reason} ->
-				    ?hdrt("not allowed", [{reason, Reason}]),
 				    {proceed,[{status,{403,
 						       Info#mod.request_uri,
 						       Reason}} |
@@ -113,19 +103,14 @@ do(Info) ->
 	    end
     end.
 
-
-do_auth(Info, Directory, DirectoryData, AuthType) ->
+do_auth(Info, Directory, DirectoryData, _AuthType) ->
     %% Authenticate (require)
-    ?hdrt("authenticate", [{auth_type, AuthType}]),
     case require(Info, Directory, DirectoryData) of
 	authorized ->
-	    ?hdrt("authorized", []),
 	    {proceed,Info#mod.data};
 	{authorized, User} ->
-	    ?hdrt("authorized", [{user, User}]),
 	    {proceed, [{remote_user,User}|Info#mod.data]};
 	{authorization_required, Realm} ->
-	    ?hdrt("authorization required", [{realm, Realm}]),
 	    ReasonPhrase = httpd_util:reason_phrase(401),
 	    Message = httpd_util:message(401,none,Info#mod.config_db),
 	    {proceed,
@@ -486,8 +471,6 @@ check_filename_present(Dir,AuthFile,DirData) ->
 
 store({directory, {Directory, DirData}}, ConfigList) 
   when is_list(Directory) andalso is_list(DirData) ->
-    ?hdrt("store", 
-	  [{directory, Directory}, {dir_data, DirData}]),
     try directory_config_check(Directory, DirData) of
 	ok ->
 	    store_directory(Directory, DirData, ConfigList) 
@@ -498,108 +481,19 @@ store({directory, {Directory, DirData}}, ConfigList)
 store({directory, {Directory, DirData}}, _) ->
     {error, {wrong_type, {directory, {Directory, DirData}}}}.
 
-store_directory(Directory0, DirData0, ConfigList) ->
-    ?hdrt("store directory - entry", 
-	  [{directory, Directory0}, {dir_data, DirData0}]),
-    Port = proplists:get_value(port, ConfigList),
-    DirData = case proplists:get_value(bind_address, ConfigList) of
-		  undefined ->
-		    [{port, Port}|DirData0];
-		Addr ->
-		    [{port, Port},{bind_address,Addr}|DirData0]
-	    end,
-    Directory = 
-	case filename:pathtype(Directory0) of
-	    relative ->
-		SR = proplists:get_value(server_root, ConfigList),
-		filename:join(SR, Directory0);
-	    _ ->
-		Directory0
-	end,
-    AuthMod =
-	case proplists:get_value(auth_type, DirData0) of
-	    mnesia -> mod_auth_mnesia;
-	    dets ->   mod_auth_dets;
-	    plain ->  mod_auth_plain;
-	    _ ->      no_module_at_all
-	end,
-    ?hdrt("store directory", 
-	  [{directory, Directory}, {dir_data, DirData}, {auth_mod, AuthMod}]),
-    case AuthMod of
-	no_module_at_all ->
-	    {ok, {directory, {Directory, DirData}}};
-	_ ->
-	    %% Check that there are a password or add a standard password: 
-	    %% "NoPassword"
-	    %% In this way a user must select to use a noPassword
-	    Passwd = 
-		case proplists:get_value(auth_access_password, DirData) of
-		    undefined ->
-			?NOPASSWORD;
-		    PassW ->
-			PassW
-		end,
-	    DirDataLast = lists:keydelete(auth_access_password,1,DirData), 
-	    Server_root = proplists:get_value(server_root, ConfigList),
-	    case catch AuthMod:store_directory_data(Directory, 
-						    DirDataLast, 
-						    Server_root) of
-		ok ->
-		    add_auth_password(Directory, Passwd, ConfigList),
-		    {ok, {directory, {Directory, DirDataLast}}};
-		{ok, NewDirData} ->
-		    add_auth_password(Directory, Passwd, ConfigList),
-		    {ok, {directory, {Directory, NewDirData}}};
-		{error, Reason} ->
-		    {error, Reason};
-		Other ->
-		    {error, Other}
-	    end
-    end.
-
-add_auth_password(Dir, Pwd0, ConfigList) ->    
-    Addr = proplists:get_value(bind_address, ConfigList),
-    Port = proplists:get_value(port, ConfigList),
-    mod_auth_server:start(Addr, Port),
-    mod_auth_server:add_password(Addr, Port, Dir, Pwd0).
-    
-%% remove
-
-
 remove(ConfigDB) ->
     lists:foreach(fun({directory, {_Dir, DirData}}) -> 
 			  AuthMod = auth_mod_name(DirData),
 			  (catch apply(AuthMod, remove, [DirData]))
 		  end,
 		  ets:match_object(ConfigDB,{directory,{'_','_'}})),
-    Addr = case lookup(ConfigDB, bind_address) of
-	       [] -> 
-		   undefined;
-	       [{bind_address, Address}] ->
-		   Address
-	   end,
-    [{port, Port}] = lookup(ConfigDB, port),
-    mod_auth_server:stop(Addr, Port),
-    ok.
 
+    Addr = httpd_util:lookup(ConfigDB, bind_address, undefined),
+    Port = httpd_util:lookup(ConfigDB, port),
+    Profile = httpd_util:lookup(ConfigDB, profile, ?DEFAULT_PROFILE),
+    mod_auth_server:stop(Addr, Port, Profile),
+    ok.
 %% --------------------------------------------------------------------
-
-%% update_password
-
-update_password(Port, Dir, Old, New, New)->
-    update_password(undefined, Port, Dir, Old, New, New).
-
-update_password(Addr, Port, Dir, Old, New, New) when is_list(New) ->
-    mod_auth_server:update_password(Addr, Port, Dir, Old, New);
-
-update_password(_Addr, _Port, _Dir, _Old, _New, _New) ->
-    {error, badtype};
-update_password(_Addr, _Port, _Dir, _Old, _New, _New1) ->
-    {error, notqeual}.
-
-
-%% add_user
-
 add_user(UserName, Opt) ->
     case get_options(Opt, mandatory) of
 	{Addr, Port, Dir, AuthPwd}->
@@ -623,9 +517,6 @@ add_user(UserName, Password, UserData, Addr, Port, Dir) ->
 			user_data = UserData}],
     mod_auth_server:add_user(Addr, Port, Dir, User, ?NOPASSWORD).
 
-
-%% get_user
-
 get_user(UserName, Opt) ->
     case get_options(Opt, mandatory) of
 	{Addr, Port, Dir, AuthPwd} ->
@@ -640,8 +531,6 @@ get_user(UserName, Addr, Port, Dir) ->
     mod_auth_server:get_user(Addr, Port, Dir, UserName, ?NOPASSWORD).
 
 
-%% add_group_member
-
 add_group_member(GroupName, UserName, Opt)->
     case get_options(Opt, mandatory) of
 	{Addr, Port, Dir, AuthPwd}->
@@ -658,9 +547,6 @@ add_group_member(GroupName, UserName, Addr, Port, Dir) ->
     mod_auth_server:add_group_member(Addr, Port, Dir, 
 				     GroupName, UserName, ?NOPASSWORD).
 
-
-%% delete_group_member
-
 delete_group_member(GroupName, UserName, Opt) ->
     case get_options(Opt, mandatory) of
 	{Addr, Port, Dir, AuthPwd} ->
@@ -675,10 +561,6 @@ delete_group_member(GroupName, UserName, Port, Dir) ->
 delete_group_member(GroupName, UserName, Addr, Port, Dir) ->
     mod_auth_server:delete_group_member(Addr, Port, Dir, 
 					GroupName, UserName, ?NOPASSWORD).
-
-
-%% list_users
-
 list_users(Opt) ->
     case get_options(Opt, mandatory) of
 	{Addr, Port, Dir, AuthPwd} ->
@@ -692,9 +574,6 @@ list_users(Port, Dir) ->
 list_users(Addr, Port, Dir) ->
     mod_auth_server:list_users(Addr, Port, Dir, ?NOPASSWORD).
 
-    
-%% delete_user
-
 delete_user(UserName, Opt) ->
     case get_options(Opt, mandatory) of
 	{Addr, Port, Dir, AuthPwd} ->
@@ -708,9 +587,6 @@ delete_user(UserName, Port, Dir) ->
 delete_user(UserName, Addr, Port, Dir) ->
     mod_auth_server:delete_user(Addr, Port, Dir, UserName, ?NOPASSWORD).
 	  
-
-%% delete_group
-
 delete_group(GroupName, Opt) ->
     case get_options(Opt, mandatory) of
 	{Addr, Port, Dir, AuthPwd} ->
@@ -724,9 +600,6 @@ delete_group(GroupName, Port, Dir) ->
 delete_group(GroupName, Addr, Port, Dir) ->
     mod_auth_server:delete_group(Addr, Port, Dir, GroupName, ?NOPASSWORD).
 
-
-%% list_groups
-
 list_groups(Opt) ->
     case get_options(Opt, mandatory) of
 	{Addr, Port, Dir, AuthPwd} ->
@@ -740,9 +613,6 @@ list_groups(Port, Dir) ->
 list_groups(Addr, Port, Dir) ->
     mod_auth_server:list_groups(Addr, Port, Dir, ?NOPASSWORD).
 
-
-%% list_group_members
-
 list_group_members(GroupName, Opt) ->
     case get_options(Opt, mandatory) of
 	{Addr, Port, Dir, AuthPwd} ->
@@ -758,6 +628,82 @@ list_group_members(GroupName, Addr, Port, Dir) ->
     mod_auth_server:list_group_members(Addr, Port, Dir, 
 				       GroupName, ?NOPASSWORD).
 
+update_password(Port, Dir, Old, New, New)->
+    update_password(undefined, Port, Dir, Old, New, New).
+
+update_password(Addr, Port, Dir, Old, New, New) when is_list(New) ->
+    mod_auth_server:update_password(Addr, Port, Dir, Old, New);
+
+update_password(_Addr, _Port, _Dir, _Old, _New, _New) ->
+    {error, badtype};
+update_password(_Addr, _Port, _Dir, _Old, _New, _New1) ->
+    {error, notqeual}.
+
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
+store_directory(Directory0, DirData0, ConfigList) ->
+    Port = proplists:get_value(port, ConfigList),
+    DirData = case proplists:get_value(bind_address, ConfigList) of
+		  undefined ->
+		    [{port, Port}|DirData0];
+		Addr ->
+		    [{port, Port},{bind_address,Addr}|DirData0]
+	    end,
+    Directory = 
+	case filename:pathtype(Directory0) of
+	    relative ->
+		SR = proplists:get_value(server_root, ConfigList),
+		filename:join(SR, Directory0);
+	    _ ->
+		Directory0
+	end,
+    AuthMod =
+	case proplists:get_value(auth_type, DirData0) of
+	    mnesia -> mod_auth_mnesia;
+	    dets ->   mod_auth_dets;
+	    plain ->  mod_auth_plain;
+	    _ ->      no_module_at_all
+	end,  
+    case AuthMod of
+	no_module_at_all ->
+	    {ok, {directory, {Directory, DirData}}};
+	_ ->
+	    %% Check that there are a password or add a standard password: 
+	    %% "NoPassword"
+	    %% In this way a user must select to use a noPassword
+	    Passwd = 
+		case proplists:get_value(auth_access_password, DirData) of
+		    undefined ->
+			?NOPASSWORD;
+		    PassW ->
+			PassW
+		end,
+	    DirDataLast = lists:keydelete(auth_access_password,1,DirData), 
+	    Server_root = proplists:get_value(server_root, ConfigList),
+	    case catch AuthMod:store_directory_data(Directory, 
+						    DirDataLast, 
+						    Server_root) of
+		ok ->
+		    add_auth_password(Directory, Passwd, ConfigList),
+		    {ok, {directory, {Directory, DirDataLast}}};
+		{ok, NewDirData} ->
+		    add_auth_password(Directory, Passwd, ConfigList),
+		    {ok, {directory, {Directory, NewDirData}}};
+		{error, Reason} ->
+		    {error, Reason};
+		Other ->
+		    {error, Other}
+	    end
+    end.
+
+add_auth_password(Dir, Pwd0, ConfigList) ->    
+    Addr = proplists:get_value(bind_address, ConfigList),
+    Port = proplists:get_value(port, ConfigList),
+    Profile = proplists:get_value(profile, ConfigList, ?DEFAULT_PROFILE),
+    mod_auth_server:start(Addr, Port, Profile),
+    mod_auth_server:add_password(Addr, Port, Dir, Pwd0).
+    
 %% Opt = [{port, Port},
 %%        {addr, Addr},
 %%        {dir,  Dir},
@@ -792,7 +738,3 @@ get_options(Opt, userData)->
 		    {UserData, Pwd}
 	    end
     end.
-
-
-lookup(Db, Key) ->
-    ets:lookup(Db, Key).
diff --git a/lib/inets/src/http_server/mod_auth_dets.erl b/lib/inets/src/http_server/mod_auth_dets.erl
index a48725d5d9..ff81a68dd4 100644
--- a/lib/inets/src/http_server/mod_auth_dets.erl
+++ b/lib/inets/src/http_server/mod_auth_dets.erl
@@ -50,11 +50,12 @@ store_directory_data(_Directory, DirData, Server_root) ->
 							 DirData, Server_root),
     Addr = proplists:get_value(bind_address, DirData),
     Port = proplists:get_value(port, DirData),
+    Profile = proplists:get_value(profile, DirData, ?DEFAULT_PROFILE),
 
-    PWName  = httpd_util:make_name("httpd_dets_pwdb",Addr,Port),
+    PWName  = httpd_util:make_name("httpd_dets_pwdb", Addr, Port, Profile),
     case dets:open_file(PWName,[{type,set},{file,Absolute_pwdfile},{repair,true}]) of
 	{ok, PWDB} ->
-	    GDBName = httpd_util:make_name("httpd_dets_groupdb",Addr,Port),
+	    GDBName = httpd_util:make_name("httpd_dets_groupdb", Addr, Port, Profile),
 	    case dets:open_file(GDBName,[{type,set},{file,Absolute_groupfile},{repair,true}]) of
 		{ok, GDB} ->
 		    NDD1 = lists:keyreplace(auth_user_file, 1, DirData, 
diff --git a/lib/inets/src/http_server/mod_auth_plain.erl b/lib/inets/src/http_server/mod_auth_plain.erl
index c0a83711ba..9a12c6695d 100644
--- a/lib/inets/src/http_server/mod_auth_plain.erl
+++ b/lib/inets/src/http_server/mod_auth_plain.erl
@@ -268,6 +268,7 @@ parse_group(Stream, GroupList, Line) ->
 %% store_passwd
 
 store_passwd(Addr,Port,PasswdList) ->
+    %% Not a named table so not importante to add Profile to name
     Name = httpd_util:make_name("httpd_passwd",Addr,Port),
     PasswdDB = ets:new(Name, [set, public]),
     store_passwd(PasswdDB, PasswdList).
@@ -281,6 +282,7 @@ store_passwd(PasswdDB, [User|Rest]) ->
 %% store_group
 
 store_group(Addr,Port,GroupList) ->
+    %% Not a named table so not importante to add Profile to name
     Name = httpd_util:make_name("httpd_group",Addr,Port),
     GroupDB = ets:new(Name, [set, public]),
     store_group(GroupDB, GroupList).
diff --git a/lib/inets/src/http_server/mod_auth_server.erl b/lib/inets/src/http_server/mod_auth_server.erl
index 947273bd9e..656721fbc4 100644
--- a/lib/inets/src/http_server/mod_auth_server.erl
+++ b/lib/inets/src/http_server/mod_auth_server.erl
@@ -28,14 +28,14 @@
 
 
 %% mod_auth exports 
--export([start/2, stop/2, 
+-export([start/3, stop/3, 
 	 add_password/4, update_password/5, 
 	 add_user/5, delete_user/5, get_user/5, list_users/4, 
 	 add_group_member/6, delete_group_member/6, list_group_members/5, 
 	 delete_group/5, list_groups/4]).
 
 %% gen_server exports
--export([start_link/2, init/1,
+-export([start_link/3, init/1,
 	 handle_call/3, handle_cast/2, handle_info/2,
 	 terminate/2, code_change/3]).
 
@@ -52,20 +52,20 @@
 %% 
 %% NOTE: This is called by httpd_misc_sup when the process is started
 %% 
-start_link(Addr, Port) ->
+start_link(Addr, Port, Profile) ->
     ?hdrt("start_link", [{address, Addr}, {port, Port}]),
-    Name = make_name(Addr, Port),
+    Name = make_name(Addr, Port, Profile),
     gen_server:start_link({local, Name}, ?MODULE, [], [{timeout, infinity}]).
 
 
 %% start/2
 
-start(Addr, Port) ->
+start(Addr, Port, Profile) ->
     ?hdrd("start", [{address, Addr}, {port, Port}]),
-    Name = make_name(Addr, Port),
+    Name = make_name(Addr, Port, Profile),
     case whereis(Name) of
 	undefined ->
-	    httpd_misc_sup:start_auth_server(Addr, Port);
+	    httpd_misc_sup:start_auth_server(Addr, Port, Profile);
 	_ -> %% Already started...
 	    ok
     end.
@@ -73,129 +73,141 @@ start(Addr, Port) ->
 
 %% stop/2
 
-stop(Addr, Port) ->
+stop(Addr, Port, Profile) ->
     ?hdrd("stop", [{address, Addr}, {port, Port}]),
-    Name = make_name(Addr, Port),
+    Name = make_name(Addr, Port, Profile),
     case whereis(Name) of
 	undefined -> %% Already stopped
 	    ok;
 	_ ->
-           (catch httpd_misc_sup:stop_auth_server(Addr, Port))
+           (catch httpd_misc_sup:stop_auth_server(Addr, Port, Profile))
     end.
 
 %% add_password/4
 
 add_password(Addr, Port, Dir, Password) ->
+    add_password(Addr, Port, ?DEFAULT_PROFILE, Dir, Password).
+add_password(Addr, Port, Profile, Dir, Password) ->
     ?hdrt("add password", [{address, Addr}, {port, Port}]),
-    Name = make_name(Addr, Port),
+    Name = make_name(Addr, Port, Profile),
     Req  = {add_password, Dir, Password},
     call(Name, Req).
 
 
 %% update_password/6
-
-update_password(Addr, Port, Dir, Old, New) when is_list(New) ->
+update_password(Addr, Port, Dir, Old, New) ->
+    update_password(Addr, Port, ?DEFAULT_PROFILE, Dir, Old, New).
+update_password(Addr, Port, Profile, Dir, Old, New) when is_list(New) ->
     ?hdrt("update password", 
 	  [{address, Addr}, {port, Port}, {dir, Dir}, {old, Old}, {new, New}]),
-    Name = make_name(Addr, Port),
+    Name = make_name(Addr, Port, Profile),
     Req  = {update_password, Dir, Old, New},
     call(Name, Req).
 	   
  
 %% add_user/5
-
 add_user(Addr, Port, Dir, User, Password) ->
+    add_user(Addr, Port, ?DEFAULT_PROFILE, Dir, User, Password).
+add_user(Addr, Port, Profile, Dir, User, Password) ->
     ?hdrt("add user", 
 	  [{address, Addr}, {port, Port}, 
 	   {dir, Dir}, {user, User}, {passwd, Password}]),
-    Name = make_name(Addr, Port),
-    Req  = {add_user, Addr, Port, Dir, User, Password},
+    Name = make_name(Addr, Port, Profile),
+    Req  = {add_user, Addr, Port, Profile, Dir, User, Password},
     call(Name, Req).
 
 
 %% delete_user/5
-
 delete_user(Addr, Port, Dir, UserName, Password) ->
+    delete_user(Addr, Port, ?DEFAULT_PROFILE, Dir, UserName, Password).
+delete_user(Addr, Port, Profile, Dir, UserName, Password) ->
     ?hdrt("delete user", 
 	  [{address, Addr}, {port, Port}, 
 	   {dir, Dir}, {user, UserName}, {passwd, Password}]),
-    Name = make_name(Addr, Port),
-    Req  = {delete_user, Addr, Port, Dir, UserName, Password},
+    Name = make_name(Addr, Port, Profile),
+    Req  = {delete_user, Addr, Port, Profile, Dir, UserName, Password},
     call(Name, Req).
 
 
 %% get_user/5
-
 get_user(Addr, Port, Dir, UserName, Password) ->
+    get_user(Addr, Port, ?DEFAULT_PROFILE, Dir, UserName, Password).
+get_user(Addr, Port, Profile,Dir, UserName, Password) ->
     ?hdrt("get user", 
 	  [{address, Addr}, {port, Port}, 
 	   {dir, Dir}, {user, UserName}, {passwd, Password}]),
-    Name = make_name(Addr, Port),
-    Req  = {get_user, Addr, Port, Dir, UserName, Password},
+    Name = make_name(Addr, Port, Profile),
+    Req  = {get_user, Addr, Port, Profile, Dir, UserName, Password},
     call(Name, Req).
 
 
 %% list_users/4
-
 list_users(Addr, Port, Dir, Password) ->
+    list_users(Addr, Port, ?DEFAULT_PROFILE, Dir, Password).
+list_users(Addr, Port, Profile, Dir, Password) ->
     ?hdrt("list users", 
 	  [{address, Addr}, {port, Port}, {dir, Dir}, {passwd, Password}]),
-    Name = make_name(Addr,Port),
-    Req  = {list_users, Addr, Port, Dir, Password},
+    Name = make_name(Addr,Port, Profile),
+    Req  = {list_users, Addr, Port, Profile, Dir, Password},
     call(Name, Req).
 
 
 %% add_group_member/6
-
 add_group_member(Addr, Port, Dir, GroupName, UserName, Password) ->
+    add_group_member(Addr, Port, ?DEFAULT_PROFILE, Dir, GroupName, UserName, Password).
+add_group_member(Addr, Port, Profile, Dir, GroupName, UserName, Password) ->
     ?hdrt("add group member", 
 	  [{address, Addr}, {port, Port}, {dir, Dir}, 
 	   {group, GroupName}, {user, UserName}, {passwd, Password}]),
-    Name = make_name(Addr,Port),
-    Req  = {add_group_member, Addr, Port, Dir, GroupName, UserName, Password},
+    Name = make_name(Addr,Port, Profile),
+    Req  = {add_group_member, Addr, Port, Profile, Dir, GroupName, UserName, Password},
     call(Name, Req).
 
 
 %% delete_group_member/6
-
 delete_group_member(Addr, Port, Dir, GroupName, UserName, Password) ->
+    delete_group_member(Addr, Port, ?DEFAULT_PROFILE, Dir, GroupName, UserName, Password).
+delete_group_member(Addr, Port, Profile, Dir, GroupName, UserName, Password) ->
     ?hdrt("delete group member", 
 	  [{address, Addr}, {port, Port}, {dir, Dir}, 
 	   {group, GroupName}, {user, UserName}, {passwd, Password}]),
-    Name = make_name(Addr,Port),
-    Req  = {delete_group_member, Addr, Port, Dir, GroupName, UserName, Password},
+    Name = make_name(Addr,Port,Profile),
+    Req  = {delete_group_member, Addr, Port, Profile, Dir, GroupName, UserName, Password},
     call(Name, Req).
 
 
 %% list_group_members/4
-
 list_group_members(Addr, Port, Dir, Group, Password) ->
+    list_group_members(Addr, Port, ?DEFAULT_PROFILE, Dir, Group, Password).
+list_group_members(Addr, Port, Profile, Dir, Group, Password) ->
     ?hdrt("list group members", 
 	  [{address, Addr}, {port, Port}, {dir, Dir}, 
 	   {group, Group}, {passwd, Password}]),
-    Name = make_name(Addr, Port),
+    Name = make_name(Addr, Port, Profile),
     Req  = {list_group_members, Addr, Port, Dir, Group, Password},
     call(Name, Req).
 
 
 %% delete_group/5
-
 delete_group(Addr, Port, Dir, GroupName, Password) ->
+    delete_group(Addr, Port, ?DEFAULT_PROFILE, Dir, GroupName, Password).
+delete_group(Addr, Port, Profile, Dir, GroupName, Password) ->
     ?hdrt("delete group", 
 	  [{address, Addr}, {port, Port}, {dir, Dir}, 
 	   {group, GroupName}, {passwd, Password}]),
-    Name = make_name(Addr, Port),
-    Req  = {delete_group, Addr, Port, Dir, GroupName, Password},
+    Name = make_name(Addr, Port, Profile),
+    Req  = {delete_group, Addr, Port, Profile, Dir, GroupName, Password},
     call(Name, Req).
 
 
 %% list_groups/4
-
 list_groups(Addr, Port, Dir, Password) ->
+    list_groups(Addr, Port, ?DEFAULT_PROFILE, Dir, Password).
+list_groups(Addr, Port, Profile, Dir, Password) ->
     ?hdrt("list groups", 
 	  [{address, Addr}, {port, Port}, {dir, Dir}, {passwd, Password}]),
-    Name = make_name(Addr, Port),
-    Req  = {list_groups, Addr, Port, Dir, Password},
+    Name = make_name(Addr, Port, Profile),
+    Req  = {list_groups, Addr, Port,Profile, Dir, Password},
     call(Name, Req).
 
 
@@ -214,54 +226,54 @@ init(_) ->
 %% handle_call
 
 %% Add a user
-handle_call({add_user, Addr, Port, Dir, User, AuthPwd}, _From, State) ->
-    Reply = api_call(Addr, Port, Dir, add_user, User, AuthPwd, State),
+handle_call({add_user, Addr, Port, Profile, Dir, User, AuthPwd}, _From, State) ->
+    Reply = api_call(Addr, Port, Profile, Dir, add_user, User, AuthPwd, State),
     ?hdrt("add user", [{reply, Reply}]),
     {reply, Reply, State};
 
 %% Get data about a user
-handle_call({get_user, Addr, Port, Dir, User, AuthPwd}, _From, State) ->
-    Reply = api_call(Addr, Port, Dir, get_user, [User], AuthPwd, State),
+handle_call({get_user, Addr, Port, Profile, Dir, User, AuthPwd}, _From, State) ->
+    Reply = api_call(Addr, Port, Profile, Dir, get_user, [User], AuthPwd, State),
     {reply, Reply, State};
 
 %% Add a group member
-handle_call({add_group_member, Addr, Port, Dir, Group, User, AuthPwd},
+handle_call({add_group_member, Addr, Port, Profile, Dir, Group, User, AuthPwd},
 	    _From, State) ->
-    Reply = api_call(Addr, Port, Dir, add_group_member, [Group, User], 
+    Reply = api_call(Addr, Port, Profile, Dir, add_group_member, [Group, User], 
 		     AuthPwd, State),
     {reply, Reply, State};
 
 %% delete a group
-handle_call({delete_group_member, Addr, Port, Dir, Group, User, AuthPwd},
+handle_call({delete_group_member, Addr, Port, Profile, Dir, Group, User, AuthPwd},
 	    _From, State) ->
-    Reply = api_call(Addr, Port, Dir, delete_group_member, [Group, User], 
+    Reply = api_call(Addr, Port, Profile, Dir, delete_group_member, [Group, User], 
 		     AuthPwd, State), 
     {reply, Reply, State};
 
 %% List all users thats standalone users
-handle_call({list_users, Addr, Port, Dir, AuthPwd}, _From, State) ->
-    Reply = api_call(Addr, Port, Dir, list_users, [], AuthPwd, State),
+handle_call({list_users, Addr, Port, Profile, Dir, AuthPwd}, _From, State) ->
+    Reply = api_call(Addr, Port, Profile, Dir, list_users, [], AuthPwd, State),
     {reply, Reply, State};
 
 %% Delete a user
-handle_call({delete_user, Addr, Port, Dir, User, AuthPwd}, _From, State) ->
-    Reply = api_call(Addr, Port, Dir, delete_user, [User], AuthPwd, State),
+handle_call({delete_user, Addr, Port, Profile, Dir, User, AuthPwd}, _From, State) ->
+    Reply = api_call(Addr, Port, Profile, Dir, delete_user, [User], AuthPwd, State),
     {reply, Reply, State};
 
 %% Delete a group
-handle_call({delete_group, Addr, Port, Dir, Group, AuthPwd}, _From, State) ->
-    Reply = api_call(Addr, Port, Dir, delete_group, [Group], AuthPwd, State),
+handle_call({delete_group, Addr, Port, Profile, Dir, Group, AuthPwd}, _From, State) ->
+    Reply = api_call(Addr, Port, Profile, Dir, delete_group, [Group], AuthPwd, State),
     {reply, Reply, State};
 
 %% List the current groups
-handle_call({list_groups, Addr, Port, Dir, AuthPwd}, _From, State) ->
-    Reply = api_call(Addr, Port, Dir, list_groups, [], AuthPwd, State),
+handle_call({list_groups, Addr, Port, Profile, Dir, AuthPwd}, _From, State) ->
+    Reply = api_call(Addr, Port, Profile, Dir, list_groups, [], AuthPwd, State),
     {reply, Reply, State};
 
 %% List the members of the given group
-handle_call({list_group_members, Addr, Port, Dir, Group, AuthPwd},
+handle_call({list_group_members, Addr, Port, Profile, Dir, Group, AuthPwd},
 	    _From, State) ->
-    Reply = api_call(Addr, Port, Dir, list_group_members, [Group],
+    Reply = api_call(Addr, Port, Profile, Dir, list_group_members, [Group],
 		     AuthPwd, State), 
     {reply, Reply, State};
 
@@ -322,10 +334,10 @@ code_change(_Vsn, State, _Extra) ->
 
 %% API gateway
 
-api_call(Addr, Port, Dir, Func, Args,Password,State) ->
+api_call(Addr, Port, Profile, Dir, Func, Args,Password,State) ->
     case controlPassword(Password, State, Dir) of
 	ok->
-	    ConfigName = httpd_util:make_name("httpd_conf", Addr, Port),
+	    ConfigName = httpd_util:make_name("httpd_conf", Addr, Port, Profile),
 	    case ets:match_object(ConfigName, {directory, {Dir, '$1'}}) of
 		[{directory, {Dir, DirData}}] ->
 		    AuthMod = auth_mod_name(DirData),
@@ -386,8 +398,8 @@ lookup(Db, Key) ->
     ets:lookup(Db, Key).
 
 
-make_name(Addr,Port) ->
-    httpd_util:make_name("httpd_auth",Addr,Port).
+make_name(Addr, Port, Profile) ->
+    httpd_util:make_name(?MODULE, Addr, Port, Profile).
 
 
 call(Name, Req) ->
diff --git a/lib/inets/src/http_server/mod_security.erl b/lib/inets/src/http_server/mod_security.erl
index 41988732ad..57de907267 100644
--- a/lib/inets/src/http_server/mod_security.erl
+++ b/lib/inets/src/http_server/mod_security.erl
@@ -32,14 +32,12 @@
 
 -include("httpd.hrl").
 -include("httpd_internal.hrl").
--include("inets_internal.hrl").
 
 -define(VMODULE,"SEC").
 
 
 %% do/1
 do(Info) ->
-    ?hdrt("do", [{info, Info}]),
     %% Check and see if any user has been authorized.
     case proplists:get_value(remote_user, Info#mod.data,not_defined_user) of
 	not_defined_user ->
@@ -84,151 +82,66 @@ do(Info) ->
 	    {_Dir, SDirData} = secretp(Path, Info#mod.config_db),
 	    Addr = httpd_util:lookup(Info#mod.config_db, bind_address),
 	    Port = httpd_util:lookup(Info#mod.config_db, port),
+	    Profile = httpd_util:lookup(Info#mod.config_db, profile, ?DEFAULT_PROFILE),
 	    case mod_security_server:check_blocked_user(Info, User, 
 							SDirData, 
-							Addr, Port) of
+							Addr, Port, Profile) of
 		true ->
 		    report_failed(Info, User ,"User Blocked"),
 		    {proceed, [{status, {403, Info#mod.request_uri, ""}} |
 			       Info#mod.data]};
 		false ->
 		    report_failed(Info, User,"Authentication Succedded"),
-		    mod_security_server:store_successful_auth(Addr, Port, 
+		    mod_security_server:store_successful_auth(Addr, Port, Profile, 
 							      User, 
 							      SDirData),
 		    {proceed, Info#mod.data}
 	    end
     end.
 
-report_failed(Info, Auth, Event) ->
-    Request = Info#mod.request_line,
-    {_PortNumber,RemoteHost}=(Info#mod.init_data)#init_data.peername,
-    String = RemoteHost ++ " : " ++ Event ++ " : " ++ Request ++ 
-	" : " ++ Auth,
-    mod_disk_log:security_log(Info,String),
-    mod_log:security_log(Info, String).
-
-take_failed_action(Info, Auth) ->
-    ?hdrd("take failed action", [{auth, Auth}]),
-    Path = mod_alias:path(Info#mod.data, Info#mod.config_db, 
-			  Info#mod.request_uri),
-    {_Dir, SDirData} = secretp(Path, Info#mod.config_db),
-    Addr = httpd_util:lookup(Info#mod.config_db, bind_address),
-    Port = httpd_util:lookup(Info#mod.config_db, port),
-    mod_security_server:store_failed_auth(Info, Addr, Port, 
-					  Auth, SDirData).
-
-secretp(Path, ConfigDB) ->
-    Directories = ets:match(ConfigDB,{directory,{'$1','_'}}),
-    case secret_path(Path, Directories) of
-	{yes, Directory} ->
-	    ?hdrd("secretp - yes", [{dir, Directory}]),
-	    SDirs0 = httpd_util:multi_lookup(ConfigDB, security_directory),
-	    [SDir] = lists:filter(fun({Directory0, _}) 
-				     when Directory0 == Directory ->
-					  true;
-				     (_) ->
-					  false
-				  end, SDirs0),
-	    SDir;
-	no ->
-	    {[], []}
-    end.
-
-secret_path(Path,Directories) ->
-    secret_path(Path, httpd_util:uniq(lists:sort(Directories)), to_be_found).
-
-secret_path(_Path, [], to_be_found) ->
-    no;
-secret_path(_Path, [], Dir) ->
-    {yes, Dir};
-secret_path(Path, [[NewDir]|Rest], Dir) ->
-    case inets_regexp:match(Path, NewDir) of
-	{match, _, _} when Dir =:= to_be_found ->
-	    secret_path(Path, Rest, NewDir);
-	{match, _, Length} when Length > length(Dir) ->
-	    secret_path(Path, Rest, NewDir);
-	{match, _, _} ->
-	    secret_path(Path, Rest, Dir);
-	nomatch ->
-	    secret_path(Path, Rest, Dir)
-    end.
-
-
 load("<Directory " ++ Directory, []) ->
-    ?hdrt("load security directory - begin", [{directory, Directory}]),
     Dir = httpd_conf:custom_clean(Directory,"",">"),
     {ok, [{security_directory, {Dir, [{path, Dir}]}}]};
 load(eof,[{security_directory, {Directory, _DirData}}|_]) ->
     {error, ?NICE("Premature end-of-file in "++Directory)};
 load("SecurityDataFile " ++ FileName, 
      [{security_directory, {Dir, DirData}}]) ->
-    ?hdrt("load security directory", 
-	  [{file, FileName}, {dir, Dir}, {dir_data, DirData}]),
     File = httpd_conf:clean(FileName),
     {ok, [{security_directory, {Dir, [{data_file, File}|DirData]}}]};
 load("SecurityCallbackModule " ++ ModuleName,
      [{security_directory, {Dir, DirData}}]) ->
-    ?hdrt("load security directory", 
-	  [{module, ModuleName}, {dir, Dir}, {dir_data, DirData}]),
     Mod = list_to_atom(httpd_conf:clean(ModuleName)),
     {ok, [{security_directory, {Dir, [{callback_module, Mod}|DirData]}}]};
 load("SecurityMaxRetries " ++ Retries,
      [{security_directory, {Dir, DirData}}]) ->
-    ?hdrt("load security directory", 
-	  [{max_retries, Retries}, {dir, Dir}, {dir_data, DirData}]),
     load_return_int_tag("SecurityMaxRetries", max_retries, 
 			httpd_conf:clean(Retries), Dir, DirData);
 load("SecurityBlockTime " ++ Time,
       [{security_directory, {Dir, DirData}}]) ->
-    ?hdrt("load security directory", 
-	  [{block_time, Time}, {dir, Dir}, {dir_data, DirData}]),
     load_return_int_tag("SecurityBlockTime", block_time,
 			httpd_conf:clean(Time), Dir, DirData);
 load("SecurityFailExpireTime " ++ Time,
      [{security_directory, {Dir, DirData}}]) ->
-    ?hdrt("load security directory", 
-	  [{expire_time, Time}, {dir, Dir}, {dir_data, DirData}]),
     load_return_int_tag("SecurityFailExpireTime", fail_expire_time,
 			httpd_conf:clean(Time), Dir, DirData);
 load("SecurityAuthTimeout " ++ Time0,
      [{security_directory, {Dir, DirData}}]) ->
-    ?hdrt("load security directory", 
-	  [{auth_timeout, Time0}, {dir, Dir}, {dir_data, DirData}]),
     Time = httpd_conf:clean(Time0),
     load_return_int_tag("SecurityAuthTimeout", auth_timeout,
 			httpd_conf:clean(Time), Dir, DirData);
 load("AuthName " ++ Name0,
      [{security_directory, {Dir, DirData}}]) ->
-    ?hdrt("load security directory", 
-	  [{name, Name0}, {dir, Dir}, {dir_data, DirData}]),
     Name = httpd_conf:clean(Name0),
     {ok, [{security_directory, {Dir, [{auth_name, Name}|DirData]}}]};
 load("</Directory>",[{security_directory, {Dir, DirData}}]) ->
-    ?hdrt("load security directory - end", 
-	  [{dir, Dir}, {dir_data, DirData}]),
     {ok, [], {security_directory, {Dir, DirData}}}.
 
-load_return_int_tag(Name, Atom, Time, Dir, DirData) ->
-    case Time of
-	"infinity" ->
-	    {ok, [{security_directory, {Dir, 
-		   [{Atom, 99999999999999999999999999999} | DirData]}}]};
-	_Int ->
-	    case catch list_to_integer(Time) of
-		{'EXIT', _} ->
-		    {error, Time++" is an invalid "++Name};
-		Val ->
-		    {ok, [{security_directory, {Dir, [{Atom, Val}|DirData]}}]}
-	    end
-    end.
-
 store({security_directory, {Dir, DirData}}, ConfigList) 
   when is_list(Dir) andalso is_list(DirData) ->
-    ?hdrt("store security directory", [{dir, Dir}, {dir_data, DirData}]),
     Addr = proplists:get_value(bind_address, ConfigList),
     Port = proplists:get_value(port, ConfigList),
-    mod_security_server:start(Addr, Port),
+    Profile = proplists:get_value(profile, ConfigList, ?DEFAULT_PROFILE),
+    mod_security_server:start(Addr, Port, Profile),
     SR = proplists:get_value(server_root, ConfigList),
     case proplists:get_value(data_file, DirData, no_data_file) of
 	no_data_file ->
@@ -241,7 +154,7 @@ store({security_directory, {Dir, DirData}}, ConfigList)
 		    _ ->
 			DataFile0
 		end,
-	    case mod_security_server:new_table(Addr, Port, DataFile) of
+	    case mod_security_server:new_table(Addr, Port, Profile, DataFile) of
 		{ok, TwoTables} ->
 		    NewDirData0 = lists:keyreplace(data_file, 1, DirData, 
 						   {data_file, TwoTables}),
@@ -261,15 +174,11 @@ store({directory, {Directory, DirData}}, _) ->
     {error, {wrong_type, {security_directory, {Directory, DirData}}}}.
 
 remove(ConfigDB) ->
-    Addr = case ets:lookup(ConfigDB, bind_address) of
-	       [] -> 
-		   undefined;
-	       [{bind_address, Address}] ->
-		   Address
-	   end,
-    [{port, Port}] = ets:lookup(ConfigDB, port),
-    mod_security_server:delete_tables(Addr, Port),
-    mod_security_server:stop(Addr, Port).
+    Addr = httpd_util:lookup(ConfigDB, bind_address, undefined),
+    Port = httpd_util:lookup(ConfigDB, port),
+    Profile = httpd_util:lookup(ConfigDB, profile, ?DEFAULT_PROFILE),
+    mod_security_server:delete_tables(Addr, Port, Profile),
+    mod_security_server:stop(Addr, Port, Profile).
     
 
 %%
@@ -284,10 +193,16 @@ list_blocked_users(Port) ->
 list_blocked_users(Port, Dir) when is_integer(Port) ->
     list_blocked_users(undefined,Port,Dir);
 list_blocked_users(Addr, Port) when is_integer(Port) ->
-    mod_security_server:list_blocked_users(Addr, Port).
+    lists:map(fun({User, Addr0, Port0, ?DEFAULT_PROFILE, Dir0, Time}) ->
+		      {User, Addr0, Port0, Dir0,Time}
+	      end,
+	      mod_security_server:list_blocked_users(Addr, Port)).
 
 list_blocked_users(Addr, Port, Dir) ->
-    mod_security_server:list_blocked_users(Addr, Port, Dir).
+    lists:map(fun({User, Addr0, Port0, ?DEFAULT_PROFILE, Dir0, Time}) ->
+		      {User, Addr0, Port0, Dir0,Time}
+	      end,
+	      mod_security_server:list_blocked_users(Addr, Port, Dir)).
 
 
 %% block_user
@@ -324,3 +239,79 @@ list_auth_users(Addr, Port) when is_integer(Port) ->
 
 list_auth_users(Addr, Port, Dir) ->
     mod_security_server:list_auth_users(Addr, Port, Dir).
+
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
+
+report_failed(Info, Auth, Event) ->
+    Request = Info#mod.request_line,
+    {_PortNumber,RemoteHost}=(Info#mod.init_data)#init_data.peername,
+    String = RemoteHost ++ " : " ++ Event ++ " : " ++ Request ++ 
+	" : " ++ Auth,
+    mod_disk_log:security_log(Info,String),
+    mod_log:security_log(Info, String).
+
+take_failed_action(Info, Auth) ->
+    Path = mod_alias:path(Info#mod.data, Info#mod.config_db, 
+			  Info#mod.request_uri),
+    {_Dir, SDirData} = secretp(Path, Info#mod.config_db),
+    Addr = httpd_util:lookup(Info#mod.config_db, bind_address),
+    Port = httpd_util:lookup(Info#mod.config_db, port),
+    Profile = httpd_util:lookup(Info#mod.config_db, profile, ?DEFAULT_PROFILE),
+    mod_security_server:store_failed_auth(Info, Addr, Port, Profile, 
+					  Auth, SDirData).
+
+secretp(Path, ConfigDB) ->
+    Directories = ets:match(ConfigDB,{directory,{'$1','_'}}),
+    case secret_path(Path, Directories) of
+	{yes, Directory} ->
+	    SDirs0 = httpd_util:multi_lookup(ConfigDB, security_directory),
+	    [SDir] = lists:filter(fun({Directory0, _}) 
+				     when Directory0 == Directory ->
+					  true;
+				     (_) ->
+					  false
+				  end, SDirs0),
+	    SDir;
+	no ->
+	    {[], []}
+    end.
+
+secret_path(Path,Directories) ->
+    secret_path(Path, httpd_util:uniq(lists:sort(Directories)), to_be_found).
+
+secret_path(_Path, [], to_be_found) ->
+    no;
+secret_path(_Path, [], Dir) ->
+    {yes, Dir};
+secret_path(Path, [[NewDir]|Rest], Dir) ->
+    case inets_regexp:match(Path, NewDir) of
+	{match, _, _} when Dir =:= to_be_found ->
+	    secret_path(Path, Rest, NewDir);
+	{match, _, Length} when Length > length(Dir) ->
+	    secret_path(Path, Rest, NewDir);
+	{match, _, _} ->
+	    secret_path(Path, Rest, Dir);
+	nomatch ->
+	    secret_path(Path, Rest, Dir)
+    end.
+
+
+
+load_return_int_tag(Name, Atom, Time, Dir, DirData) ->
+    case Time of
+	"infinity" ->
+	    {ok, [{security_directory, {Dir, 
+		   [{Atom, 99999999999999999999999999999} | DirData]}}]};
+	_Int ->
+	    case catch list_to_integer(Time) of
+		{'EXIT', _} ->
+		    {error, Time++" is an invalid "++Name};
+		Val ->
+		    {ok, [{security_directory, {Dir, [{Atom, Val}|DirData]}}]}
+	    end
+    end.
+
+
+
diff --git a/lib/inets/src/http_server/mod_security_server.erl b/lib/inets/src/http_server/mod_security_server.erl
index 784b3eba70..97c8f2b8f3 100644
--- a/lib/inets/src/http_server/mod_security_server.erl
+++ b/lib/inets/src/http_server/mod_security_server.erl
@@ -57,13 +57,13 @@
 	 list_auth_users/2, list_auth_users/3]).
 
 %% Internal exports (for mod_security only)
--export([start/2, stop/1, stop/2,
-	 new_table/3, delete_tables/2, 
-	 store_failed_auth/5, store_successful_auth/4, 
-	 check_blocked_user/5]).
+-export([start/3, stop/2, stop/3,
+	 new_table/4, delete_tables/3, 
+	 store_failed_auth/6, store_successful_auth/5, 
+	 check_blocked_user/6]).
 
 %% gen_server exports
--export([start_link/2, init/1, 
+-export([start_link/3, init/1, 
 	 handle_info/2, handle_call/3, handle_cast/2, 
 	 terminate/2,
 	 code_change/3]).
@@ -80,21 +80,21 @@
 %% NOTE: This is called by httpd_misc_sup when the process is started
 %% 
 
-start_link(Addr, Port) ->
+start_link(Addr, Port, Profile) ->
     ?hdrt("start_link", [{address, Addr}, {port, Port}]),
-    Name = make_name(Addr, Port),
+    Name = make_name(Addr, Port, Profile),
     gen_server:start_link({local, Name}, ?MODULE, [], [{timeout, infinity}]).
 
 
 %% start/2
 %% Called  by the mod_security module.
 
-start(Addr, Port) ->
+start(Addr, Port, Profile) ->
     ?hdrt("start", [{address, Addr}, {port, Port}]),
-    Name = make_name(Addr, Port),
+    Name = make_name(Addr, Port, Profile),
     case whereis(Name) of
 	undefined ->
-	   httpd_misc_sup:start_sec_server(Addr, Port);
+	   httpd_misc_sup:start_sec_server(Addr, Port, Profile);
 	_ -> %% Already started...
 	    ok
     end.
@@ -102,16 +102,16 @@ start(Addr, Port) ->
 
 %% stop
 
-stop(Port) ->
-    stop(undefined, Port).
-stop(Addr, Port) ->
+stop(Port, Profile) ->
+    stop(undefined, Port, Profile).
+stop(Addr, Port, Profile) ->
     ?hdrt("stop", [{address, Addr}, {port, Port}]),
-    Name = make_name(Addr, Port),
+    Name = make_name(Addr, Port, Profile),
     case whereis(Name) of
 	undefined ->
 	    ok;
 	_ ->
-	    httpd_misc_sup:stop_sec_server(Addr, Port)
+	    httpd_misc_sup:stop_sec_server(Addr, Port, Profile)
     end.
 
 
@@ -124,62 +124,70 @@ addr(Addr) ->
 %% list_blocked_users
 
 list_blocked_users(Addr, Port) ->
-    Name = make_name(Addr, Port),
-    Req  = {list_blocked_users, addr(Addr), Port, '_'},
-    call(Name, Req).
-
+    list_blocked_users(Addr, Port, ?DEFAULT_PROFILE).
+list_blocked_users(Addr, Port, Profile) when is_atom(Profile)->
+    Name = make_name(Addr, Port, Profile),
+    Req  = {list_blocked_users, addr(Addr), Port, Profile,'_'},
+    call(Name, Req);
 list_blocked_users(Addr, Port, Dir) ->
-    Name = make_name(Addr, Port),
-    Req  = {list_blocked_users, addr(Addr), Port, Dir},
+    list_blocked_users(Addr, Port, ?DEFAULT_PROFILE, Dir).
+list_blocked_users(Addr, Port, Profile, Dir) ->
+    Name = make_name(Addr, Port, Profile),
+    Req  = {list_blocked_users, addr(Addr), Port, Profile, Dir},
     call(Name, Req).
 
 
 %% block_user
-
 block_user(User, Addr, Port, Dir, Time) ->
-    Name = make_name(Addr, Port),
-    Req  = {block_user, User, addr(Addr), Port, Dir, Time},
+    block_user(User, Addr, Port, ?DEFAULT_PROFILE, Dir, Time).
+block_user(User, Addr, Port, Profile, Dir, Time) ->
+    Name = make_name(Addr, Port, Profile),
+    Req  = {block_user, User, addr(Addr), Port, Profile, Dir, Time},
     call(Name, Req).
 
 
 %% unblock_user
 
 unblock_user(User, Addr, Port) ->
-    Name = make_name(Addr, Port),
-    Req  = {unblock_user, User, addr(Addr), Port, '_'},
-    call(Name, Req).
-
+    unblock_user(User, Addr, Port, ?DEFAULT_PROFILE).
+unblock_user(User, Addr, Port, Profile) when is_atom(Profile)->
+    Name = make_name(Addr, Port, Profile),
+    Req  = {unblock_user, User, addr(Addr), Port, Profile, '_'},
+    call(Name, Req);
 unblock_user(User, Addr, Port, Dir) ->
-    Name = make_name(Addr, Port),
-    Req  = {unblock_user, User, addr(Addr), Port, Dir},
+    unblock_user(User, Addr, Port, ?DEFAULT_PROFILE, Dir).
+unblock_user(User, Addr, Port, Profile, Dir) ->
+    Name = make_name(Addr, Port, Profile),
+    Req  = {unblock_user, User, addr(Addr), Port, Profile, Dir},
     call(Name, Req).
 
 
 %% list_auth_users
-
 list_auth_users(Addr, Port) ->
-    Name = make_name(Addr, Port),
-    Req  = {list_auth_users, addr(Addr), Port, '_'},
-    call(Name, Req).
-
+    list_auth_users(Addr, Port, ?DEFAULT_PROFILE).
+list_auth_users(Addr, Port, Profile) when is_atom(Profile) ->
+    Name = make_name(Addr, Port, Profile),
+    Req  = {list_auth_users, addr(Addr), Port, Profile, '_'},
+    call(Name, Req);
 list_auth_users(Addr, Port, Dir) ->
-    Name = make_name(Addr,Port),
-    Req  = {list_auth_users, addr(Addr), Port, Dir}, 
+    list_auth_users(Addr, Port, ?DEFAULT_PROFILE, Dir).
+list_auth_users(Addr, Port, Profile, Dir) ->
+    Name = make_name(Addr,Port, Profile),
+    Req  = {list_auth_users, addr(Addr), Port, Profile, Dir}, 
     call(Name, Req).
     
-
 %% new_table
 
-new_table(Addr, Port, TabName) ->
-    Name = make_name(Addr,Port),
-    Req  = {new_table, addr(Addr), Port, TabName}, 
+new_table(Addr, Port, Profile, TabName) ->
+    Name = make_name(Addr,Port, Profile),
+    Req  = {new_table, addr(Addr), Port, Profile, TabName}, 
     call(Name, Req).
 
 
 %% delete_tables
     
-delete_tables(Addr, Port) ->
-    Name = make_name(Addr, Port),
+delete_tables(Addr, Port, Profile) ->
+    Name = make_name(Addr, Port, Profile),
     case whereis(Name) of
 	undefined ->
 	    ok;
@@ -190,28 +198,28 @@ delete_tables(Addr, Port) ->
 
 %% store_failed_auth
 
-store_failed_auth(Info, Addr, Port, DecodedString, SDirData) ->
+store_failed_auth(Info, Addr, Port, Profile, DecodedString, SDirData) ->
     ?hdrv("store failed auth", 
 	  [{addr, Addr}, {port, Port}, 
 	   {decoded_string, DecodedString}, {sdir_data, SDirData}]),
-    Name = make_name(Addr,Port),
-    Msg  = {store_failed_auth,[Info,DecodedString,SDirData]},
+    Name = make_name(Addr, Port, Profile),
+    Msg  = {store_failed_auth, Profile, [Info,DecodedString,SDirData]},
     cast(Name, Msg).
 
 
 %% store_successful_auth
 
-store_successful_auth(Addr, Port, User, SDirData) ->
-    Name = make_name(Addr,Port),
-    Msg  = {store_successful_auth, [User,Addr,Port,SDirData]}, 
+store_successful_auth(Addr, Port, Profile, User, SDirData) ->
+    Name = make_name(Addr,Port, Profile),
+    Msg  = {store_successful_auth, [User,Addr,Port, Profile, SDirData]}, 
     cast(Name, Msg).
     
 
 %% check_blocked_user
 
-check_blocked_user(Info, User, SDirData, Addr, Port) ->
-    Name = make_name(Addr, Port),
-    Req  = {check_blocked_user, [Info, User, SDirData]}, 
+check_blocked_user(Info, User, SDirData, Addr, Port, Profile) ->
+    Name = make_name(Addr, Port, Profile),
+    Req  = {check_blocked_user, Profile, [Info, User, SDirData]}, 
     call(Name, Req).
 
 
@@ -229,37 +237,37 @@ init(_) ->
 handle_call(stop, _From, _Tables) ->
     {stop, normal, ok, []};
 
-handle_call({block_user, User, Addr, Port, Dir, Time}, _From, Tables) ->
+handle_call({block_user, User, Addr, Port, Profile, Dir, Time}, _From, Tables) ->
     ?hdrv("block user", 
 	  [{user, User}, {addr, Addr}, {port, Port}, {dir, Dir}, 
 	   {time, Time}]), 
-    Ret = block_user_int(User, Addr, Port, Dir, Time),
+    Ret = block_user_int(User, Addr, Port, Profile, Dir, Time),
     {reply, Ret, Tables};
 
-handle_call({list_blocked_users, Addr, Port, Dir}, _From, Tables) ->
+handle_call({list_blocked_users, Addr, Port, Profile, Dir}, _From, Tables) ->
     ?hdrv("list blocked users", 
 	  [{addr, Addr}, {port, Port}, {dir, Dir}]),
-    Blocked = list_blocked(Tables, Addr, Port, Dir, []),
+    Blocked = list_blocked(Tables, Addr, Port, Profile, Dir, []),
     {reply, Blocked, Tables};
 
-handle_call({unblock_user, User, Addr, Port, Dir}, _From, Tables) ->
+handle_call({unblock_user, User, Addr, Port, Profile, Dir}, _From, Tables) ->
     ?hdrv("block user", 
 	  [{user, User}, {addr, Addr}, {port, Port}, {dir, Dir}]), 
-    Ret = unblock_user_int(User, Addr, Port, Dir),
+    Ret = unblock_user_int(User, Addr, Port, Profile,Dir),
     {reply, Ret, Tables};
 
-handle_call({list_auth_users, Addr, Port, Dir}, _From, Tables) ->
+handle_call({list_auth_users, Addr, Port, Profile, Dir}, _From, Tables) ->
     ?hdrv("list auth users", 
 	  [{addr, Addr}, {port, Port}, {dir, Dir}]), 
-    Auth = list_auth(Tables, Addr, Port, Dir, []),
+    Auth = list_auth(Tables, Addr, Port, Profile, Dir, []),
     {reply, Auth, Tables};
 
-handle_call({new_table, Addr, Port, Name}, _From, Tables) ->
+handle_call({new_table, Addr, Port, Profile, Name}, _From, Tables) ->
     case lists:keysearch(Name, 1, Tables) of
 	{value, {Name, {Ets, Dets}}} ->
 	    {reply, {ok, {Ets, Dets}}, Tables};
 	false ->
-	    TName = make_name(Addr,Port,length(Tables)),
+	    TName = make_name(Addr,Port, Profile, length(Tables)),
 	    case dets:open_file(TName, [{type, bag}, {file, Name}, 
 					{repair, true}, 
 					{access, read_write}]) of
@@ -280,7 +288,7 @@ handle_call(delete_tables, _From, Tables) ->
 		  end, Tables),
     {reply, ok, []};
 
-handle_call({check_blocked_user, [Info, User, SDirData]}, _From, Tables) ->
+handle_call({check_blocked_user, Profile, [Info, User, SDirData]}, _From, Tables) ->
     {ETS, DETS} = proplists:get_value(data_file, SDirData),
     Dir = proplists:get_value(path, SDirData),
     Addr = proplists:get_value(bind_address, SDirData),
@@ -288,7 +296,7 @@ handle_call({check_blocked_user, [Info, User, SDirData]}, _From, Tables) ->
     CBModule = 
 	proplists:get_value(callback_module, SDirData, no_module_at_all),
     Ret = 
-	check_blocked_user(Info, User, Dir, Addr, Port, ETS, DETS, CBModule),
+	check_blocked_user(Info, User, Dir, Addr, Port, Profile, ETS, DETS, CBModule),
     {reply, Ret, Tables};
 
 handle_call(_Request,_From,Tables) ->
@@ -297,18 +305,18 @@ handle_call(_Request,_From,Tables) ->
 
 %% handle_cast
 
-handle_cast({store_failed_auth, [_, _, []]}, Tables) ->
+handle_cast({store_failed_auth, _,[_, _, []]}, Tables) ->
     %% Some other authentication scheme than mod_auth (example mod_htacess)
     %% was the source for the authentication failure so we should ignor it!
     {noreply, Tables};
-handle_cast({store_failed_auth, [Info, DecodedString, SDirData]}, Tables) ->
+handle_cast({store_failed_auth, Profile, [Info, DecodedString, SDirData]}, Tables) ->
     {ETS, DETS} = proplists:get_value(data_file, SDirData),
     Dir  = proplists:get_value(path, SDirData),
     Addr = proplists:get_value(bind_address, SDirData),
     Port = proplists:get_value(port, SDirData),
     {ok, [User,Password]} = httpd_util:split(DecodedString,":",2),
     Seconds = universal_time(),
-    Key = {User, Dir, Addr, Port},
+    Key = {User, Dir, Addr, Port, Profile},
     %% Event
     CBModule = proplists:get_value(callback_module, 
 				     SDirData, no_module_at_all),
@@ -363,7 +371,7 @@ handle_cast({store_failed_auth, [Info, DecodedString, SDirData]}, Tables) ->
 	    dets:match_delete(DETS, {blocked_user,
 				     {User, Addr, Port, Dir, '$1'}}),
 	    BlockRecord = {blocked_user, 
-			   {User, Addr, Port, Dir, Future}},
+			   {User, Addr, Port, Profile, Dir, Future}},
 	    ets:insert(ETS, BlockRecord),
 	    dets:insert(DETS, BlockRecord),
 	    %% Remove previous failed requests.
@@ -374,11 +382,11 @@ handle_cast({store_failed_auth, [Info, DecodedString, SDirData]}, Tables) ->
     end,
     {noreply, Tables};
 
-handle_cast({store_successful_auth, [User, Addr, Port, SDirData]}, Tables) ->
+handle_cast({store_successful_auth, [User, Addr, Port, Profile, SDirData]}, Tables) ->
     {ETS, DETS} = proplists:get_value(data_file, SDirData),
     AuthTimeOut = proplists:get_value(auth_timeout, SDirData, 30),
     Dir = proplists:get_value(path, SDirData),
-    Key = {User, Dir, Addr, Port},
+    Key = {User, Dir, Addr, Port, Profile},
 
     %% Remove failed entries for this Key
     dets:match_delete(DETS, {failed, {Key, '_', '_'}}),
@@ -421,8 +429,8 @@ code_change(_, State, _Extra) ->
     {ok, State}.
 
 %% block_user_int/5
-block_user_int(User, Addr, Port, Dir, Time) ->
-    Dirs = httpd_manager:config_match(Addr, Port, 
+block_user_int(User, Addr, Port, Profile, Dir, Time) ->
+    Dirs = httpd_manager:config_match(Addr, Port, Profile, 
 				      {security_directory, {'_', '_'}}),
     case find_dirdata(Dirs, Dir) of
 	{ok, DirData, {ETS, DETS}} ->
@@ -434,11 +442,11 @@ block_user_int(User, Addr, Port, Dir, Time) ->
 			Time
 		end,
 	    Future = universal_time()+Time1,
-	    ets:match_delete(ETS, {blocked_user, {User,Addr,Port,Dir,'_'}}),
+	    ets:match_delete(ETS, {blocked_user, {User,Addr,Port,Profile, Dir,'_'}}),
 	    dets:match_delete(DETS, {blocked_user, 
-				     {User,Addr,Port,Dir,'_'}}),
-	    ets:insert(ETS, {blocked_user, {User,Addr,Port,Dir,Future}}),
-	    dets:insert(DETS, {blocked_user, {User,Addr,Port,Dir,Future}}),
+				     {User,Addr,Port,Profile, Dir,'_'}}),
+	    ets:insert(ETS, {blocked_user, {User,Addr,Port, Profile, Dir,Future}}),
+	    dets:insert(DETS, {blocked_user, {User,Addr,Port,Profile, Dir,Future}}),
 	    CBModule = proplists:get_value(callback_module, DirData, 
 					     no_module_at_all),
 	    user_block_event(CBModule,Addr,Port,Dir,User),
@@ -461,20 +469,20 @@ find_dirdata([{security_directory, {_, DirData}}|SDirs], Dir) ->
     end.
 
 %% unblock_user_int/4
-unblock_user_int(User, Addr, Port, Dir) ->
-    Dirs = httpd_manager:config_match(Addr, Port, 
+unblock_user_int(User, Addr, Port, Profile, Dir) ->
+    Dirs = httpd_manager:config_match(Addr, Port, Profile, 
 				      {security_directory, {'_', '_'}}),
     case find_dirdata(Dirs, Dir) of
 	{ok, DirData, {ETS, DETS}} ->
 	    case ets:match_object(ETS,
-				  {blocked_user,{User,Addr,Port,Dir,'_'}}) of
+				  {blocked_user,{User,Addr,Port,Profile,Dir,'_'}}) of
 		[] ->
 		    {error, not_blocked};
 		_Objects ->
 		    ets:match_delete(ETS, {blocked_user,
-					   {User, Addr, Port, Dir, '_'}}),
+					   {User, Addr, Port, Profile, Dir, '_'}}),
 		    dets:match_delete(DETS, {blocked_user,
-					     {User, Addr, Port, Dir, '_'}}),
+					     {User, Addr, Port, Profile, Dir, '_'}}),
 	       	    CBModule = proplists:get_value(callback_module, 
 						     DirData, 
 						     no_module_at_all),
@@ -489,54 +497,54 @@ unblock_user_int(User, Addr, Port, Dir) ->
 
 %% list_auth/2
 
-list_auth([], _Addr, _Port, _Dir, Acc) ->
+list_auth([], _, _, _, _, Acc) ->
     Acc;
-list_auth([{_Name, {ETS, DETS}}|Tables], Addr, Port, Dir, Acc) ->
-    case ets:match_object(ETS, {success, {{'_', Dir, Addr, Port}, '_'}}) of
+list_auth([{_Name, {ETS, DETS}}|Tables], Addr, Port, Profile, Dir, Acc) ->
+    case ets:match_object(ETS, {success, {{'_', Dir, Addr, Port, Profile}, '_'}}) of
 	[] ->
-	    list_auth(Tables, Addr, Port, Dir, Acc);
+	    list_auth(Tables, Addr, Port, Profile, Dir, Acc);
 	List ->
 	    TN = universal_time(),
-	    NewAcc = lists:foldr(fun({success,{{U,Ad,P,D},T}},Ac) -> 
+	    NewAcc = lists:foldr(fun({success,{{U,Ad,P, Pr,D},T}},Ac) -> 
 					 if
 					     T-TN > 0 ->
 						 [U|Ac];
 					     true ->
 						 Rec = {success,
-							{{U,Ad,P,D},T}},
+							{{U,Ad,P,Pr,D},T}},
 						 ets:match_delete(ETS,Rec),
 						 dets:match_delete(DETS,Rec),
 						 Ac
 					 end
 				 end,
 				 Acc, List),
-	    list_auth(Tables, Addr, Port, Dir, NewAcc)
+	    list_auth(Tables, Addr, Port, Profile, Dir, NewAcc)
     end.
 
 
 %% list_blocked/2
 
-list_blocked([], _Addr, _Port, _Dir, Acc) ->
+list_blocked([], _, _, _, _, Acc) ->
     ?hdrv("list blocked", [{acc, Acc}]), 
     TN = universal_time(),
-    lists:foldl(fun({U,Ad,P,D,T}, Ac) ->
+    lists:foldl(fun({U,Ad,P,Pr,D,T}, Ac) ->
 			if
 			    T-TN > 0 ->
-				[{U,Ad,P,D,local_time(T)}|Ac];
+				[{U,Ad,P, Pr,D,local_time(T)}|Ac];
 			    true ->
 				Ac
 			end
 		end, 
 		[], Acc);
-list_blocked([{_Name, {ETS, _DETS}}|Tables], Addr, Port, Dir, Acc) ->
+list_blocked([{_Name, {ETS, _DETS}}|Tables], Addr, Port, Profile, Dir, Acc) ->
     ?hdrv("list blocked", [{ets, ETS}, {tab2list, ets:tab2list(ETS)}]), 
     List = ets:match_object(ETS, {blocked_user, 
-				  {'_',Addr,Port,Dir,'_'}}),
+				  {'_',Addr,Port,Profile, Dir,'_'}}),
     
     NewBlocked = lists:foldl(fun({blocked_user, X}, A) -> 
 				     [X|A] end, Acc, List),
     
-    list_blocked(Tables, Addr, Port, Dir, NewBlocked).
+    list_blocked(Tables, Addr, Port, Profile, Dir, NewBlocked).
 
 
 %%
@@ -559,58 +567,57 @@ sync_dets_to_ets(DETS, ETS) ->
 %% whos blocking time has expired. This to keep the tables as small
 %% as possible.
 %%
-check_blocked_user(Info, User, Dir, Addr, Port, ETS, DETS, CBModule) ->
+check_blocked_user(Info, User, Dir, Addr, Port, Profile, ETS, DETS, CBModule) ->
     TN = universal_time(),
-    BlockList = ets:match_object(ETS, {blocked_user, {User, '_', '_', '_', '_'}}), 
+    BlockList = ets:match_object(ETS, {blocked_user, {User, '_', '_', '_', '_', '_'}}), 
     Blocked = lists:foldl(fun({blocked_user, X}, A) ->
 				  [X|A] end, [], BlockList),
     check_blocked_user(Info,User,Dir,
-		       Addr,Port,ETS,DETS,TN,Blocked,CBModule).
+		       Addr,Port, Profile, ETS,DETS,TN,Blocked,CBModule).
 
-check_blocked_user(_Info, _User, _Dir, _Addr, _Port, _ETS, _DETS, _TN,
-		   [], _CBModule) ->
+check_blocked_user(_Info, _, _, _, _, _, _, _, _,[], _CBModule) ->
     false;
-check_blocked_user(Info, User, Dir, Addr, Port, ETS, DETS, TN, 
-		   [{User,Addr,Port,Dir,T}| _], CBModule) ->
+check_blocked_user(Info, User, Dir, Addr, Port, Profile, ETS, DETS, TN, 
+		   [{User,Addr,Port,Profile, Dir,T}| _], CBModule) ->
     TD = T-TN,
     if
 	TD =< 0 ->
 	    %% Blocking has expired, remove and grant access.
-	    unblock_user(Info, User, Dir, Addr, Port, ETS, DETS, CBModule),
+	    unblock_user(Info, User, Dir, Addr, Port, Profile, ETS, DETS, CBModule),
 	    false;
 	true ->
 	    true
     end;
-check_blocked_user(Info, User, Dir, Addr, Port, ETS, DETS, TN, 
-		   [{OUser,ODir,OAddr,OPort,T}|Ls], CBModule) ->
+check_blocked_user(Info, User, Dir, Addr, Port, Profile, ETS, DETS, TN, 
+		   [{OUser,ODir,OAddr,OPort, OProfile, T}|Ls], CBModule) ->
     TD = T-TN,
     if
 	TD =< 0 ->
 	    %% Blocking has expired, remove.
-	    unblock_user(Info, OUser, ODir, OAddr, OPort, 
+	    unblock_user(Info, OUser, ODir, OAddr, OPort, OProfile,
 			 ETS, DETS, CBModule);
 	true ->
 	    true
     end,
-    check_blocked_user(Info, User, Dir, Addr, Port, ETS, DETS, 
+    check_blocked_user(Info, User, Dir, Addr, Port, Profile, ETS, DETS, 
 		       TN, Ls, CBModule).
 
-unblock_user(Info, User, Dir, Addr, Port, ETS, DETS, CBModule) ->
+unblock_user(Info, User, Dir, Addr, Port, Profile, ETS, DETS, CBModule) ->
     Reason =
 	io_lib:format("User ~s was removed from the block list for dir ~s",
 			 [User, Dir]),
     mod_log:security_log(Info, lists:flatten(Reason)),
     user_unblock_event(CBModule,Addr,Port,Dir,User),
-    dets:match_delete(DETS, {blocked_user, {User, Addr, Port, Dir, '_'}}),
-    ets:match_delete(ETS, {blocked_user, {User, Addr, Port, Dir, '_'}}).
+    dets:match_delete(DETS, {blocked_user, {User, Addr, Port, Profile, Dir, '_'}}),
+    ets:match_delete(ETS, {blocked_user, {User, Addr, Port, Profile, Dir, '_'}}).
   
 
-make_name(Addr,Port) ->
-    httpd_util:make_name("httpd_security",Addr,Port).
+make_name(Addr,Port, Profile) ->
+    httpd_util:make_name(?MODULE,Addr,Port, Profile).
 
-make_name(Addr,Port,Num) ->
-    httpd_util:make_name("httpd_security",Addr,Port,
-			 "__" ++ integer_to_list(Num)).
+make_name(Addr,Port, Profile, Num) ->
+    httpd_util:make_name(?MODULE,Addr,Port,
+			 atom_to_list(Profile) ++ "__" ++ integer_to_list(Num)).
 
 
 auth_fail_event(Mod,Addr,Port,Dir,User,Passwd) ->
diff --git a/lib/inets/test/httpd_block.erl b/lib/inets/test/httpd_block.erl
index 9790623b6f..a95a5ee62d 100644
--- a/lib/inets/test/httpd_block.erl
+++ b/lib/inets/test/httpd_block.erl
@@ -292,7 +292,7 @@ httpd_restart(Addr, Port) ->
     end.
     
 make_name(Addr, Port) ->
-    httpd_util:make_name("httpd", Addr, Port).
+    httpd_util:make_name("httpd", Addr, Port, default).
 
 get_admin_state(_, _Host, Port) ->
     Name = make_name(undefined, Port),
diff --git a/lib/inets/test/inets_sup_SUITE.erl b/lib/inets/test/inets_sup_SUITE.erl
index 60979278fc..1479681e30 100644
--- a/lib/inets/test/inets_sup_SUITE.erl
+++ b/lib/inets/test/inets_sup_SUITE.erl
@@ -22,14 +22,14 @@
 
 -include_lib("common_test/include/ct.hrl").
 
-
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [default_tree, ftpc_worker, tftpd_worker, httpd_subtree,
+    [default_tree, ftpc_worker, tftpd_worker, 
+     httpd_subtree, httpd_subtree_profile,
      httpc_subtree].
 
 groups() -> 
@@ -41,54 +41,29 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
-
-%%--------------------------------------------------------------------
-%% Function: init_per_suite(Config) -> Config
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Initiation before the whole suite
-%%
-%% Note: This function is free to add any key/value pairs to the Config
-%% variable, but should NOT alter/remove any existing entries.
-%%--------------------------------------------------------------------
 init_per_suite(Config) ->
     Config.
 
-%%--------------------------------------------------------------------
-%% Function: end_per_suite(Config) -> _
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Cleanup after the whole suite
-%%--------------------------------------------------------------------
 end_per_suite(_) ->
     inets:stop(),
     ok.
 
-%%--------------------------------------------------------------------
-%% Function: init_per_testcase(Case, Config) -> Config
-%% Case - atom()
-%%   Name of the test case that is about to be run.
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%%
-%% Description: Initiation before each test case
-%%
-%% Note: This function is free to add any key/value pairs to the Config
-%% variable, but should NOT alter/remove any existing entries.
-%%--------------------------------------------------------------------
 init_per_testcase(httpd_subtree, Config) ->
     Dog = test_server:timetrap(?t:minutes(1)),
     NewConfig = lists:keydelete(watchdog, 1, Config),
     PrivDir = ?config(priv_dir, Config), 			   
-   
+    Dir = filename:join(PrivDir, "root"),
+    ok = file:make_dir(Dir),
+
     SimpleConfig  = [{port, 0},
 		     {server_name,"www.test"},
 		     {modules, [mod_get]},
-		     {server_root, PrivDir},
-		     {document_root, PrivDir},
+		     {server_root, Dir},
+		     {document_root, Dir},
 		     {bind_address, any},
 		     {ipfamily, inet}],
     try
+	inets:stop(),
 	inets:start(),
 	inets:start(httpd, SimpleConfig),
 	[{watchdog, Dog} | NewConfig]
@@ -97,7 +72,33 @@ init_per_testcase(httpd_subtree, Config) ->
 	    inets:stop(),
 	    exit({failed_starting_inets, Reason})
     end;
-    
+
+init_per_testcase(httpd_subtree_profile, Config) ->
+    Dog = test_server:timetrap(?t:minutes(1)),
+    NewConfig = lists:keydelete(watchdog, 1, Config),
+    PrivDir = ?config(priv_dir, Config), 			   
+    Dir = filename:join(PrivDir, "root"),
+    ok = file:make_dir(Dir),
+
+    SimpleConfig  = [{port, 0},
+		     {server_name,"www.test"},
+		     {modules, [mod_get]},
+		     {server_root, Dir},
+		     {document_root, Dir},
+		     {bind_address, any},
+		     {profile, test_profile},
+		     {ipfamily, inet}],
+    try
+	inets:stop(),
+	inets:start(),
+	{ok, _} = inets:start(httpd, SimpleConfig),
+	[{watchdog, Dog} | NewConfig]
+    catch
+	_:Reason ->
+	    inets:stop(),
+	    exit({failed_starting_inets, Reason})
+    end;
+     
 
 init_per_testcase(_Case, Config) ->
     Dog = test_server:timetrap(?t:minutes(5)),
@@ -106,20 +107,13 @@ init_per_testcase(_Case, Config) ->
     ok = inets:start(),
     [{watchdog, Dog} | NewConfig].
 
-
-%%--------------------------------------------------------------------
-%% Function: end_per_testcase(Case, Config) -> _
-%% Case - atom()
-%%   Name of the test case that is about to be run.
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Cleanup after each test case
-%%--------------------------------------------------------------------
-end_per_testcase(httpd_subtree, Config) ->
+end_per_testcase(Case, Config) when Case == httpd_subtree;
+				    Case == httpd_subtree_profile ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
-    PrivDir = ?config(priv_dir, Config), 			   
-    inets_test_lib:del_dirs(PrivDir),
+    PrivDir = ?config(priv_dir, Config), 	
+    Dir = filename:join(PrivDir, "root"),
+    inets_test_lib:del_dirs(Dir),
     ok;
 
 end_per_testcase(_, Config) ->
@@ -131,16 +125,9 @@ end_per_testcase(_, Config) ->
 %%-------------------------------------------------------------------------
 %% Test cases starts here.
 %%-------------------------------------------------------------------------
-
-
-%%-------------------------------------------------------------------------
-%% default_tree
-%%-------------------------------------------------------------------------
-default_tree(doc) ->
-    ["Makes sure the correct processes are started and linked," 
-     "in the default case."];
-default_tree(suite) ->
-    [];
+default_tree() ->
+    [{doc, "Makes sure the correct processes are started and linked," 
+      "in the default case."}].
 default_tree(Config) when is_list(Config) ->
     TopSupChildren = supervisor:which_children(inets_sup),
     4 = length(TopSupChildren),
@@ -173,15 +160,9 @@ default_tree(Config) when is_list(Config) ->
 
     ok.
 
-
-%%-------------------------------------------------------------------------
-%% ftpc_worker
-%%-------------------------------------------------------------------------
-ftpc_worker(doc) ->
-    ["Makes sure the ftp worker processes are added and removed "
-     "appropriatly to/from the supervison tree."]; 
-ftpc_worker(suite) ->
-    [];
+ftpc_worker() ->
+    [{doc, "Makes sure the ftp worker processes are added and removed "
+      "appropriatly to/from the supervison tree."}].
 ftpc_worker(Config) when is_list(Config) ->
     [] = supervisor:which_children(ftp_sup),
     try
@@ -207,14 +188,8 @@ ftpc_worker(Config) when is_list(Config) ->
 	    {skip, "No available FTP servers"}
     end.
 
-
-%%-------------------------------------------------------------------------
-%% tftpd_worker
-%%-------------------------------------------------------------------------
-tftpd_worker(doc) ->
-    ["Makes sure the tftp sub tree is correct."]; 
-tftpd_worker(suite) ->
-    [];
+tftpd_worker() ->
+    [{doc, "Makes sure the tftp sub tree is correct."}].
 tftpd_worker(Config) when is_list(Config) ->
     [] = supervisor:which_children(tftp_sup),   
     {ok, Pid0} = inets:start(tftpd, [{host, inets_test_lib:hostname()}, 
@@ -228,22 +203,63 @@ tftpd_worker(Config) when is_list(Config) ->
     [] = supervisor:which_children(tftp_sup),
     ok.
 
+httpd_subtree() ->
+    [{doc, "Makes sure the httpd sub tree is correct."}].
+httpd_subtree(Config) when is_list(Config) ->
+    do_httpd_subtree(Config, default).
+
+httpd_subtree_profile(doc) ->
+    ["Makes sure the httpd sub tree is correct when using a profile"]; 
+httpd_subtree_profile(Config) when is_list(Config) ->
+    do_httpd_subtree(Config, test_profile).
+
+httpc_subtree() ->
+    [{doc, "Makes sure the httpd sub tree is correct."}]. 
+httpc_subtree(Config) when is_list(Config) ->
+    {ok, Foo} = inets:start(httpc, [{profile, foo}]),
+
+    {ok, Bar} = inets:start(httpc, [{profile, bar}], stand_alone),
+
+    HttpcChildren = supervisor:which_children(httpc_profile_sup),
+
+    {value, {httpc_manager, _, worker, [httpc_manager]}} =
+	lists:keysearch(httpc_manager, 1, HttpcChildren),
+
+    {value,{{httpc,foo}, _Pid, worker, [httpc_manager]}} = 
+	lists:keysearch({httpc, foo}, 1, HttpcChildren),
+    false = lists:keysearch({httpc, bar}, 1, HttpcChildren),
+    
+    inets:stop(httpc, Foo),
+    exit(Bar, normal).
 
 %%-------------------------------------------------------------------------
-%% httpd_subtree
+%% Internal functions
 %%-------------------------------------------------------------------------
-httpd_subtree(doc) ->
-    ["Makes sure the httpd sub tree is correct."]; 
-httpd_subtree(suite) ->
-    [];
-httpd_subtree(Config) when is_list(Config) ->
-    %% Check that we have the httpd top supervisor
+
+verify_child(Parent, Child, Type) ->
+    Children = supervisor:which_children(Parent),
+    verify_child(Children, Parent, Child, Type).
+
+verify_child([], Parent, Child, _Type) ->
+    {error, {child_not_found, Child, Parent}};
+verify_child([{Id, _Pid, Type2, Mods}|Children], Parent, Child, Type) ->
+    case lists:member(Child, Mods) of
+	true when (Type2 =:= Type) ->
+	    {ok, Id};
+	true when (Type2 =/= Type) ->
+	    {error, {wrong_type, Type2, Child, Parent}};
+	false ->
+	    verify_child(Children, Parent, Child, Type)
+    end.
+
+do_httpd_subtree(_Config, Profile) ->
+   %% Check that we have the httpd top supervisor
     {ok, _} = verify_child(inets_sup, httpd_sup, supervisor),
 
     %% Check that we have the httpd instance supervisor
     {ok, Id} = verify_child(httpd_sup, httpd_instance_sup, supervisor),
-    {httpd_instance_sup, Addr, Port} = Id,
-    Instance = httpd_util:make_name("httpd_instance_sup", Addr, Port),
+    {httpd_instance_sup, Addr, Port, Profile} = Id,
+    Instance = httpd_util:make_name("httpd_instance_sup", Addr, Port, Profile),
     
     %% Check that we have the expected httpd instance children
     {ok, _} = verify_child(Instance, httpd_connection_sup, supervisor),
@@ -252,7 +268,7 @@ httpd_subtree(Config) when is_list(Config) ->
     {ok, _} = verify_child(Instance, httpd_manager, worker),
 
     %% Check that the httpd instance acc supervisor has children
-    InstanceAcc = httpd_util:make_name("httpd_acceptor_sup", Addr, Port),
+    InstanceAcc = httpd_util:make_name("httpd_acceptor_sup", Addr, Port, Profile),
     case supervisor:which_children(InstanceAcc) of
 	[_ | _] -> 
 	    ok;
@@ -263,7 +279,7 @@ httpd_subtree(Config) when is_list(Config) ->
     
     %% Check that the httpd instance misc supervisor has no children
     io:format("httpd_subtree -> verify misc~n", []),
-    InstanceMisc = httpd_util:make_name("httpd_misc_sup", Addr, Port),
+    InstanceMisc = httpd_util:make_name("httpd_misc_sup", Addr, Port, Profile),
     case supervisor:which_children(InstanceMisc) of
 	[] ->
 	    ok;
@@ -273,45 +289,3 @@ httpd_subtree(Config) when is_list(Config) ->
     end,
     io:format("httpd_subtree -> done~n", []),
     ok.
-
-
-verify_child(Parent, Child, Type) ->
-    Children = supervisor:which_children(Parent),
-    verify_child(Children, Parent, Child, Type).
-
-verify_child([], Parent, Child, _Type) ->
-    {error, {child_not_found, Child, Parent}};
-verify_child([{Id, _Pid, Type2, Mods}|Children], Parent, Child, Type) ->
-    case lists:member(Child, Mods) of
-	true when (Type2 =:= Type) ->
-	    {ok, Id};
-	true when (Type2 =/= Type) ->
-	    {error, {wrong_type, Type2, Child, Parent}};
-	false ->
-	    verify_child(Children, Parent, Child, Type)
-    end.
-
-%%-------------------------------------------------------------------------
-%% httpc_subtree
-%%-------------------------------------------------------------------------
-httpc_subtree(doc) ->
-    ["Makes sure the httpc sub tree is correct."]; 
-httpc_subtree(suite) ->
-    [];
-httpc_subtree(Config) when is_list(Config) ->
-    {ok, Foo} = inets:start(httpc, [{profile, foo}]),
-
-    {ok, Bar} = inets:start(httpc, [{profile, bar}], stand_alone),
-
-    HttpcChildren = supervisor:which_children(httpc_profile_sup),
-
-    {value, {httpc_manager, _, worker, [httpc_manager]}} =
-	lists:keysearch(httpc_manager, 1, HttpcChildren),
-
-    {value,{{httpc,foo}, _Pid, worker, [httpc_manager]}} = 
-	lists:keysearch({httpc, foo}, 1, HttpcChildren),
-    false = lists:keysearch({httpc, bar}, 1, HttpcChildren),
-    
-    inets:stop(httpc, Foo),
-    exit(Bar, normal).
-
-- 
cgit v1.2.3


From 855c9bb101ed6fc5a3965d1ff0e18c04a346e9cd Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Fri, 22 May 2015 14:18:46 +0200
Subject: inets: Modernize code

* Remove debug macros that mimics call trace.
* Remove comments that does not add value.
* Structure code
---
 lib/inets/src/http_server/httpd_sup.erl           |  14 -
 lib/inets/src/http_server/mod_auth.erl            | 496 +++++++++++-----------
 lib/inets/src/http_server/mod_auth_dets.erl       |  41 +-
 lib/inets/src/http_server/mod_auth_plain.erl      | 192 ++++-----
 lib/inets/src/http_server/mod_auth_server.erl     | 106 +----
 lib/inets/src/http_server/mod_security.erl        |  23 +-
 lib/inets/src/http_server/mod_security_server.erl | 124 +-----
 7 files changed, 352 insertions(+), 644 deletions(-)

(limited to 'lib/inets')

diff --git a/lib/inets/src/http_server/httpd_sup.erl b/lib/inets/src/http_server/httpd_sup.erl
index 20b9b6b315..b45742136a 100644
--- a/lib/inets/src/http_server/httpd_sup.erl
+++ b/lib/inets/src/http_server/httpd_sup.erl
@@ -37,7 +37,6 @@
 
 -define(TIMEOUT, 15000).
 -include("httpd_internal.hrl").
--include("inets_internal.hrl").
 
 %%%=========================================================================
 %%%  API
@@ -90,7 +89,6 @@ id(Address, Port, Profile) ->
 %%%  Supervisor callback
 %%%=========================================================================
 init([HttpdServices]) ->
-    ?hdrd("starting", [{httpd_service, HttpdServices}]),
     RestartStrategy = one_for_one,
     MaxR = 10,
     MaxT = 3600,
@@ -118,23 +116,18 @@ init([HttpdServices]) ->
 child_specs([], Acc) ->
     Acc;
 child_specs([{httpd, HttpdService} | Rest], Acc) ->
-    ?hdrd("child specs", [{httpd, HttpdService}]),
     NewHttpdService = (catch mk_tuple_list(HttpdService)),
-    ?hdrd("child specs", [{new_httpd, NewHttpdService}]),
     case catch child_spec(NewHttpdService) of
 	{error, Reason} ->
-	    ?hdri("failed generating child spec", [{reason, Reason}]),
 	    error_msg("Failed to start service: ~n~p ~n due to: ~p~n",
 		      [HttpdService, Reason]),
 	    child_specs(Rest, Acc);
 	Spec ->
-	    ?hdrt("child spec", [{child_spec, Spec}]),
 	    child_specs(Rest, [Spec | Acc])
     end.
 
 child_spec(HttpdService) ->
     {ok, Config}  = httpd_config(HttpdService),
-    ?hdrt("child spec", [{config, Config}]),
     Debug         = proplists:get_value(debug, Config, []),
     AcceptTimeout = proplists:get_value(accept_timeout, Config, 15000),
     httpd_util:valid_options(Debug, AcceptTimeout, Config),
@@ -162,8 +155,6 @@ httpd_config([Value| _] = Config) when is_tuple(Value) ->
 
 httpd_child_spec([Value| _] = Config, AcceptTimeout, Debug)  
   when is_tuple(Value)  ->
-    ?hdrt("httpd_child_spec - entry", [{accept_timeout, AcceptTimeout}, 
-				       {debug,          Debug}]),
     Address = proplists:get_value(bind_address, Config, any),
     Port    = proplists:get_value(port, Config, 80),
     Profile =  proplists:get_value(profile, Config, ?DEFAULT_PROFILE),
@@ -171,15 +162,10 @@ httpd_child_spec([Value| _] = Config, AcceptTimeout, Debug)
 
 %% In this case the AcceptTimeout and Debug will only have default values...
 httpd_child_spec(ConfigFile, AcceptTimeoutDef, DebugDef) ->
-    ?hdrt("httpd_child_spec - entry", [{config_file,        ConfigFile}, 
-				       {accept_timeout_def, AcceptTimeoutDef}, 
-				       {debug_def,          DebugDef}]),
     case httpd_conf:load(ConfigFile) of
 	{ok, ConfigList} ->
-	    ?hdrt("httpd_child_spec - loaded", [{config_list, ConfigList}]),
 	    case (catch httpd_conf:validate_properties(ConfigList)) of
 		{ok, Config} ->
-		    ?hdrt("httpd_child_spec - validated", [{config, Config}]),
 		    Address = proplists:get_value(bind_address, Config, any), 
 		    Port    = proplists:get_value(port, Config, 80),
 		    Profile = proplists:get_value(profile, Config, ?DEFAULT_PROFILE),
diff --git a/lib/inets/src/http_server/mod_auth.erl b/lib/inets/src/http_server/mod_auth.erl
index eeacd451f0..1f4470622d 100644
--- a/lib/inets/src/http_server/mod_auth.erl
+++ b/lib/inets/src/http_server/mod_auth.erl
@@ -43,7 +43,10 @@
 
 -define(NOPASSWORD,"NoPassword").
 
-%% do
+%%====================================================================
+%% Internal application API
+%%====================================================================	     
+
 do(Info) ->
     case proplists:get_value(status,Info#mod.data) of
 	%% A status code has been generated!
@@ -59,7 +62,6 @@ do(Info) ->
 		    %% Is it a secret area?
 		    case secretp(Path,Info#mod.config_db) of
 			{yes, {Directory, DirectoryData}} ->
-			   %% Authenticate (allow)
 			    case allow((Info#mod.init_data)#init_data.peername,
 				       Info#mod.socket_type,Info#mod.socket,
 				       DirectoryData) of
@@ -103,241 +105,6 @@ do(Info) ->
 	    end
     end.
 
-do_auth(Info, Directory, DirectoryData, _AuthType) ->
-    %% Authenticate (require)
-    case require(Info, Directory, DirectoryData) of
-	authorized ->
-	    {proceed,Info#mod.data};
-	{authorized, User} ->
-	    {proceed, [{remote_user,User}|Info#mod.data]};
-	{authorization_required, Realm} ->
-	    ReasonPhrase = httpd_util:reason_phrase(401),
-	    Message = httpd_util:message(401,none,Info#mod.config_db),
-	    {proceed,
-	     [{response,
-	       {401,
-		["WWW-Authenticate: Basic realm=\"",Realm,
-		 "\"\r\n\r\n","<HTML>\n<HEAD>\n<TITLE>",
-		 ReasonPhrase,"</TITLE>\n",
-		 "</HEAD>\n<BODY>\n<H1>",ReasonPhrase,
-		 "</H1>\n",Message,"\n</BODY>\n</HTML>\n"]}}|
-	      Info#mod.data]};
-	{status, {StatusCode,PhraseArgs,Reason}} ->
-	    {proceed, [{status,{StatusCode,PhraseArgs,Reason}}|
-		       Info#mod.data]}
-    end.
-
-%% require
-
-require(Info, Directory, DirectoryData) ->
-    ParsedHeader = Info#mod.parsed_header,
-    ValidUsers   = proplists:get_value(require_user, DirectoryData),
-    ValidGroups  = proplists:get_value(require_group, DirectoryData),
-    %% Any user or group restrictions?
-    case ValidGroups of
-	undefined when ValidUsers =:= undefined ->
-	    authorized;
-	_ ->
-	    case proplists:get_value("authorization", ParsedHeader) of
-		undefined ->
-		    authorization_required(DirectoryData);
-		%% Check credentials!
-		"Basic" ++ EncodedString = Credentials ->
-		    case (catch base64:decode_to_string(EncodedString)) of
-			{'EXIT',{function_clause, _}} ->
-			    {status, {401, none, ?NICE("Bad credentials "++
-						       Credentials)}};
-			DecodedString ->
-			   validate_user(Info, Directory, DirectoryData,
-					 ValidUsers, ValidGroups, 
-					 DecodedString)
-		    end;
-		%% Bad credentials!
-		BadCredentials ->
-		    {status, {401, none, ?NICE("Bad credentials "++
-					       BadCredentials)}}
-	    end
-    end.
-
-authorization_required(DirectoryData) ->
-    case proplists:get_value(auth_name, DirectoryData) of
-	undefined ->
-	    {status,{500, none,?NICE("AuthName directive not specified")}};
-	Realm ->
-	    {authorization_required, Realm}
-    end.
-
-
-validate_user(Info, Directory, DirectoryData, ValidUsers, 
-	      ValidGroups, DecodedString) ->
-    case a_valid_user(Info, DecodedString, 
-		      ValidUsers, ValidGroups, 
-		      Directory, DirectoryData) of
-	{yes, User} ->
-	    {authorized, User};
-	{no, _Reason} ->
-	    authorization_required(DirectoryData);
-	{status, {StatusCode,PhraseArgs,Reason}} ->
-	    {status,{StatusCode,PhraseArgs,Reason}}
-    end.
-
-a_valid_user(Info,DecodedString,ValidUsers,ValidGroups,Dir,DirData) ->
-    case httpd_util:split(DecodedString,":",2) of
-	{ok, [SupposedUser, Password]} ->
-	    case user_accepted(SupposedUser, ValidUsers) of
-		true ->
-		    check_password(SupposedUser, Password, Dir, DirData);
-		false ->
-		    case group_accepted(Info,SupposedUser,
-					ValidGroups,Dir,DirData) of
-			true ->
-			    check_password(SupposedUser,Password,Dir,DirData);
-			false ->
-			    {no,?NICE("No such user exists")}
-		    end
-	    end;
-	{ok, BadCredentials} ->
-	    {status,{401,none,?NICE("Bad credentials "++BadCredentials)}}
-    end.
-
-user_accepted(_SupposedUser, undefined) ->
-    false;
-user_accepted(SupposedUser, ValidUsers) ->
-    lists:member(SupposedUser, ValidUsers).
-
-
-group_accepted(_Info, _User, undefined, _Dir, _DirData) ->
-    false;
-group_accepted(_Info, _User, [], _Dir, _DirData) ->
-    false;
-group_accepted(Info, User, [Group|Rest], Dir, DirData) ->
-    Ret = int_list_group_members(Group, Dir, DirData),
-    case Ret of
-	{ok, UserList} ->
-	    case lists:member(User, UserList) of
-		true ->
-		    true;
-		false ->
-		    group_accepted(Info, User, Rest, Dir, DirData)
-	    end;
-	_ ->
-	    false
-    end.
-
-check_password(User, Password, _Dir, DirData) ->
-    case int_get_user(DirData, User) of
-	{ok, UStruct} ->
-	    case UStruct#httpd_user.password of
-		Password ->
-		    %% FIXME
-		    {yes, UStruct#httpd_user.username};
-		_ ->
-		    {no, "No such user"}   % Don't say 'Bad Password' !!!
-	    end;
-	_Other ->
-	    {no, "No such user"}
-    end.
-
-
-%% Middle API. Theese functions call the appropriate authentication module.
-int_get_user(DirData, User) ->    
-    AuthMod = auth_mod_name(DirData), 
-    apply(AuthMod, get_user, [DirData, User]).
-
-int_list_group_members(Group, _Dir, DirData) ->
-    AuthMod = auth_mod_name(DirData),
-    apply(AuthMod, list_group_members, [DirData, Group]).
-
-auth_mod_name(DirData) ->
-    case proplists:get_value(auth_type, DirData, plain) of
-	plain ->  mod_auth_plain;
-	mnesia -> mod_auth_mnesia;
-	dets ->	  mod_auth_dets
-    end.
-
-    
-%%
-%% Is it a secret area?
-%%
-
-%% secretp
-
-secretp(Path,ConfigDB) ->
-    Directories = ets:match(ConfigDB,{directory, {'$1','_'}}),
-    case secret_path(Path, Directories) of
-	{yes,Directory} ->
-	    {yes, {Directory,
-		   lists:flatten(
-		     ets:match(ConfigDB,{directory, {Directory,'$1'}}))}};
-	no ->
-	    no
-    end.
-
-secret_path(Path, Directories) ->
-    secret_path(Path, httpd_util:uniq(lists:sort(Directories)),to_be_found).
-
-secret_path(_Path, [], to_be_found) ->
-    no;
-secret_path(_Path, [], Directory) ->
-    {yes, Directory};
-secret_path(Path, [[NewDirectory] | Rest], Directory) ->
-    case inets_regexp:match(Path, NewDirectory) of
-	{match, _, _} when Directory =:= to_be_found ->
-	    secret_path(Path, Rest, NewDirectory);
-	{match, _, Length} when Length > length(Directory)->
-	    secret_path(Path, Rest,NewDirectory);
-	{match, _, _Length} ->
-	    secret_path(Path, Rest, Directory);
-	nomatch ->
-	    secret_path(Path, Rest, Directory)
-    end.
-
-%%
-%% Authenticate
-%%
-
-%% allow
-
-allow({_,RemoteAddr}, _SocketType, _Socket, DirectoryData) ->
-    Hosts = proplists:get_value(allow_from, DirectoryData, all),
-    case validate_addr(RemoteAddr, Hosts) of
-	true ->
-	    allowed;
-	false ->
-	    {not_allowed, ?NICE("Connection from your host is not allowed")}
-    end.
-
-validate_addr(_RemoteAddr, all) ->            % When called from 'allow'
-    true;
-validate_addr(_RemoteAddr, none) ->           % When called from 'deny'
-    false;
-validate_addr(_RemoteAddr, []) ->
-    false;
-validate_addr(RemoteAddr, [HostRegExp | Rest]) ->
-    case inets_regexp:match(RemoteAddr, HostRegExp) of
-	{match,_,_} ->
-	    true;
-	nomatch ->
-	    validate_addr(RemoteAddr,Rest)
-    end.
-
-%% deny
-
-deny({_,RemoteAddr}, _SocketType, _Socket,DirectoryData) ->
-    Hosts = proplists:get_value(deny_from, DirectoryData, none),
-    case validate_addr(RemoteAddr,Hosts) of
-	true ->
-	    {denied, ?NICE("Connection from your host is not allowed")};
-	false ->
-	    not_denied
-    end.    
-
-%%
-%% Configuration
-%%
-
-%% load/2
-%%
 
 %% mod_auth recognizes the following Configuration Directives:
 %% <Directory /path/to/directory>
@@ -380,7 +147,6 @@ load("AuthGroupFile " ++ AuthGroupFile0,
     {ok,[{directory, {Directory,
 	  [{auth_group_file, AuthGroupFile}|DirData]}} | Rest]};
 
-%AuthAccessPassword
 load("AuthAccessPassword " ++ AuthAccessPassword0,
 	 [{directory, {Directory, DirData}}|Rest]) ->
     AuthAccessPassword = httpd_conf:clean(AuthAccessPassword0),
@@ -451,24 +217,6 @@ load("AuthMnesiaDB " ++ AuthMnesiaDB,
 			  " is an invalid AuthMnesiaDB")}
     end.
 
-directory_config_check(Directory, DirData) ->
-    case proplists:get_value(auth_type, DirData) of
-	plain ->
-	    check_filename_present(Directory,auth_user_file,DirData),
-	    check_filename_present(Directory,auth_group_file,DirData);
-	_ ->
-	    ok
-    end.
-check_filename_present(Dir,AuthFile,DirData) ->
-    case proplists:get_value(AuthFile,DirData) of
-	Name when is_list(Name) ->
-	    ok;
-	_ ->
-	    throw({missing_auth_file, AuthFile, {directory, {Dir, DirData}}})
-    end.
-
-%% store
-
 store({directory, {Directory, DirData}}, ConfigList) 
   when is_list(Directory) andalso is_list(DirData) ->
     try directory_config_check(Directory, DirData) of
@@ -493,7 +241,7 @@ remove(ConfigDB) ->
     Profile = httpd_util:lookup(ConfigDB, profile, ?DEFAULT_PROFILE),
     mod_auth_server:stop(Addr, Port, Profile),
     ok.
-%% --------------------------------------------------------------------
+
 add_user(UserName, Opt) ->
     case get_options(Opt, mandatory) of
 	{Addr, Port, Dir, AuthPwd}->
@@ -530,7 +278,6 @@ get_user(UserName, Port, Dir) ->
 get_user(UserName, Addr, Port, Dir) ->
     mod_auth_server:get_user(Addr, Port, Dir, UserName, ?NOPASSWORD).
 
-
 add_group_member(GroupName, UserName, Opt)->
     case get_options(Opt, mandatory) of
 	{Addr, Port, Dir, AuthPwd}->
@@ -561,6 +308,7 @@ delete_group_member(GroupName, UserName, Port, Dir) ->
 delete_group_member(GroupName, UserName, Addr, Port, Dir) ->
     mod_auth_server:delete_group_member(Addr, Port, Dir, 
 					GroupName, UserName, ?NOPASSWORD).
+
 list_users(Opt) ->
     case get_options(Opt, mandatory) of
 	{Addr, Port, Dir, AuthPwd} ->
@@ -586,7 +334,7 @@ delete_user(UserName, Port, Dir) ->
     delete_user(UserName, undefined, Port, Dir).
 delete_user(UserName, Addr, Port, Dir) ->
     mod_auth_server:delete_user(Addr, Port, Dir, UserName, ?NOPASSWORD).
-	  
+
 delete_group(GroupName, Opt) ->
     case get_options(Opt, mandatory) of
 	{Addr, Port, Dir, AuthPwd} ->
@@ -642,6 +390,236 @@ update_password(_Addr, _Port, _Dir, _Old, _New, _New1) ->
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
+
+do_auth(Info, Directory, DirectoryData, _AuthType) ->
+    %% Authenticate (require)
+    case require(Info, Directory, DirectoryData) of
+	authorized ->
+	    {proceed,Info#mod.data};
+	{authorized, User} ->
+	    {proceed, [{remote_user,User}|Info#mod.data]};
+	{authorization_required, Realm} ->
+	    ReasonPhrase = httpd_util:reason_phrase(401),
+	    Message = httpd_util:message(401,none,Info#mod.config_db),
+	    {proceed,
+	     [{response,
+	       {401,
+		["WWW-Authenticate: Basic realm=\"",Realm,
+		 "\"\r\n\r\n","<HTML>\n<HEAD>\n<TITLE>",
+		 ReasonPhrase,"</TITLE>\n",
+		 "</HEAD>\n<BODY>\n<H1>",ReasonPhrase,
+		 "</H1>\n",Message,"\n</BODY>\n</HTML>\n"]}}|
+	      Info#mod.data]};
+	{status, {StatusCode,PhraseArgs,Reason}} ->
+	    {proceed, [{status,{StatusCode,PhraseArgs,Reason}}|
+		       Info#mod.data]}
+    end.
+
+require(Info, Directory, DirectoryData) ->
+    ParsedHeader = Info#mod.parsed_header,
+    ValidUsers   = proplists:get_value(require_user, DirectoryData),
+    ValidGroups  = proplists:get_value(require_group, DirectoryData),
+    %% Any user or group restrictions?
+    case ValidGroups of
+	undefined when ValidUsers =:= undefined ->
+	    authorized;
+	_ ->
+	    case proplists:get_value("authorization", ParsedHeader) of
+		undefined ->
+		    authorization_required(DirectoryData);
+		%% Check credentials!
+		"Basic" ++ EncodedString = Credentials ->
+		    case (catch base64:decode_to_string(EncodedString)) of
+			{'EXIT',{function_clause, _}} ->
+			    {status, {401, none, ?NICE("Bad credentials "++
+						       Credentials)}};
+			DecodedString ->
+			   validate_user(Info, Directory, DirectoryData,
+					 ValidUsers, ValidGroups, 
+					 DecodedString)
+		    end;
+		%% Bad credentials!
+		BadCredentials ->
+		    {status, {401, none, ?NICE("Bad credentials "++
+					       BadCredentials)}}
+	    end
+    end.
+
+authorization_required(DirectoryData) ->
+    case proplists:get_value(auth_name, DirectoryData) of
+	undefined ->
+	    {status,{500, none,?NICE("AuthName directive not specified")}};
+	Realm ->
+	    {authorization_required, Realm}
+    end.
+
+
+validate_user(Info, Directory, DirectoryData, ValidUsers, 
+	      ValidGroups, DecodedString) ->
+    case a_valid_user(Info, DecodedString, 
+		      ValidUsers, ValidGroups, 
+		      Directory, DirectoryData) of
+	{yes, User} ->
+	    {authorized, User};
+	{no, _Reason} ->
+	    authorization_required(DirectoryData);
+	{status, {StatusCode,PhraseArgs,Reason}} ->
+	    {status,{StatusCode,PhraseArgs,Reason}}
+    end.
+
+a_valid_user(Info,DecodedString,ValidUsers,ValidGroups,Dir,DirData) ->
+    case httpd_util:split(DecodedString,":",2) of
+	{ok, [SupposedUser, Password]} ->
+	    case user_accepted(SupposedUser, ValidUsers) of
+		true ->
+		    check_password(SupposedUser, Password, Dir, DirData);
+		false ->
+		    case group_accepted(Info,SupposedUser,
+					ValidGroups,Dir,DirData) of
+			true ->
+			    check_password(SupposedUser,Password,Dir,DirData);
+			false ->
+			    {no,?NICE("No such user exists")}
+		    end
+	    end;
+	{ok, BadCredentials} ->
+	    {status,{401,none,?NICE("Bad credentials "++BadCredentials)}}
+    end.
+
+user_accepted(_SupposedUser, undefined) ->
+    false;
+user_accepted(SupposedUser, ValidUsers) ->
+    lists:member(SupposedUser, ValidUsers).
+
+
+group_accepted(_Info, _User, undefined, _Dir, _DirData) ->
+    false;
+group_accepted(_Info, _User, [], _Dir, _DirData) ->
+    false;
+group_accepted(Info, User, [Group|Rest], Dir, DirData) ->
+    Ret = int_list_group_members(Group, Dir, DirData),
+    case Ret of
+	{ok, UserList} ->
+	    case lists:member(User, UserList) of
+		true ->
+		    true;
+		false ->
+		    group_accepted(Info, User, Rest, Dir, DirData)
+	    end;
+	_ ->
+	    false
+    end.
+
+check_password(User, Password, _Dir, DirData) ->
+    case int_get_user(DirData, User) of
+	{ok, UStruct} ->
+	    case UStruct#httpd_user.password of
+		Password ->
+		    %% FIXME
+		    {yes, UStruct#httpd_user.username};
+		_ ->
+		    {no, "No such user"}   % Don't say 'Bad Password' !!!
+	    end;
+	_Other ->
+	    {no, "No such user"}
+    end.
+
+
+%% Middle API. Theese functions call the appropriate authentication module.
+int_get_user(DirData, User) ->    
+    AuthMod = auth_mod_name(DirData), 
+    apply(AuthMod, get_user, [DirData, User]).
+
+int_list_group_members(Group, _Dir, DirData) ->
+    AuthMod = auth_mod_name(DirData),
+    apply(AuthMod, list_group_members, [DirData, Group]).
+
+auth_mod_name(DirData) ->
+    case proplists:get_value(auth_type, DirData, plain) of
+	plain ->  mod_auth_plain;
+	mnesia -> mod_auth_mnesia;
+	dets ->	  mod_auth_dets
+    end.
+
+secretp(Path,ConfigDB) ->
+    Directories = ets:match(ConfigDB,{directory, {'$1','_'}}),
+    case secret_path(Path, Directories) of
+	{yes,Directory} ->
+	    {yes, {Directory,
+		   lists:flatten(
+		     ets:match(ConfigDB,{directory, {Directory,'$1'}}))}};
+	no ->
+	    no
+    end.
+
+secret_path(Path, Directories) ->
+    secret_path(Path, httpd_util:uniq(lists:sort(Directories)),to_be_found).
+
+secret_path(_Path, [], to_be_found) ->
+    no;
+secret_path(_Path, [], Directory) ->
+    {yes, Directory};
+secret_path(Path, [[NewDirectory] | Rest], Directory) ->
+    case inets_regexp:match(Path, NewDirectory) of
+	{match, _, _} when Directory =:= to_be_found ->
+	    secret_path(Path, Rest, NewDirectory);
+	{match, _, Length} when Length > length(Directory)->
+	    secret_path(Path, Rest,NewDirectory);
+	{match, _, _Length} ->
+	    secret_path(Path, Rest, Directory);
+	nomatch ->
+	    secret_path(Path, Rest, Directory)
+    end.
+
+allow({_,RemoteAddr}, _SocketType, _Socket, DirectoryData) ->
+    Hosts = proplists:get_value(allow_from, DirectoryData, all),
+    case validate_addr(RemoteAddr, Hosts) of
+	true ->
+	    allowed;
+	false ->
+	    {not_allowed, ?NICE("Connection from your host is not allowed")}
+    end.
+
+validate_addr(_RemoteAddr, all) ->            % When called from 'allow'
+    true;
+validate_addr(_RemoteAddr, none) ->           % When called from 'deny'
+    false;
+validate_addr(_RemoteAddr, []) ->
+    false;
+validate_addr(RemoteAddr, [HostRegExp | Rest]) ->
+    case inets_regexp:match(RemoteAddr, HostRegExp) of
+	{match,_,_} ->
+	    true;
+	nomatch ->
+	    validate_addr(RemoteAddr,Rest)
+    end.
+
+deny({_,RemoteAddr}, _SocketType, _Socket,DirectoryData) ->
+    Hosts = proplists:get_value(deny_from, DirectoryData, none),
+    case validate_addr(RemoteAddr,Hosts) of
+	true ->
+	    {denied, ?NICE("Connection from your host is not allowed")};
+	false ->
+	    not_denied
+    end.    
+
+
+directory_config_check(Directory, DirData) ->
+    case proplists:get_value(auth_type, DirData) of
+	plain ->
+	    check_filename_present(Directory,auth_user_file,DirData),
+	    check_filename_present(Directory,auth_group_file,DirData);
+	_ ->
+	    ok
+    end.
+check_filename_present(Dir,AuthFile,DirData) ->
+    case proplists:get_value(AuthFile,DirData) of
+	Name when is_list(Name) ->
+	    ok;
+	_ ->
+	    throw({missing_auth_file, AuthFile, {directory, {Dir, DirData}}})
+    end.
+
 store_directory(Directory0, DirData0, ConfigList) ->
     Port = proplists:get_value(port, ConfigList),
     DirData = case proplists:get_value(bind_address, ConfigList) of
diff --git a/lib/inets/src/http_server/mod_auth_dets.erl b/lib/inets/src/http_server/mod_auth_dets.erl
index ff81a68dd4..4220f46166 100644
--- a/lib/inets/src/http_server/mod_auth_dets.erl
+++ b/lib/inets/src/http_server/mod_auth_dets.erl
@@ -38,12 +38,11 @@
 -include("httpd_internal.hrl").
 -include("mod_auth.hrl").
 
-store_directory_data(_Directory, DirData, Server_root) ->
-    ?CDEBUG("store_directory_data -> ~n"
-	    "     Directory: ~p~n"
-	    "     DirData:   ~p",
-	    [_Directory, DirData]),
+%%====================================================================
+%% Internal application API
+%%====================================================================	     
 
+store_directory_data(_Directory, DirData, Server_root) ->
     {PWFile, Absolute_pwdfile} = absolute_file_name(auth_user_file, DirData,
 						    Server_root),
     {GroupFile, Absolute_groupfile} = absolute_file_name(auth_group_file,
@@ -70,11 +69,8 @@ store_directory_data(_Directory, DirData, Server_root) ->
 	    {error, {{file, PWFile},Err2}} 
     end.
 
-%%
 %% Storage format of users in the dets table:
 %% {{UserName, Addr, Port, Dir}, Password, UserData}
-%%
-
 add_user(DirData, UStruct) ->
     {Addr, Port, Dir} = lookup_common(DirData),
     PWDB = proplists:get_value(auth_user_file, DirData),
@@ -100,21 +96,15 @@ get_user(DirData, UserName) ->
     end.
 
 list_users(DirData) ->
-    ?DEBUG("list_users -> ~n"
-	   "     DirData: ~p", [DirData]),
     {Addr, Port, Dir} = lookup_common(DirData),
     PWDB = proplists:get_value(auth_user_file, DirData),
-    case dets:traverse(PWDB, fun(X) -> {continue, X} end) of    %% SOOOO Ugly !
+    case dets:traverse(PWDB, fun(X) -> {continue, X} end) of    
 	Records when is_list(Records) ->
-	    ?DEBUG("list_users -> ~n"
-		   "     Records: ~p", [Records]),
 	    {ok, [UserName || {{UserName, AnyAddr, AnyPort, AnyDir}, 
 			       _Password, _Data} <- Records,
 			      AnyAddr == Addr, AnyPort == Port, 
 			      AnyDir == Dir]};
 	_O ->
-	    ?DEBUG("list_users -> ~n"
-		   "     O: ~p", [_O]),
 	    {ok, []}
     end.
 
@@ -135,10 +125,8 @@ delete_user(DirData, UserName) ->
 	    {error, no_such_user}
     end.
 
-%%
 %% Storage of groups in the dets table:
 %% {Group, UserList} where UserList is a list of strings.
-%%
 add_group_member(DirData, GroupName, UserName) ->
     {Addr, Port, Dir} = lookup_common(DirData),
     GDB = proplists:get_value(auth_group_file, DirData),
@@ -216,16 +204,7 @@ delete_group(DirData, GroupName) ->
 	    {error, no_such_group}
     end.
 
-lookup_common(DirData) ->
-    Dir  = proplists:get_value(path, DirData),
-    Port = proplists:get_value(port, DirData),
-    Addr = proplists:get_value(bind_address, DirData),
-    {Addr, Port, Dir}.
-
-%% remove/1
-%%
 %% Closes dets tables used by this auth mod.
-%%
 remove(DirData) ->
     PWDB = proplists:get_value(auth_user_file, DirData),
     GDB = proplists:get_value(auth_group_file, DirData),
@@ -233,8 +212,9 @@ remove(DirData) ->
     dets:close(PWDB),
     ok.
 
-%% absolute_file_name/2
-%%
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
 %% Return the absolute path name of File_type. 
 absolute_file_name(File_type, DirData, Server_root) ->
     Path = proplists:get_value(File_type, DirData),
@@ -254,3 +234,8 @@ absolute_file_name(File_type, DirData, Server_root) ->
 		    end,
     {Path, Absolute_path}.
 
+lookup_common(DirData) ->
+    Dir  = proplists:get_value(path, DirData),
+    Port = proplists:get_value(port, DirData),
+    Addr = proplists:get_value(bind_address, DirData),
+    {Addr, Port, Dir}.
diff --git a/lib/inets/src/http_server/mod_auth_plain.erl b/lib/inets/src/http_server/mod_auth_plain.erl
index 9a12c6695d..7bb86fc812 100644
--- a/lib/inets/src/http_server/mod_auth_plain.erl
+++ b/lib/inets/src/http_server/mod_auth_plain.erl
@@ -22,15 +22,11 @@
 -include("httpd.hrl").
 -include("mod_auth.hrl").
 -include("httpd_internal.hrl").
--include("inets_internal.hrl").
-
 
 -define(VMODULE,"AUTH_PLAIN").
 
 %% Internal API
 -export([store_directory_data/3]).
-
-
 -export([get_user/2, 
 	 list_group_members/2, 
 	 add_user/2, 
@@ -42,17 +38,13 @@
 	 delete_group/2, 
 	 remove/1]).
 
-%%
-%% API
-%%
+%%====================================================================
+%% Internal application API
+%%====================================================================	     
 
-%%
 %% Storage format of users in the ets table:
 %% {UserName, Password, UserData}
-%%
-
 add_user(DirData, #httpd_user{username = User} = UStruct) ->
-    ?hdrt("add user", [{user, UStruct}]),
     PWDB = proplists:get_value(auth_user_file, DirData),
     Record = {User,
 	      UStruct#httpd_user.password, 
@@ -66,7 +58,6 @@ add_user(DirData, #httpd_user{username = User} = UStruct) ->
     end.
 
 get_user(DirData, User) ->
-    ?hdrt("get user", [{dir_data, DirData}, {user, User}]),
     PWDB = proplists:get_value(auth_user_file, DirData),
     case ets:lookup(PWDB, User) of
 	[{User, PassWd, Data}] ->
@@ -84,7 +75,6 @@ list_users(DirData) ->
 		     [], lists:flatten(Records))}.
 
 delete_user(DirData, UserName) ->
-    ?hdrt("delete user", [{dir_data, DirData}, {user, UserName}]),
     PWDB = proplists:get_value(auth_user_file, DirData),
     case ets:lookup(PWDB, UserName) of
 	[{UserName, _SomePassword, _SomeData}] ->
@@ -98,11 +88,8 @@ delete_user(DirData, UserName) ->
 	    {error, no_such_user}
     end.
 
-%%
 %% Storage of groups in the ets table:
 %% {Group, UserList} where UserList is a list of strings.
-%%
-  
 add_group_member(DirData, Group, UserName) ->
     GDB = proplists:get_value(auth_group_file, DirData),
     case ets:lookup(GDB, Group) of
@@ -163,17 +150,12 @@ delete_group(DirData, Group) ->
     end.
 
 store_directory_data(_Directory, DirData, Server_root) ->
-    ?hdrt("store directory data", 
-	  [{dir_data, DirData}, {server_root, Server_root}]),
     PWFile = absolute_file_name(auth_user_file, DirData, Server_root),
     GroupFile = absolute_file_name(auth_group_file, DirData, Server_root),
     case load_passwd(PWFile) of
 	{ok, PWDB} ->
-	    ?hdrt("password file loaded", [{file, PWFile}, {pwdb, PWDB}]),
 	    case load_group(GroupFile) of
 		{ok, GRDB} ->
-		    ?hdrt("group file loaded", 
-			  [{file, GroupFile}, {grdb, GRDB}]),
 		    %% Address and port is included in the file names...
 		    Addr = proplists:get_value(bind_address, DirData),
 		    Port = proplists:get_value(port, DirData),
@@ -191,9 +173,83 @@ store_directory_data(_Directory, DirData, Server_root) ->
 	    {error, Err2}
     end.
 
+%% Deletes ets tables used by this auth mod.
+remove(DirData) ->
+    PWDB = proplists:get_value(auth_user_file, DirData),
+    GDB = proplists:get_value(auth_group_file, DirData),
+    ets:delete(PWDB),
+    ets:delete(GDB).
 
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
+%% Return the absolute path name of File_type. 
+absolute_file_name(File_type, DirData, Server_root) ->
+    Path = proplists:get_value(File_type, DirData),
+    case filename:pathtype(Path) of
+	relative ->
+	    case Server_root of
+		undefined ->
+		    {error,
+		     ?NICE(Path++
+			   " is an invalid file name because "
+			   "ServerRoot is not defined")};
+		_ ->
+		    filename:join(Server_root,Path)
+	    end;
+	_ ->
+	    Path
+    end.
 
-%% load_passwd
+store_group(Addr,Port,GroupList) ->
+    %% Not a named table so not importante to add Profile to name
+    Name = httpd_util:make_name("httpd_group",Addr,Port),
+    GroupDB = ets:new(Name, [set, public]),
+    store_group(GroupDB, GroupList).
+
+store_group(GroupDB,[]) ->
+    {ok, GroupDB};
+store_group(GroupDB, [User|Rest]) ->
+    ets:insert(GroupDB, User),
+    store_group(GroupDB, Rest).
+
+store_passwd(Addr,Port,PasswdList) ->
+    %% Not a named table so not importante to add Profile to name
+    Name = httpd_util:make_name("httpd_passwd",Addr,Port),
+    PasswdDB = ets:new(Name, [set, public]),
+    store_passwd(PasswdDB, PasswdList).
+
+store_passwd(PasswdDB, []) ->
+    {ok, PasswdDB};
+store_passwd(PasswdDB, [User|Rest]) ->
+    ets:insert(PasswdDB, User),
+    store_passwd(PasswdDB, Rest).
+
+parse_group(Stream, GroupList) ->
+    Line =
+	case io:get_line(Stream,'') of
+	    eof ->
+		eof;
+	    String ->
+		httpd_conf:clean(String)
+	end,
+    parse_group(Stream, GroupList, Line).
+
+parse_group(Stream, GroupList, eof) ->
+    file:close(Stream),
+    {ok, GroupList};
+parse_group(Stream, GroupList, "") ->
+    parse_group(Stream, GroupList);
+parse_group(Stream, GroupList, [$#|_]) ->
+    parse_group(Stream, GroupList);
+parse_group(Stream, GroupList, Line) ->      
+    case inets_regexp:split(Line, ":") of
+	{ok, [Group,Users]} ->
+	    {ok, UserList} = inets_regexp:split(Users," "),
+	    parse_group(Stream, [{Group,UserList}|GroupList]);
+	{ok, _} ->
+	    {error, ?NICE(Line)}
+    end.
 
 load_passwd(AuthUserFile) ->
     case file:open(AuthUserFile, [read]) of
@@ -228,8 +284,6 @@ parse_passwd(Stream, PasswdList, Line) ->
 	    {error, ?NICE(Line)}
     end.
 
-%% load_group
-
 load_group(AuthGroupFile) ->
     case file:open(AuthGroupFile, [read]) of
 	{ok, Stream} ->
@@ -237,93 +291,3 @@ load_group(AuthGroupFile) ->
 	{error, _} ->
 	    {error, ?NICE("Can't open " ++ AuthGroupFile)}
     end.
-
-parse_group(Stream, GroupList) ->
-    Line =
-	case io:get_line(Stream,'') of
-	    eof ->
-		eof;
-	    String ->
-		httpd_conf:clean(String)
-	end,
-    parse_group(Stream, GroupList, Line).
-
-parse_group(Stream, GroupList, eof) ->
-    file:close(Stream),
-    {ok, GroupList};
-parse_group(Stream, GroupList, "") ->
-    parse_group(Stream, GroupList);
-parse_group(Stream, GroupList, [$#|_]) ->
-    parse_group(Stream, GroupList);
-parse_group(Stream, GroupList, Line) ->      
-    case inets_regexp:split(Line, ":") of
-	{ok, [Group,Users]} ->
-	    {ok, UserList} = inets_regexp:split(Users," "),
-	    parse_group(Stream, [{Group,UserList}|GroupList]);
-	{ok, _} ->
-	    {error, ?NICE(Line)}
-    end.
-
-
-%% store_passwd
-
-store_passwd(Addr,Port,PasswdList) ->
-    %% Not a named table so not importante to add Profile to name
-    Name = httpd_util:make_name("httpd_passwd",Addr,Port),
-    PasswdDB = ets:new(Name, [set, public]),
-    store_passwd(PasswdDB, PasswdList).
-
-store_passwd(PasswdDB, []) ->
-    {ok, PasswdDB};
-store_passwd(PasswdDB, [User|Rest]) ->
-    ets:insert(PasswdDB, User),
-    store_passwd(PasswdDB, Rest).
-
-%% store_group
-
-store_group(Addr,Port,GroupList) ->
-    %% Not a named table so not importante to add Profile to name
-    Name = httpd_util:make_name("httpd_group",Addr,Port),
-    GroupDB = ets:new(Name, [set, public]),
-    store_group(GroupDB, GroupList).
-
-
-store_group(GroupDB,[]) ->
-    {ok, GroupDB};
-store_group(GroupDB, [User|Rest]) ->
-    ets:insert(GroupDB, User),
-    store_group(GroupDB, Rest).
-
-
-%% remove/1
-%%
-%% Deletes ets tables used by this auth mod.
-%%
-remove(DirData) ->
-    PWDB = proplists:get_value(auth_user_file, DirData),
-    GDB = proplists:get_value(auth_group_file, DirData),
-    ets:delete(PWDB),
-    ets:delete(GDB).
-
-
-
-%% absolute_file_name/2
-%%
-%% Return the absolute path name of File_type. 
-absolute_file_name(File_type, DirData, Server_root) ->
-    Path = proplists:get_value(File_type, DirData),
-    case filename:pathtype(Path) of
-	relative ->
-	    case Server_root of
-		undefined ->
-		    {error,
-		     ?NICE(Path++
-			   " is an invalid file name because "
-			   "ServerRoot is not defined")};
-		_ ->
-		    filename:join(Server_root,Path)
-	    end;
-	_ ->
-	    Path
-    end.
-
diff --git a/lib/inets/src/http_server/mod_auth_server.erl b/lib/inets/src/http_server/mod_auth_server.erl
index 656721fbc4..2a45f402d7 100644
--- a/lib/inets/src/http_server/mod_auth_server.erl
+++ b/lib/inets/src/http_server/mod_auth_server.erl
@@ -22,11 +22,9 @@
 
 -include("httpd.hrl").
 -include("httpd_internal.hrl").
--include("inets_internal.hrl").
 
 -behaviour(gen_server).
 
-
 %% mod_auth exports 
 -export([start/3, stop/3, 
 	 add_password/4, update_password/5, 
@@ -41,27 +39,17 @@
 
 -record(state, {tab}).
 
+%%====================================================================
+%% Internal application API
+%%====================================================================	     
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                  %%
-%% External API                                                     %%
-%%                                                                  %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%% start_link/3
-%% 
 %% NOTE: This is called by httpd_misc_sup when the process is started
 %% 
 start_link(Addr, Port, Profile) ->
-    ?hdrt("start_link", [{address, Addr}, {port, Port}]),
     Name = make_name(Addr, Port, Profile),
     gen_server:start_link({local, Name}, ?MODULE, [], [{timeout, infinity}]).
 
-
-%% start/2
-
 start(Addr, Port, Profile) ->
-    ?hdrd("start", [{address, Addr}, {port, Port}]),
     Name = make_name(Addr, Port, Profile),
     case whereis(Name) of
 	undefined ->
@@ -70,11 +58,7 @@ start(Addr, Port, Profile) ->
 	    ok
     end.
 
-
-%% stop/2
-
 stop(Addr, Port, Profile) ->
-    ?hdrd("stop", [{address, Addr}, {port, Port}]),
     Name = make_name(Addr, Port, Profile),
     case whereis(Name) of
 	undefined -> %% Already stopped
@@ -83,144 +67,87 @@ stop(Addr, Port, Profile) ->
            (catch httpd_misc_sup:stop_auth_server(Addr, Port, Profile))
     end.
 
-%% add_password/4
-
 add_password(Addr, Port, Dir, Password) ->
     add_password(Addr, Port, ?DEFAULT_PROFILE, Dir, Password).
 add_password(Addr, Port, Profile, Dir, Password) ->
-    ?hdrt("add password", [{address, Addr}, {port, Port}]),
     Name = make_name(Addr, Port, Profile),
     Req  = {add_password, Dir, Password},
     call(Name, Req).
 
-
-%% update_password/6
 update_password(Addr, Port, Dir, Old, New) ->
     update_password(Addr, Port, ?DEFAULT_PROFILE, Dir, Old, New).
 update_password(Addr, Port, Profile, Dir, Old, New) when is_list(New) ->
-    ?hdrt("update password", 
-	  [{address, Addr}, {port, Port}, {dir, Dir}, {old, Old}, {new, New}]),
     Name = make_name(Addr, Port, Profile),
     Req  = {update_password, Dir, Old, New},
     call(Name, Req).
-	   
- 
-%% add_user/5
+
 add_user(Addr, Port, Dir, User, Password) ->
     add_user(Addr, Port, ?DEFAULT_PROFILE, Dir, User, Password).
 add_user(Addr, Port, Profile, Dir, User, Password) ->
-    ?hdrt("add user", 
-	  [{address, Addr}, {port, Port}, 
-	   {dir, Dir}, {user, User}, {passwd, Password}]),
     Name = make_name(Addr, Port, Profile),
     Req  = {add_user, Addr, Port, Profile, Dir, User, Password},
     call(Name, Req).
 
-
-%% delete_user/5
 delete_user(Addr, Port, Dir, UserName, Password) ->
     delete_user(Addr, Port, ?DEFAULT_PROFILE, Dir, UserName, Password).
 delete_user(Addr, Port, Profile, Dir, UserName, Password) ->
-    ?hdrt("delete user", 
-	  [{address, Addr}, {port, Port}, 
-	   {dir, Dir}, {user, UserName}, {passwd, Password}]),
     Name = make_name(Addr, Port, Profile),
     Req  = {delete_user, Addr, Port, Profile, Dir, UserName, Password},
     call(Name, Req).
 
-
-%% get_user/5
 get_user(Addr, Port, Dir, UserName, Password) ->
     get_user(Addr, Port, ?DEFAULT_PROFILE, Dir, UserName, Password).
 get_user(Addr, Port, Profile,Dir, UserName, Password) ->
-    ?hdrt("get user", 
-	  [{address, Addr}, {port, Port}, 
-	   {dir, Dir}, {user, UserName}, {passwd, Password}]),
     Name = make_name(Addr, Port, Profile),
     Req  = {get_user, Addr, Port, Profile, Dir, UserName, Password},
     call(Name, Req).
 
-
-%% list_users/4
 list_users(Addr, Port, Dir, Password) ->
     list_users(Addr, Port, ?DEFAULT_PROFILE, Dir, Password).
 list_users(Addr, Port, Profile, Dir, Password) ->
-    ?hdrt("list users", 
-	  [{address, Addr}, {port, Port}, {dir, Dir}, {passwd, Password}]),
     Name = make_name(Addr,Port, Profile),
     Req  = {list_users, Addr, Port, Profile, Dir, Password},
     call(Name, Req).
 
-
-%% add_group_member/6
 add_group_member(Addr, Port, Dir, GroupName, UserName, Password) ->
     add_group_member(Addr, Port, ?DEFAULT_PROFILE, Dir, GroupName, UserName, Password).
 add_group_member(Addr, Port, Profile, Dir, GroupName, UserName, Password) ->
-    ?hdrt("add group member", 
-	  [{address, Addr}, {port, Port}, {dir, Dir}, 
-	   {group, GroupName}, {user, UserName}, {passwd, Password}]),
     Name = make_name(Addr,Port, Profile),
     Req  = {add_group_member, Addr, Port, Profile, Dir, GroupName, UserName, Password},
     call(Name, Req).
 
-
-%% delete_group_member/6
 delete_group_member(Addr, Port, Dir, GroupName, UserName, Password) ->
     delete_group_member(Addr, Port, ?DEFAULT_PROFILE, Dir, GroupName, UserName, Password).
 delete_group_member(Addr, Port, Profile, Dir, GroupName, UserName, Password) ->
-    ?hdrt("delete group member", 
-	  [{address, Addr}, {port, Port}, {dir, Dir}, 
-	   {group, GroupName}, {user, UserName}, {passwd, Password}]),
     Name = make_name(Addr,Port,Profile),
     Req  = {delete_group_member, Addr, Port, Profile, Dir, GroupName, UserName, Password},
     call(Name, Req).
 
-
-%% list_group_members/4
 list_group_members(Addr, Port, Dir, Group, Password) ->
     list_group_members(Addr, Port, ?DEFAULT_PROFILE, Dir, Group, Password).
 list_group_members(Addr, Port, Profile, Dir, Group, Password) ->
-    ?hdrt("list group members", 
-	  [{address, Addr}, {port, Port}, {dir, Dir}, 
-	   {group, Group}, {passwd, Password}]),
     Name = make_name(Addr, Port, Profile),
     Req  = {list_group_members, Addr, Port, Dir, Group, Password},
     call(Name, Req).
 
-
-%% delete_group/5
 delete_group(Addr, Port, Dir, GroupName, Password) ->
     delete_group(Addr, Port, ?DEFAULT_PROFILE, Dir, GroupName, Password).
 delete_group(Addr, Port, Profile, Dir, GroupName, Password) ->
-    ?hdrt("delete group", 
-	  [{address, Addr}, {port, Port}, {dir, Dir}, 
-	   {group, GroupName}, {passwd, Password}]),
     Name = make_name(Addr, Port, Profile),
     Req  = {delete_group, Addr, Port, Profile, Dir, GroupName, Password},
     call(Name, Req).
 
-
-%% list_groups/4
 list_groups(Addr, Port, Dir, Password) ->
     list_groups(Addr, Port, ?DEFAULT_PROFILE, Dir, Password).
 list_groups(Addr, Port, Profile, Dir, Password) ->
-    ?hdrt("list groups", 
-	  [{address, Addr}, {port, Port}, {dir, Dir}, {passwd, Password}]),
     Name = make_name(Addr, Port, Profile),
     Req  = {list_groups, Addr, Port,Profile, Dir, Password},
     call(Name, Req).
 
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                  %%
-%% Server call-back functions                                       %%
-%%                                                                  %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%% init
-
+%%====================================================================
+%% Behavior call backs
+%%====================================================================	     
 init(_) ->
-    ?hdrv("initiating", []),
     {ok,#state{tab = ets:new(auth_pwd,[set,protected])}}.
 
 %% handle_call
@@ -228,7 +155,6 @@ init(_) ->
 %% Add a user
 handle_call({add_user, Addr, Port, Profile, Dir, User, AuthPwd}, _From, State) ->
     Reply = api_call(Addr, Port, Profile, Dir, add_user, User, AuthPwd, State),
-    ?hdrt("add user", [{reply, Reply}]),
     {reply, Reply, State};
 
 %% Get data about a user
@@ -318,22 +244,12 @@ terminate(_Reason,State) ->
     ets:delete(State#state.tab),
     ok.
 
-
-%% code_change(Vsn, State, Extra)
-%%
 code_change(_Vsn, State, _Extra) ->
     {ok, State}.
 
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                  %%
-%% The functions that really changes the data in the database       %%
-%% of users to different directories                                %%
-%%                                                                  %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
-
-%% API gateway
-
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
 api_call(Addr, Port, Profile, Dir, Func, Args,Password,State) ->
     case controlPassword(Password, State, Dir) of
 	ok->
@@ -409,5 +325,3 @@ call(Name, Req) ->
 	Reply ->
 	    Reply
     end.
-    
-
diff --git a/lib/inets/src/http_server/mod_security.erl b/lib/inets/src/http_server/mod_security.erl
index 57de907267..a85383a921 100644
--- a/lib/inets/src/http_server/mod_security.erl
+++ b/lib/inets/src/http_server/mod_security.erl
@@ -35,8 +35,9 @@
 
 -define(VMODULE,"SEC").
 
-
-%% do/1
+%%====================================================================
+%% Internal application API
+%%====================================================================	     
 do(Info) ->
     %% Check and see if any user has been authorized.
     case proplists:get_value(remote_user, Info#mod.data,not_defined_user) of
@@ -181,12 +182,6 @@ remove(ConfigDB) ->
     mod_security_server:stop(Addr, Port, Profile).
     
 
-%%
-%% User API
-%%
-
-%% list_blocked_users
-
 list_blocked_users(Port) ->
     list_blocked_users(undefined, Port).
 
@@ -204,17 +199,11 @@ list_blocked_users(Addr, Port, Dir) ->
 	      end,
 	      mod_security_server:list_blocked_users(Addr, Port, Dir)).
 
-
-%% block_user
-
 block_user(User, Port, Dir, Time) ->
     block_user(User, undefined, Port, Dir, Time).
 block_user(User, Addr, Port, Dir, Time) ->
     mod_security_server:block_user(User, Addr, Port, Dir, Time).
 
-
-%% unblock_user
-
 unblock_user(User, Port) ->
     unblock_user(User, undefined, Port).
 
@@ -226,9 +215,6 @@ unblock_user(User, Addr, Port) when is_integer(Port) ->
 unblock_user(User, Addr, Port, Dir) ->
     mod_security_server:unblock_user(User, Addr, Port, Dir).
 
-
-%% list_auth_users
-
 list_auth_users(Port) ->
     list_auth_users(undefined,Port).
 
@@ -312,6 +298,3 @@ load_return_int_tag(Name, Atom, Time, Dir, DirData) ->
 		    {ok, [{security_directory, {Dir, [{Atom, Val}|DirData]}}]}
 	    end
     end.
-
-
-
diff --git a/lib/inets/src/http_server/mod_security_server.erl b/lib/inets/src/http_server/mod_security_server.erl
index 97c8f2b8f3..4f37dff18c 100644
--- a/lib/inets/src/http_server/mod_security_server.erl
+++ b/lib/inets/src/http_server/mod_security_server.erl
@@ -45,7 +45,6 @@
 
 -include("httpd.hrl").
 -include("httpd_internal.hrl").
--include("inets_internal.hrl").
 
 -behaviour(gen_server).
 
@@ -68,29 +67,17 @@
 	 terminate/2,
 	 code_change/3]).
 
+%%====================================================================
+%% Internal application API
+%%====================================================================	     
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                  %%
-%% External API                                                     %%
-%%                                                                  %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%% start_link/3
-%% 
 %% NOTE: This is called by httpd_misc_sup when the process is started
-%% 
-
 start_link(Addr, Port, Profile) ->
-    ?hdrt("start_link", [{address, Addr}, {port, Port}]),
     Name = make_name(Addr, Port, Profile),
     gen_server:start_link({local, Name}, ?MODULE, [], [{timeout, infinity}]).
 
-
-%% start/2
 %% Called  by the mod_security module.
-
 start(Addr, Port, Profile) ->
-    ?hdrt("start", [{address, Addr}, {port, Port}]),
     Name = make_name(Addr, Port, Profile),
     case whereis(Name) of
 	undefined ->
@@ -99,13 +86,9 @@ start(Addr, Port, Profile) ->
 	    ok
     end.
 
-
-%% stop
-
 stop(Port, Profile) ->
     stop(undefined, Port, Profile).
 stop(Addr, Port, Profile) ->
-    ?hdrt("stop", [{address, Addr}, {port, Port}]),
     Name = make_name(Addr, Port, Profile),
     case whereis(Name) of
 	undefined ->
@@ -114,15 +97,11 @@ stop(Addr, Port, Profile) ->
 	    httpd_misc_sup:stop_sec_server(Addr, Port, Profile)
     end.
 
-
 addr(undefined) ->
     any;
 addr(Addr) ->
     Addr.
 
-
-%% list_blocked_users
-
 list_blocked_users(Addr, Port) ->
     list_blocked_users(Addr, Port, ?DEFAULT_PROFILE).
 list_blocked_users(Addr, Port, Profile) when is_atom(Profile)->
@@ -136,8 +115,6 @@ list_blocked_users(Addr, Port, Profile, Dir) ->
     Req  = {list_blocked_users, addr(Addr), Port, Profile, Dir},
     call(Name, Req).
 
-
-%% block_user
 block_user(User, Addr, Port, Dir, Time) ->
     block_user(User, Addr, Port, ?DEFAULT_PROFILE, Dir, Time).
 block_user(User, Addr, Port, Profile, Dir, Time) ->
@@ -145,9 +122,6 @@ block_user(User, Addr, Port, Profile, Dir, Time) ->
     Req  = {block_user, User, addr(Addr), Port, Profile, Dir, Time},
     call(Name, Req).
 
-
-%% unblock_user
-
 unblock_user(User, Addr, Port) ->
     unblock_user(User, Addr, Port, ?DEFAULT_PROFILE).
 unblock_user(User, Addr, Port, Profile) when is_atom(Profile)->
@@ -161,8 +135,6 @@ unblock_user(User, Addr, Port, Profile, Dir) ->
     Req  = {unblock_user, User, addr(Addr), Port, Profile, Dir},
     call(Name, Req).
 
-
-%% list_auth_users
 list_auth_users(Addr, Port) ->
     list_auth_users(Addr, Port, ?DEFAULT_PROFILE).
 list_auth_users(Addr, Port, Profile) when is_atom(Profile) ->
@@ -175,17 +147,12 @@ list_auth_users(Addr, Port, Profile, Dir) ->
     Name = make_name(Addr,Port, Profile),
     Req  = {list_auth_users, addr(Addr), Port, Profile, Dir}, 
     call(Name, Req).
-    
-%% new_table
 
 new_table(Addr, Port, Profile, TabName) ->
     Name = make_name(Addr,Port, Profile),
     Req  = {new_table, addr(Addr), Port, Profile, TabName}, 
     call(Name, Req).
 
-
-%% delete_tables
-    
 delete_tables(Addr, Port, Profile) ->
     Name = make_name(Addr, Port, Profile),
     case whereis(Name) of
@@ -195,42 +162,25 @@ delete_tables(Addr, Port, Profile) ->
 	    call(Name, delete_tables)
     end.
 
-
-%% store_failed_auth
-
 store_failed_auth(Info, Addr, Port, Profile, DecodedString, SDirData) ->
-    ?hdrv("store failed auth", 
-	  [{addr, Addr}, {port, Port}, 
-	   {decoded_string, DecodedString}, {sdir_data, SDirData}]),
     Name = make_name(Addr, Port, Profile),
     Msg  = {store_failed_auth, Profile, [Info,DecodedString,SDirData]},
     cast(Name, Msg).
 
-
-%% store_successful_auth
-
 store_successful_auth(Addr, Port, Profile, User, SDirData) ->
     Name = make_name(Addr,Port, Profile),
     Msg  = {store_successful_auth, [User,Addr,Port, Profile, SDirData]}, 
     cast(Name, Msg).
-    
-
-%% check_blocked_user
-
+ 
 check_blocked_user(Info, User, SDirData, Addr, Port, Profile) ->
     Name = make_name(Addr, Port, Profile),
     Req  = {check_blocked_user, Profile, [Info, User, SDirData]}, 
     call(Name, Req).
 
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                  %%
-%% Server call-back functions                                       %%
-%%                                                                  %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+%%====================================================================
+%% Behavior call backs
+%%====================================================================	     
 init(_) ->
-    ?hdrv("initiating", []),
     process_flag(trap_exit, true),
     {ok, []}.
 
@@ -238,27 +188,18 @@ handle_call(stop, _From, _Tables) ->
     {stop, normal, ok, []};
 
 handle_call({block_user, User, Addr, Port, Profile, Dir, Time}, _From, Tables) ->
-    ?hdrv("block user", 
-	  [{user, User}, {addr, Addr}, {port, Port}, {dir, Dir}, 
-	   {time, Time}]), 
     Ret = block_user_int(User, Addr, Port, Profile, Dir, Time),
     {reply, Ret, Tables};
 
 handle_call({list_blocked_users, Addr, Port, Profile, Dir}, _From, Tables) ->
-    ?hdrv("list blocked users", 
-	  [{addr, Addr}, {port, Port}, {dir, Dir}]),
     Blocked = list_blocked(Tables, Addr, Port, Profile, Dir, []),
     {reply, Blocked, Tables};
 
 handle_call({unblock_user, User, Addr, Port, Profile, Dir}, _From, Tables) ->
-    ?hdrv("block user", 
-	  [{user, User}, {addr, Addr}, {port, Port}, {dir, Dir}]), 
     Ret = unblock_user_int(User, Addr, Port, Profile,Dir),
     {reply, Ret, Tables};
 
 handle_call({list_auth_users, Addr, Port, Profile, Dir}, _From, Tables) ->
-    ?hdrv("list auth users", 
-	  [{addr, Addr}, {port, Port}, {dir, Dir}]), 
     Auth = list_auth(Tables, Addr, Port, Profile, Dir, []),
     {reply, Auth, Tables};
 
@@ -302,9 +243,6 @@ handle_call({check_blocked_user, Profile, [Info, User, SDirData]}, _From, Tables
 handle_call(_Request,_From,Tables) ->
     {reply,ok,Tables}.
 
-
-%% handle_cast
-
 handle_cast({store_failed_auth, _,[_, _, []]}, Tables) ->
     %% Some other authentication scheme than mod_auth (example mod_htacess)
     %% was the source for the authentication failure so we should ignor it!
@@ -404,30 +342,19 @@ handle_cast(Req, Tables) ->
     error_msg("security server got unknown cast: ~p",[Req]),
     {noreply, Tables}.
 
-
-%% handle_info
-
 handle_info(_Info, State) ->
     {noreply, State}.
 
-
-%% terminate
-
 terminate(_Reason, _Tables) ->
     ok.
 
-
-%% code_change({down, ToVsn}, State, Extra)
-%% 
-code_change({down, _}, State, _Extra) ->
-    {ok, State};
-
-
-%% code_change(FromVsn, State, Extra)
-%%
 code_change(_, State, _Extra) ->
     {ok, State}.
 
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
+
 %% block_user_int/5
 block_user_int(User, Addr, Port, Profile, Dir, Time) ->
     Dirs = httpd_manager:config_match(Addr, Port, Profile, 
@@ -455,7 +382,6 @@ block_user_int(User, Addr, Port, Profile, Dir, Time) ->
 	    {error, no_such_directory}
     end.
     
-
 find_dirdata([], _Dir) ->
     false;
 find_dirdata([{security_directory, {_, DirData}}|SDirs], Dir) ->
@@ -468,7 +394,6 @@ find_dirdata([{security_directory, {_, DirData}}|SDirs], Dir) ->
 	    find_dirdata(SDirs, Dir)
     end.
 
-%% unblock_user_int/4
 unblock_user_int(User, Addr, Port, Profile, Dir) ->
     Dirs = httpd_manager:config_match(Addr, Port, Profile, 
 				      {security_directory, {'_', '_'}}),
@@ -493,10 +418,6 @@ unblock_user_int(User, Addr, Port, Profile, Dir) ->
 	    {error, no_such_directory}
     end.
 
-
-
-%% list_auth/2
-
 list_auth([], _, _, _, _, Acc) ->
     Acc;
 list_auth([{_Name, {ETS, DETS}}|Tables], Addr, Port, Profile, Dir, Acc) ->
@@ -521,11 +442,7 @@ list_auth([{_Name, {ETS, DETS}}|Tables], Addr, Port, Profile, Dir, Acc) ->
 	    list_auth(Tables, Addr, Port, Profile, Dir, NewAcc)
     end.
 
-
-%% list_blocked/2
-
 list_blocked([], _, _, _, _, Acc) ->
-    ?hdrv("list blocked", [{acc, Acc}]), 
     TN = universal_time(),
     lists:foldl(fun({U,Ad,P,Pr,D,T}, Ac) ->
 			if
@@ -537,7 +454,6 @@ list_blocked([], _, _, _, _, Acc) ->
 		end, 
 		[], Acc);
 list_blocked([{_Name, {ETS, _DETS}}|Tables], Addr, Port, Profile, Dir, Acc) ->
-    ?hdrv("list blocked", [{ets, ETS}, {tab2list, ets:tab2list(ETS)}]), 
     List = ets:match_object(ETS, {blocked_user, 
 				  {'_',Addr,Port,Profile, Dir,'_'}}),
     
@@ -547,9 +463,6 @@ list_blocked([{_Name, {ETS, _DETS}}|Tables], Addr, Port, Profile, Dir, Acc) ->
     list_blocked(Tables, Addr, Port, Profile, Dir, NewBlocked).
 
 
-%%
-%% sync_dets_to_ets/2
-%%
 %% Reads dets-table DETS and syncronizes it with the ets-table ETS.
 %%
 sync_dets_to_ets(DETS, ETS) ->
@@ -558,9 +471,6 @@ sync_dets_to_ets(DETS, ETS) ->
 				continue
 			end).
 
-%%
-%% check_blocked_user/7 -> true | false
-%%
 %% Check if a specific user is blocked from access.
 %%
 %% The sideeffect of this routine is that it unblocks also other users
@@ -611,7 +521,6 @@ unblock_user(Info, User, Dir, Addr, Port, Profile, ETS, DETS, CBModule) ->
     dets:match_delete(DETS, {blocked_user, {User, Addr, Port, Profile, Dir, '_'}}),
     ets:match_delete(ETS, {blocked_user, {User, Addr, Port, Profile, Dir, '_'}}).
   
-
 make_name(Addr,Port, Profile) ->
     httpd_util:make_name(?MODULE,Addr,Port, Profile).
 
@@ -619,7 +528,6 @@ make_name(Addr,Port, Profile, Num) ->
     httpd_util:make_name(?MODULE,Addr,Port,
 			 atom_to_list(Profile) ++ "__" ++ integer_to_list(Num)).
 
-
 auth_fail_event(Mod,Addr,Port,Dir,User,Passwd) ->
     event(auth_fail,Mod,Addr,Port,Dir,[{user,User},{password,Passwd}]).
 
@@ -630,17 +538,10 @@ user_unblock_event(Mod,Addr,Port,Dir,User) ->
     event(user_unblock,Mod,Addr,Port,Dir,[{user,User}]).
 
 event(Event, Mod, undefined, Port, Dir, Info) ->
-    ?hdrt("event", 
-	  [{event, Event}, {mod, Mod}, {port, Port}, {dir, Dir}]),
     (catch Mod:event(Event,Port,Dir,Info));
 event(Event, Mod, any, Port, Dir, Info) ->
-    ?hdrt("event", 
-	  [{event, Event}, {mod, Mod}, {port, Port}, {dir, Dir}]),
     (catch Mod:event(Event,Port,Dir,Info));
 event(Event, Mod, Addr, Port, Dir, Info) ->
-    ?hdrt("event", 
-	  [{event, Event}, {mod, Mod}, 
-	   {addr, Addr}, {port, Port}, {dir, Dir}]),
     (catch Mod:event(Event,Addr,Port,Dir,Info)).
 
 universal_time() ->
@@ -650,11 +551,9 @@ local_time(T) ->
     calendar:universal_time_to_local_time(
       calendar:gregorian_seconds_to_datetime(T)).
 
-
 error_msg(F, A) ->
     error_logger:error_msg(F, A).
 
-
 call(Name, Req) ->
     case (catch gen_server:call(Name, Req)) of
         {'EXIT', Reason} ->
@@ -663,7 +562,6 @@ call(Name, Req) ->
             Reply
     end.
 
-
 cast(Name, Msg) ->
     case (catch gen_server:cast(Name, Msg)) of
         {'EXIT', Reason} ->
-- 
cgit v1.2.3