Branch: Tag:

1997-04-28

1997-04-28 16:48:20 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Enabled MODULE_LEVEL_SECURITY tests again

Rev: server/base_server/configuration.pike:1.23

1: - string cvs_version = "$Id: configuration.pike,v 1.22 1997/04/13 23:25:40 peter Exp $"; + string cvs_version = "$Id: configuration.pike,v 1.23 1997/04/28 16:48:20 grubba Exp $";   #include <module.h>   #include <roxen.h>   /* A configuration.. */
637:    return res +"</table>";   }    - public string *userinfo(string u, object id) + public string *userinfo(string u, object|void id)   {    if(auth_module) return auth_module->userinfo(u);   }    - public string *userlist(object id) + public string *userlist(object|void id)   {    if(auth_module) return auth_module->userlist();   }    - public string *user_from_uid(int u, object id) + public string *user_from_uid(int u, object|void id)   {    if(auth_module)    return auth_module->user_from_uid(u);
1031:       if(!search(file, loc))    { - //#ifdef MODULE_LEVEL_SECURITY - // if(check_security(tmp[1], id)) continue; - //#endif + #ifdef MODULE_LEVEL_SECURITY +  if(check_security(tmp[1], id)) continue; + #endif    if(d=function_object(tmp[1])->find_dir(file[strlen(loc)..1000000], id))    dir |= d;    } else {
1067:    return ({ 0, -3, 0, 0, 0, 0, 0, 0, 0, 0, 0 });    if(!search(file, loc))    { - //#ifdef MODULE_LEVEL_SECURITY - // if(check_security(tmp[1], id)) continue; - //#endif + #ifdef MODULE_LEVEL_SECURITY +  if(check_security(tmp[1], id)) continue; + #endif    if(s=function_object(tmp[1])->stat_file(file[strlen(loc)..], id))    return s;    }
1217:    init_log_file();    map(indices(open_ports), do_dest);    -  erro = catch { +     perror("Opening ports for "+query_name()+" "); -  foreach(query("Ports"), port ) -  { +  foreach(query("Ports"), port ) { +  erro = catch {    array tmp;    function rp;    array old = port;
1241:    err++;    } else    open_ports[o]=old; -  } -  perror("\n"); +     }; -  if(erro) -  { +  if(erro) {    perror("Error:\n"+describe_backtrace(erro));    } -  +  perror("\n"); +  } +     if(!num && sizeof(query("Ports")))    {    if(err == sizeof(query("Ports")))