2001-03-11
2001-03-11 19:04:10 by Martin Nilsson <mani@lysator.liu.se>
-
3e6f6b1fdb3e7b5392170ee163a10592b697dded
(118 lines)
(+60/-58)
[
Show
| Annotate
]
Branch: 5.2
Changed some comments. werror -> report_*. Added a catch in the really-do-exit-code.
Rev: server/base_server/roxen.pike:1.647
4:
// Per Hedbor, Henrik Grubbström, Pontus Hagland, David Hedbor and others.
// ABS and suicide systems contributed freely by Francesco Chemolli
- constant cvs_version="$Id: roxen.pike,v 1.646 2001/03/11 18:51:30 nilsson Exp $";
+ constant cvs_version="$Id: roxen.pike,v 1.647 2001/03/11 19:04:10 nilsson Exp $";
// Used when running threaded to find out which thread is the backend thread.
Thread.Thread backend_thread;
41:
// --- Debug defines ---
#ifdef SSL3_DEBUG
- # define SSL3_WERR(X) werror("SSL3: "+X+"\n")
+ # define SSL3_WERR(X) report_debug("SSL3: "+X+"\n")
#else
# define SSL3_WERR(X)
#endif
#ifdef THREAD_DEBUG
- # define THREAD_WERR(X) werror("Thread: "+X+"\n")
+ # define THREAD_WERR(X) report_debug("Thread: "+X+"\n")
#else
# define THREAD_WERR(X)
#endif
138:
void create(string reason, int|string|void uid, int|string|void gid)
{
#ifdef PRIVS_DEBUG
- werror(sprintf("Privs(%O, %O, %O)\n"
+ report_debug(sprintf("Privs(%O, %O, %O)\n"
"privs_level: %O\n",
reason, uid, gid, privs_level));
#endif /* PRIVS_DEBUG */
263:
void destroy()
{
#ifdef PRIVS_DEBUG
- werror(sprintf("Privs->destroy()\n"
+ report_debug(sprintf("Privs->destroy()\n"
"privs_level: %O\n",
privs_level));
#endif /* PRIVS_DEBUG */
307: Inside #if defined(HAVE_EFFECTIVE_USER) and #if defined(PRIVS_DEBUG)
#ifdef PRIVS_DEBUG
int uid = geteuid();
if (uid != new_uid) {
- werror("Privs: UID #%d differs from expected #%d\n"
+ report_debug("Privs: UID #%d differs from expected #%d\n"
"%s\n",
uid, new_uid, describe_backtrace(backtrace()));
}
int gid = getegid();
if (gid != new_gid) {
- werror("Privs: GID #%d differs from expected #%d\n"
+ report_debug("Privs: GID #%d differs from expected #%d\n"
"%s\n",
gid, new_gid, describe_backtrace(backtrace()));
}
403:
if(++_recurse > 4)
{
+ catch {
report_notice("Exiting roxen (spurious signals received).\n");
stop_all_configurations();
destruct(cache);
#ifdef THREADS
stop_handler_threads();
#endif /* THREADS */
-
+ };
exit(-1); // Restart.
}
860: Inside #if defined(THREADS)
}
#if 0
- werror ("background run %O (%{%O, %})\n", task[0], task[1] / 1);
+ report_debug ("background run %O (%{%O, %})\n", task[0], task[1] / 1);
#endif
if (task[0]) // Ignore things that have become destructed.
task[0] (@task[1]);
1434:
{
mapping protocols = ([]);
int st = gethrtime();
- werror("Protocol handlers ... ");
+ report_notice("Protocol handlers ... ");
#ifndef DEBUG
class lazy_load( string prog, string name )
{
1475: Inside #if !constant(HTTPLoop.prog)
#if !constant(HTTPLoop.prog)
if( s == "fhttp" ) continue;
#endif
- werror( s+" " );
+ report_notice( s+" " );
catch
{
1497: Inside #if !constant(SSL.sslfile)
continue;
}
#endif
- werror( s+" " );
+ report_notice( s+" " );
catch {
#ifdef DEBUG
protocols[ s ] = (program)("../local/protocols/prot_"+s+".pike");
1506:
#endif
};
}
- werror(" [%.1fms]\n", (gethrtime()-st)/1000.0 );
+ report_notice(" [%.1fms]\n", (gethrtime()-st)/1000.0 );
return protocols;
}
1881: Inside #if ROXEN_COMPAT < 2.2
if(current_user_id_file->stat()[2] != current_user_id_file_last_mod)
restore_current_user_id_number();
current_user_id_number++;
- //werror("New unique id: "+current_user_id_number+"\n");
+
current_user_id_file->seek(0);
current_user_id_file->write((string)current_user_id_number);
current_user_id_file_last_mod = current_user_id_file->stat()[2];
3542: Inside #if defined(TIMERS)
sort( a, b );
reverse(a);
reverse(b);
- werror("Timers:\n");
+ report_notice("Timers:\n");
for( int i = 0; i<sizeof(b); i++ )
- werror( " %-30s : %10.1fms\n", b[i], a[i]/1000.0 );
- werror("\n\n");
+ report_notice( " %-30s : %10.1fms\n", b[i], a[i]/1000.0 );
+ report_notice("\n\n");
}
#endif
3906:
function(RequestID:mapping|int) compile_security_pattern( string pattern,
RoxenModule m )
- //. Parse a security pattern and return a function that when called
- //. will do the checks required by the format.
- //.
- //. The syntax is:
- //.
- //. userdb userdatabase module
- //. authmethod authentication module
- //. realm realm name
- //.
- //. Below, CMD is one of 'allow' and 'deny'
- //.
- //. CMD ip=ip/bits[,ip/bits] [return]
- //. CMD ip=ip:mask[,ip:mask] [return]
- //. CMD ip=pattern [return]
- //.
- //. CMD user=name[,name,...] [return]
- //. CMD group=name[,name,...] [return]
- //.
- //. CMD dns=pattern [return]
- //.
- //. CMD time=<start>-<stop> [return]
- //. times in HH:mm format
- //.
- //. pattern is a glob pattern.
- //.
- //. return means that reaching this command results in immediate
- //. return, only useful for 'allow'.
- //.
- //. 'deny' always implies a return, no futher testing is done if a
- //. 'deny' match.
+ //! Parse a security pattern and return a function that when called
+ //! will do the checks required by the format.
+ //!
+ //! The syntax is:
+ //!
+ //! userdb userdatabase module
+ //! authmethod authentication module
+ //! realm realm name
+ //!
+ //! Below, CMD is one of 'allow' and 'deny'
+ //!
+ //! CMD ip=ip/bits[,ip/bits] [return]
+ //! CMD ip=ip:mask[,ip:mask] [return]
+ //! CMD ip=pattern [return]
+ //!
+ //! CMD user=name[,name,...] [return]
+ //! CMD group=name[,name,...] [return]
+ //!
+ //! CMD dns=pattern [return]
+ //!
+ //! CMD time=<start>-<stop> [return]
+ //! times in HH:mm format
+ //!
+ //! pattern is a glob pattern.
+ //!
+ //! return means that reaching this command results in immediate
+ //! return, only useful for 'allow'.
+ //!
+ //! 'deny' always implies a return, no futher testing is done if a
+ //! 'deny' match.
{
string code = "";
array variables = ({ " object userdb_module",