inets: Modernize code

* Remove debug macros that mimics call trace.
* Remove comments that does not add value.
* Structure code

7 files changed, 352 insertions, 644 deletions

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} ->