httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Dean Gaudet <dgau...@hyperreal.org>
Subject cvs commit: apachen/src/modules/standard mod_access.c mod_actions.c mod_asis.c mod_auth.c mod_auth_anon.c mod_auth_db.c mod_auth_dbm.c mod_autoindex.c mod_cern_meta.c mod_cgi.c mod_digest.c mod_expires.c mod_imap.c mod_include.c mod_mime_magic.c mod_negotiation.c mod_rewrite.c mod_speling.c mod_status.c mod_unique_id.c
Date Tue, 07 Oct 1997 05:27:48 GMT
dgaudet     97/10/06 22:27:46

  Modified:    src/main conf.h http_core.c http_log.c http_log.h
                        http_protocol.c http_request.c rfc1413.c
                        util_script.c
               src/modules/standard mod_access.c mod_actions.c mod_asis.c
                        mod_auth.c mod_auth_anon.c mod_auth_db.c
                        mod_auth_dbm.c mod_autoindex.c mod_cern_meta.c
                        mod_cgi.c mod_digest.c mod_expires.c mod_imap.c
                        mod_include.c mod_mime_magic.c mod_negotiation.c
                        mod_rewrite.c mod_speling.c mod_status.c
                        mod_unique_id.c
  Log:
  Insert APLOG_NOERRNO where appropriate.
  
  Remove needless errstr buffers, can just pass it all to aplog_errno.
  
  Add __attribute__((format(printf,5,6))) to aplog_error so that we get
  useful -Wall warnings about bad printf lists to aplog_error.
  
  #define __attribute__(__x)  to be nothing on non-__GNUC__ compilers.
  
  Clean up use of TRANS in http_log.[ch].
  
  Revision  Changes    Path
  1.145     +5 -1      apachen/src/main/conf.h
  
  Index: conf.h
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/conf.h,v
  retrieving revision 1.144
  retrieving revision 1.145
  diff -u -r1.144 -r1.145
  --- conf.h	1997/10/06 02:56:24	1.144
  +++ conf.h	1997/10/07 05:27:03	1.145
  @@ -837,9 +837,13 @@
   #define ap_inet_addr inet_addr
   #endif
   
  -/* so that we can use inline on some critical functions */
  +/* So that we can use inline on some critical functions, and use
  + * GNUC attributes (such as to get -Wall warnings for printf-like
  + * functions).
  + */
   #if !defined(__GNUC__)
   #define ap_inline
  +#define __attribute__(__x)
   #else
   #define ap_inline __inline__
   #endif
  
  
  
  1.124     +6 -6      apachen/src/main/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/http_core.c,v
  retrieving revision 1.123
  retrieving revision 1.124
  diff -u -r1.123 -r1.124
  --- http_core.c	1997/09/25 01:03:21	1.123
  +++ http_core.c	1997/10/07 05:27:04	1.124
  @@ -1265,7 +1265,7 @@
   	else
   	    cur = atol(str);
       else {
  -	aplog_error(APLOG_MARK, APLOG_ERR, cmd->server,
  +	aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, cmd->server,
   		    "Invalid parameters for %s", cmd->cmd->name);
   	return;
       }
  @@ -1277,7 +1277,7 @@
       if (geteuid()) {
   	limit->rlim_cur = cur;
   	if (max)
  -	    aplog_error(APLOG_MARK, APLOG_ERR, cmd->server,
  +	    aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, cmd->server,
   			"Must be uid 0 to raise maximum %s", cmd->cmd->name);
       }
       else {
  @@ -1293,7 +1293,7 @@
   static const char *no_set_limit (cmd_parms *cmd, core_dir_config *conf,
   				 char *arg, char *arg2)
   {
  -    aplog_error(APLOG_MARK, APLOG_ERR, cmd->server,
  +    aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, cmd->server,
   		"%s not supported on this platform", cmd->cmd->name);
       return NULL;
   }
  @@ -1569,7 +1569,7 @@
     
       if (r->proxyreq) return HTTP_FORBIDDEN;
       if ((r->uri[0] != '/') && strcmp(r->uri, "*")) {
  -	aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +	aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
   		    "Invalid URI in request %s", r->the_request);
   	return BAD_REQUEST;
       }
  @@ -1631,7 +1631,7 @@
       r->allowed |= (1 << M_OPTIONS);
   
       if (r->method_number == M_INVALID) {
  -	aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +	aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
   		    "Invalid method in request %s", r->the_request);
   	return NOT_IMPLEMENTED;
       }
  @@ -1641,7 +1641,7 @@
       if (r->finfo.st_mode == 0 || (r->path_info && *r->path_info)) {
   	aplog_error(APLOG_MARK, APLOG_ERR, r->server, "File does not exist: %s",
   		    r->path_info ? pstrcat(r->pool, r->filename, r->path_info, NULL)
  -		    : r->filename, r);
  +		    : r->filename);
   	return NOT_FOUND;
       }
       if (r->method_number != M_GET) return METHOD_NOT_ALLOWED;
  
  
  
  1.40      +15 -16    apachen/src/main/http_log.c
  
  Index: http_log.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/http_log.c,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- http_log.c	1997/10/06 05:21:59	1.39
  +++ http_log.c	1997/10/07 05:27:05	1.40
  @@ -67,10 +67,14 @@
   
   #include <stdarg.h>
   
  +typedef struct {
  +	char	*t_name;
  +	int	t_val;
  +} TRANS;
   
   #ifdef HAVE_SYSLOG
   
  -static TRANS facilities[] = {
  +static const TRANS facilities[] = {
       {"auth",	LOG_AUTH},
   #ifdef LOG_AUTHPRIV
       {"authpriv",LOG_AUTHPRIV},
  @@ -133,7 +137,7 @@
   };
   #endif
   
  -static TRANS priorities[] = {
  +static const TRANS priorities[] = {
       {"emerg",	APLOG_EMERG},
       {"alert",	APLOG_ALERT},
       {"crit",	APLOG_CRIT},
  @@ -174,10 +178,6 @@
   void open_error_log (server_rec *s, pool *p)
   {
       char *fname;
  -#ifdef HAVE_SYSLOG
  -    register TRANS *fac;
  -#endif
  -
   
       if (*s->error_fname == '|') {
   	FILE *dummy;
  @@ -195,6 +195,8 @@
   #ifdef HAVE_SYSLOG
       else if (!strncasecmp(s->error_fname, "syslog", 6)) {
   	if ((fname = strchr(s->error_fname, ':'))) {
  +	    const TRANS *fac;
  +
   	    fname++;
   	    for (fac = facilities; fac->t_name; fac++) {
   		if (!strcasecmp(fname, fac->t_name)) {
  @@ -236,8 +238,7 @@
   	fflush(stderr);
   	if (dup2(fileno(s_main->error_log), 2) == -1) {
   	    aplog_error(APLOG_MARK, APLOG_CRIT, s_main,
  -		"unable to replace stderr with error_log: %s",
  -		strerror(errno));
  +		"unable to replace stderr with error_log");
   	} else {
   	    replace_stderr = 0;
   	}
  @@ -248,8 +249,7 @@
        */
       if (replace_stderr && freopen("/dev/null", "w", stderr) == NULL) {
   	aplog_error(APLOG_MARK, APLOG_CRIT, s_main,
  -	    "unable to replace stderr with /dev/null: %s",
  -	    strerror(errno));
  +	    "unable to replace stderr with /dev/null");
       }
   #endif
   
  @@ -278,7 +278,6 @@
   {
       va_list args;
       char errstr[MAX_STRING_LEN];
  -    static TRANS *pname = priorities;
       size_t len;
       int save_errno = errno;
       FILE *logf;
  @@ -313,15 +312,15 @@
       }
   
       len += ap_snprintf(errstr + len, sizeof(errstr) - len,
  -	    "[%s] ", pname[level & APLOG_LEVELMASK].t_name);
  +	    "[%s] ", priorities[level & APLOG_LEVELMASK].t_name);
   
  -    if (!(level & APLOG_NOERRNO)) {
  +    if (file && (level & APLOG_LEVELMASK) == APLOG_DEBUG) {
   	len += ap_snprintf(errstr + len, sizeof(errstr) - len,
  -		"%d: %s: ", save_errno, strerror(save_errno));
  +		"%s(%d): ", file, line);
       }
  -    if (file && (level & APLOG_LEVELMASK) == APLOG_DEBUG) {
  +    if (!(level & APLOG_NOERRNO)) {
   	len += ap_snprintf(errstr + len, sizeof(errstr) - len,
  -		"%s: %d: ", file, line);
  +		"(%d)%s: ", save_errno, strerror(save_errno));
       }
   
       va_start(args, fmt);
  
  
  
  1.18      +4 -7      apachen/src/main/http_log.h
  
  Index: http_log.h
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/http_log.h,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- http_log.h	1997/10/06 05:21:59	1.17
  +++ http_log.h	1997/10/07 05:27:05	1.18
  @@ -87,21 +87,18 @@
   
   #define APLOG_MARK	__FILE__,__LINE__
   
  -typedef struct _trans {
  -	char	*t_name;
  -	int	t_val;
  -} TRANS;
  -
   void open_logs (server_rec *, pool *p);
   API_EXPORT(void) aplog_error(const char *file, int line, int level,
  -			     const server_rec *s, const char *fmt, ...);
  +			     const server_rec *s, const char *fmt, ...)
  +			    __attribute__((format(printf,5,6)));
   API_EXPORT(void) error_log2stderr (server_rec *);     
   
   void log_pid (pool *p, char *fname);
   API_EXPORT(void) log_error(const char *err, server_rec *s);
   API_EXPORT(void) log_unixerr(const char *routine, const char *file,
   			     const char *msg, server_rec *s);
  -API_EXPORT(void) log_printf(const server_rec *s, const char *fmt, ...);
  +API_EXPORT(void) log_printf(const server_rec *s, const char *fmt, ...)
  +			    __attribute__((format(printf,2,3)));
   API_EXPORT(void) log_reason(const char *reason, const char *fname,
   			    request_rec *r);
   
  
  
  
  1.165     +8 -8      apachen/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/http_protocol.c,v
  retrieving revision 1.164
  retrieving revision 1.165
  diff -u -r1.164 -r1.165
  --- http_protocol.c	1997/10/05 08:37:44	1.164
  +++ http_protocol.c	1997/10/07 05:27:06	1.165
  @@ -709,7 +709,7 @@
   #endif                          /* SIGUSR1 */
       bsetflag(conn->client, B_SAFEREAD, 0);
       if (len == (HUGE_STRING_LEN - 1)) {
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                       "request failed for %s, reason: URI too long",
               get_remote_host(r->connection, r->per_dir_config, REMOTE_NAME));
           r->status = HTTP_REQUEST_URI_TOO_LARGE;
  @@ -1046,8 +1046,8 @@
           return DECLINED;
   
       if (!auth_name(r)) {
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server, "need AuthName: %s",
  -                    r->uri);
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR,
  +		    r->server, "need AuthName: %s", r->uri);
           return SERVER_ERROR;
       }
   
  @@ -1058,7 +1058,7 @@
   
       if (strcmp(getword(r->pool, &auth_line, ' '), "Basic")) {
           /* Client tried to authenticate using wrong auth scheme */
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                       "client used wrong authentication scheme: %s", r->uri);
           note_basic_auth_failure(r);
           return AUTH_REQUIRED;
  @@ -1461,12 +1461,12 @@
   
       if (tenc) {
           if (strcasecmp(tenc, "chunked")) {
  -            aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +            aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                           "Unknown Transfer-Encoding %s", tenc);
               return HTTP_BAD_REQUEST;
           }
           if (r->read_body == REQUEST_CHUNKED_ERROR) {
  -            aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +            aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                           "chunked Transfer-Encoding forbidden: %s", r->uri);
               return (lenp) ? HTTP_BAD_REQUEST : HTTP_LENGTH_REQUIRED;
           }
  @@ -1479,7 +1479,7 @@
           while (isdigit(*pos) || isspace(*pos))
               ++pos;
           if (*pos != '\0') {
  -            aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +            aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                           "Invalid Content-Length %s", lenp);
               return HTTP_BAD_REQUEST;
           }
  @@ -1489,7 +1489,7 @@
   
       if ((r->read_body == REQUEST_NO_BODY) &&
           (r->read_chunked || (r->remaining > 0))) {
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                       "%s with body is not allowed for %s", r->method, r->uri);
           return HTTP_REQUEST_ENTITY_TOO_LARGE;
       }
  
  
  
  1.88      +9 -9      apachen/src/main/http_request.c
  
  Index: http_request.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/http_request.c,v
  retrieving revision 1.87
  retrieving revision 1.88
  diff -u -r1.87 -r1.88
  --- http_request.c	1997/10/06 05:35:06	1.87
  +++ http_request.c	1997/10/07 05:27:08	1.88
  @@ -98,7 +98,7 @@
           || S_ISLNK(r->finfo.st_mode)) {
           return OK;
       }
  -    aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +    aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                   "object is not a file, directory or symlink: %s",
                   r->filename);
       return HTTP_FORBIDDEN;
  @@ -224,7 +224,7 @@
                   aplog_error(APLOG_MARK, APLOG_ERR, r->server,
                               "access to %s failed for %s", r->uri,
                               get_remote_host(r->connection, r->per_dir_config,
  -                                            REMOTE_NAME));
  +                                            REMOTE_NOLOOKUP));
               return HTTP_FORBIDDEN;
           }
   #else
  @@ -386,7 +386,7 @@
            */
   
           if ((res = check_symlinks(test_dirname, core_dir->opts))) {
  -            aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +            aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                           "Symbolic link not allowed: %s", test_dirname);
               return res;
           }
  @@ -485,7 +485,7 @@
        */
       if (!S_ISDIR(r->finfo.st_mode)
           && (res = check_symlinks(r->filename, allow_options(r)))) {
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                       "Symbolic link not allowed: %s", r->filename);
           return res;
       }
  @@ -768,7 +768,7 @@
           }
           else {
               if ((res = check_symlinks(rnew->filename, allow_options(rnew)))) {
  -                aplog_error(APLOG_MARK, APLOG_ERR, rnew->server,
  +                aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, rnew->server,
                               "Symbolic link not allowed: %s", rnew->filename);
                   rnew->status = res;
                   return rnew;
  @@ -919,7 +919,7 @@
                * dying with a recursive server error...
                */
               recursive_error = SERVER_ERROR;
  -            aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +            aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                           "Invalid error redirection directive: %s",
                           custom_response);
           }
  @@ -930,7 +930,7 @@
   static void decl_die(int status, char *phase, request_rec *r)
   {
       if (status == DECLINED) {
  -        aplog_error(APLOG_MARK, APLOG_CRIT, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_CRIT, r->server,
                       "configuration error:  couldn't %s: %s", phase, r->uri);
           die(SERVER_ERROR, r);
       }
  @@ -973,7 +973,7 @@
            * headers!  Have to dink things even to make sure the error message
            * comes through...
            */
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                       "client sent illegal HTTP/0.9 request: %s", r->uri);
           r->header_only = 0;
           die(BAD_REQUEST, r);
  @@ -987,7 +987,7 @@
            * hostname, either with a full URL or a Host: header. We therefore
            * need to (as per the 1.1 spec) send an error
            */
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                  "client sent HTTP/1.1 request without hostname: %s", r->uri);
           die(BAD_REQUEST, r);
           return;
  
  
  
  1.17      +1 -1      apachen/src/main/rfc1413.c
  
  Index: rfc1413.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/rfc1413.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- rfc1413.c	1997/09/16 00:35:42	1.16
  +++ rfc1413.c	1997/10/07 05:27:09	1.17
  @@ -123,7 +123,7 @@
       if (bind(sock, (struct sockaddr *) &our_query_sin,
   	     sizeof(struct sockaddr_in)) < 0) {
   	aplog_error(APLOG_MARK, APLOG_CRIT, srv,
  -		    "bind: rfc1413: Error binding to local port", srv);
  +		    "bind: rfc1413: Error binding to local port");
   	return -1;
       }
   
  
  
  
  1.76      +8 -18     apachen/src/main/util_script.c
  
  Index: util_script.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/util_script.c,v
  retrieving revision 1.75
  retrieving revision 1.76
  diff -u -r1.75 -r1.76
  --- util_script.c	1997/09/26 03:52:12	1.75
  +++ util_script.c	1997/10/07 05:27:11	1.76
  @@ -358,7 +358,7 @@
   
   	if ((*getsfunc) (w, MAX_STRING_LEN - 1, getsfunc_data) == 0) {
   	    kill_timeout(r);
  -	    aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +	    aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
   			"Premature end of script headers: %s", r->filename);
   	    return SERVER_ERROR;
   	}
  @@ -408,7 +408,7 @@
   		    continue;
   
   	    kill_timeout(r);
  -	    aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +	    aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
   			"%s: %s", malformed, r->filename);
   	    return SERVER_ERROR;
   	}
  @@ -597,12 +597,8 @@
   	FILE *program;
   	program = fopen(r->filename, "r");
   	if (!program) {
  -	    char err_string[HUGE_STRING_LEN];
  -	    ap_snprintf(err_string, sizeof(err_string), "open of %s failed", r->filename);
  -
  -	    /* write(2, err_string, strlen(err_string)); */
  -	    /* exit(0); */
  -	    aplog_error(APLOG_MARK, APLOG_ERR, r->server, "fopen: %s", err_string);
  +	    aplog_error(APLOG_MARK, APLOG_ERR, r->server, "fopen(%s) failed",
  +			r->filename);
   	    return (pid);
   	}
   	fgets(interpreter, sizeof(interpreter), program);
  @@ -694,20 +690,14 @@
   	if (!is_exe) {
   	    program = fopen(r->filename, "rb");
   	    if (!program) {
  -		char err_string[HUGE_STRING_LEN];
  -		ap_snprintf(err_string, sizeof(err_string),
  -			    "open of %s failed", r->filename);
  -		/* write(2, err_string, strlen(err_string)); */
  -		/* exit(0); */
  -		aplog_error(APLOG_MARK, APLOG_ERR, r->server, "fopen: %s", err_string);
  +		aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +			    "fopen(%s) failed", r->filename);
   		return (pid);
   	    }
   	    sz = fread(interpreter, 1, sizeof(interpreter) - 1, program);
   	    if (sz < 0) {
  -		char err_string[HUGE_STRING_LEN];
  -		ap_snprintf(err_string, sizeof(err_string),
  -			    "open of %s failed", r->filename);
  -		aplog_error(APLOG_MARK, APLOG_ERR, r->server, "fread: %s", err_string);
  +		aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +			    "fread of %s failed", r->filename);
   		fclose(program);
   		return (pid);
   	    }
  
  
  
  1.26      +1 -1      apachen/src/modules/standard/mod_access.c
  
  Index: mod_access.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_access.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- mod_access.c	1997/09/16 05:31:56	1.25
  +++ mod_access.c	1997/10/07 05:27:19	1.26
  @@ -359,7 +359,7 @@
   
       if (ret == FORBIDDEN
   	&& (satisfies(r) != SATISFY_ANY || !some_auth_required(r))) {
  -	aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +	aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
   		  "Client denied by server configuration: %s", r->filename);
       }
   
  
  
  
  1.19      +1 -1      apachen/src/modules/standard/mod_actions.c
  
  Index: mod_actions.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_actions.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- mod_actions.c	1997/09/16 05:31:56	1.18
  +++ mod_actions.c	1997/10/07 05:27:20	1.19
  @@ -186,7 +186,7 @@
   		       action ? action : default_type(r)))) {
   	script = t;
   	if (r->finfo.st_mode == 0) {
  -	    aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +	    aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
   			"File does not exist: %s", r->filename);
   	    return NOT_FOUND;
   	}
  
  
  
  1.21      +2 -2      apachen/src/modules/standard/mod_asis.c
  
  Index: mod_asis.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_asis.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- mod_asis.c	1997/09/16 05:31:56	1.20
  +++ mod_asis.c	1997/10/07 05:27:21	1.21
  @@ -66,8 +66,8 @@
       if (r->method_number != M_GET)
   	return DECLINED;
       if (r->finfo.st_mode == 0) {
  -	aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  -		    "File does not exist", r->filename);
  +	aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +		    "File does not exist: %s", r->filename);
   	return NOT_FOUND;
       }
   
  
  
  
  1.28      +4 -5      apachen/src/modules/standard/mod_auth.c
  
  Index: mod_auth.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_auth.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- mod_auth.c	1997/09/18 07:59:13	1.27
  +++ mod_auth.c	1997/10/07 05:27:21	1.28
  @@ -194,7 +194,6 @@
       (auth_config_rec *) get_module_config(r->per_dir_config, &auth_module);
       conn_rec *c = r->connection;
       char *sent_pw, *real_pw;
  -    char errstr[MAX_STRING_LEN];
       int res;
   
       if ((res = get_basic_auth_pw(r, &sent_pw)))
  @@ -206,15 +205,15 @@
       if (!(real_pw = get_pw(r, c->user, sec->auth_pwfile))) {
   	if (!(sec->auth_authoritative))
   	    return DECLINED;
  -	ap_snprintf(errstr, sizeof(errstr), "user %s not found", c->user);
  -	aplog_error(APLOG_MARK, APLOG_ERR, r->server, "%s: %s", errstr, r->uri);
  +	aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +		    "user %s not found: %s", c->user, r->uri);
   	note_basic_auth_failure(r);
   	return AUTH_REQUIRED;
       }
       /* anyone know where the prototype for crypt is? */
       if (strcmp(real_pw, (char *) crypt(sent_pw, real_pw))) {
  -	ap_snprintf(errstr, sizeof(errstr), "user %s: password mismatch", c->user);
  -	aplog_error(APLOG_MARK, APLOG_ERR, r->server, "%s: %s", errstr, r->uri);
  +	aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +		    "user %s: password mismatch: %s", c->user, r->uri);
   	note_basic_auth_failure(r);
   	return AUTH_REQUIRED;
       }
  
  
  
  1.26      +3 -5      apachen/src/modules/standard/mod_auth_anon.c
  
  Index: mod_auth_anon.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_auth_anon.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- mod_auth_anon.c	1997/09/18 07:59:14	1.25
  +++ mod_auth_anon.c	1997/10/07 05:27:22	1.26
  @@ -213,7 +213,6 @@
   					       &anon_auth_module);
       conn_rec *c = r->connection;
       char *send_pw;
  -    char errstr[MAX_STRING_LEN];
       int res = DECLINED;
   
       if ((res = get_basic_auth_pw(r, &send_pw)))
  @@ -248,18 +247,17 @@
   	       || ((strpbrk("@", send_pw) != NULL)
   		   && (strpbrk(".", send_pw) != NULL)))) {
   	if (sec->auth_anon_logemail && is_initial_req(r)) {
  -	    ap_snprintf(errstr, sizeof(errstr), "Anonymous: Passwd <%s> Accepted",
  +	    aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, r->server,
  +			"Anonymous: Passwd <%s> Accepted",
   			send_pw ? send_pw : "\'none\'");
  -	    aplog_error(APLOG_MARK, APLOG_ERR, r->server, errstr);
   	}
   	return OK;
       }
       else {
   	if (sec->auth_anon_authoritative) {
  -	    ap_snprintf(errstr, sizeof(errstr),
  +	    aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
   			"Anonymous: Authoritative, Passwd <%s> not accepted",
   			send_pw ? send_pw : "\'none\'");
  -	    aplog_error(APLOG_MARK, APLOG_ERR, r->server, errstr);
   	    return AUTH_REQUIRED;
   	}
   	/* Drop out the bottom to return DECLINED */
  
  
  
  1.24      +9 -15     apachen/src/modules/standard/mod_auth_db.c
  
  Index: mod_auth_db.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_auth_db.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- mod_auth_db.c	1997/09/18 07:59:14	1.23
  +++ mod_auth_db.c	1997/10/07 05:27:22	1.24
  @@ -196,7 +196,6 @@
   					     &db_auth_module);
       conn_rec *c = r->connection;
       char *sent_pw, *real_pw, *colon_pw;
  -    char errstr[MAX_STRING_LEN];
       int res;
   
       if ((res = get_basic_auth_pw(r, &sent_pw)))
  @@ -208,8 +207,8 @@
       if (!(real_pw = get_db_pw(r, c->user, sec->auth_dbpwfile))) {
   	if (!(sec->auth_dbauthoritative))
   	    return DECLINED;
  -	ap_snprintf(errstr, sizeof(errstr), "DB user %s not found", c->user);
  -	aplog_error(APLOG_MARK, APLOG_ERR, r->server, "%s: %s", errstr, r->filename);
  +	aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +		    "DB user %s not found: %s", c->user, r->filename);
   	note_basic_auth_failure(r);
   	return AUTH_REQUIRED;
       }
  @@ -219,8 +218,8 @@
   	*colon_pw = '\0';
       /* anyone know where the prototype for crypt is? */
       if (strcmp(real_pw, (char *) crypt(sent_pw, real_pw))) {
  -	ap_snprintf(errstr, sizeof(errstr), "user %s: password mismatch", c->user);
  -	aplog_error(APLOG_MARK, APLOG_ERR, r->server, "%s: %s", errstr, r->uri);
  +	aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +		    "DB user %s: password mismatch: %s", c->user, r->uri);
   	note_basic_auth_failure(r);
   	return AUTH_REQUIRED;
       }
  @@ -236,7 +235,6 @@
   					     &db_auth_module);
       char *user = r->connection->user;
       int m = r->method_number;
  -    char errstr[MAX_STRING_LEN];
   
       array_header *reqs_arr = requires(r);
       require_line *reqs = reqs_arr ? (require_line *) reqs_arr->elts : NULL;
  @@ -265,11 +263,9 @@
   	    if (!(groups = get_db_grp(r, user, sec->auth_dbgrpfile))) {
   		if (!(sec->auth_dbauthoritative))
   		    return DECLINED;
  -		ap_snprintf(errstr, sizeof(errstr),
  -			    "user %s not in DB group file %s",
  -			    user, sec->auth_dbgrpfile);
  -		aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  -			    "%s: %s", errstr, r->filename);
  +		aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +			    "user %s not in DB group file %s: %s",
  +			    user, sec->auth_dbgrpfile, r->filename);
   		note_basic_auth_failure(r);
   		return AUTH_REQUIRED;
   	    }
  @@ -283,10 +279,8 @@
   			return OK;
   		}
   	    }
  -	    ap_snprintf(errstr, sizeof(errstr),
  -			"user %s not in right group", user);
  -	    aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  -			"%s: %s", errstr, r->filename);
  +	    aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +			"user %s not in right group: %s", user, r->filename);
   	    note_basic_auth_failure(r);
   	    return AUTH_REQUIRED;
   	}
  
  
  
  1.30      +10 -16    apachen/src/modules/standard/mod_auth_dbm.c
  
  Index: mod_auth_dbm.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_auth_dbm.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- mod_auth_dbm.c	1997/09/18 07:59:14	1.29
  +++ mod_auth_dbm.c	1997/10/07 05:27:23	1.30
  @@ -220,7 +220,6 @@
   					      &dbm_auth_module);
       conn_rec *c = r->connection;
       char *sent_pw, *real_pw, *colon_pw;
  -    char errstr[MAX_STRING_LEN];
       int res;
   
       if ((res = get_basic_auth_pw(r, &sent_pw)))
  @@ -232,8 +231,8 @@
       if (!(real_pw = get_dbm_pw(r, c->user, sec->auth_dbmpwfile))) {
   	if (!(sec->auth_dbmauthoritative))
   	    return DECLINED;
  -	ap_snprintf(errstr, sizeof(errstr), "DBM user %s not found", c->user);
  -	aplog_error(APLOG_MARK, APLOG_ERR, r->server, "%s: %s", errstr, r->filename);
  +	aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +		    "DBM user %s not found: %s", c->user, r->filename);
   	note_basic_auth_failure(r);
   	return AUTH_REQUIRED;
       }
  @@ -243,9 +242,8 @@
   	*colon_pw = '\0';
       /* anyone know where the prototype for crypt is? */
       if (strcmp(real_pw, (char *) crypt(sent_pw, real_pw))) {
  -	ap_snprintf(errstr, sizeof(errstr),
  -		    "user %s: password mismatch", c->user);
  -	aplog_error(APLOG_MARK, APLOG_ERR, r->server, "%s: %s", errstr, r->uri);
  +	aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +		    "user %s: password mismatch: %s", c->user, r->uri);
   	note_basic_auth_failure(r);
   	return AUTH_REQUIRED;
       }
  @@ -261,7 +259,6 @@
   					      &dbm_auth_module);
       char *user = r->connection->user;
       int m = r->method_number;
  -    char errstr[MAX_STRING_LEN];
   
       array_header *reqs_arr = requires(r);
       require_line *reqs = reqs_arr ? (require_line *) reqs_arr->elts : NULL;
  @@ -290,11 +287,9 @@
   	    if (!(groups = get_dbm_grp(r, user, sec->auth_dbmgrpfile))) {
   		if (!(sec->auth_dbmauthoritative))
   		    return DECLINED;
  -		ap_snprintf(errstr, sizeof(errstr),
  -			    "user %s not in DBM group file %s",
  -			    user, sec->auth_dbmgrpfile);
  -		aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  -			    "%s: %s", errstr, r->filename);
  +		aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +			    "user %s not in DBM group file %s: %s",
  +			    user, sec->auth_dbmgrpfile, r->filename);
   		note_basic_auth_failure(r);
   		return AUTH_REQUIRED;
   	    }
  @@ -308,10 +303,9 @@
   			return OK;
   		}
   	    }
  -	    ap_snprintf(errstr, sizeof(errstr),
  -			"user %s not in right group", user);
  -	    aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  -			"%s: %s", errstr, r->filename);
  +	    aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +			"user %s not in right group: %s",
  +			user, r->filename);
   	    note_basic_auth_failure(r);
   	    return AUTH_REQUIRED;
   	}
  
  
  
  1.50      +1 -1      apachen/src/modules/standard/mod_autoindex.c
  
  Index: mod_autoindex.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_autoindex.c,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- mod_autoindex.c	1997/09/26 02:59:10	1.49
  +++ mod_autoindex.c	1997/10/07 05:27:23	1.50
  @@ -1120,7 +1120,7 @@
   	return index_directory(r, d);
       }
       else {
  -	aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +	aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
   		    "Directory index forbidden by rule: %s", r->filename);
   	return HTTP_FORBIDDEN;
       }
  
  
  
  1.21      +3 -3      apachen/src/modules/standard/mod_cern_meta.c
  
  Index: mod_cern_meta.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_cern_meta.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- mod_cern_meta.c	1997/09/18 08:12:22	1.20
  +++ mod_cern_meta.c	1997/10/07 05:27:24	1.21
  @@ -245,7 +245,7 @@
   	/* if we see a bogus header don't ignore it. Shout and scream */
   
   	if (!(l = strchr(w, ':'))) {
  -	    aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +	    aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
   			"malformed header in meta file: %s", r->filename);
   	    return SERVER_ERROR;
   	}
  @@ -316,8 +316,8 @@
       }
       else {
   	/* no last slash, buh?! */
  -	aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  -		    "internal error in mod_cern_meta", r->filename);
  +	aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +		    "internal error in mod_cern_meta: %s", r->filename);
   	/* should really barf, but hey, let's be friends... */
   	return DECLINED;
       };
  
  
  
  1.59      +11 -18    apachen/src/modules/standard/mod_cgi.c
  
  Index: mod_cgi.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_cgi.c,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- mod_cgi.c	1997/10/04 18:45:30	1.58
  +++ mod_cgi.c	1997/10/07 05:27:24	1.59
  @@ -159,11 +159,12 @@
   };
   
   static int log_scripterror(request_rec *r, cgi_server_conf * conf, int ret,
  -			   char *error)
  +			   int show_errno, char *error)
   {
       FILE *f;
   
  -    aplog_error(APLOG_MARK, APLOG_ERR, r->server, error, r->filename);
  +    aplog_error(APLOG_MARK, show_errno|APLOG_ERR, r->server, error,
  +		r->filename);
   
       if (!conf->logname ||
   	((stat(server_root_relative(r->pool, conf->logname), &r->finfo) == 0)
  @@ -291,9 +292,6 @@
   #endif
   
       char **env;
  -#ifndef WIN32
  -    char err_string[HUGE_STRING_LEN];
  -#endif
   
   #ifdef DEBUG_CGI
       fprintf(dbg, "Attempting to exec %s as %sCGI child (argv0 = %s)\n",
  @@ -329,16 +327,11 @@
        *
        * Oh, well.  Muddle through as best we can...
        *
  -     * (NB we can't use aplog_error, or anything like that, because we
  -     * just closed the file descriptor which r->server->error_log
  -     * was tied to in cleanup_for_exec().  It's only available on stderr
  -     * now, so that's what we use).
  +     * Note that only stderr is available at this point, so don't pass in
  +     * a server to aplog_error.
        */
   
  -    ap_snprintf(err_string, sizeof(err_string),
  -		"exec of %s failed, reason: %s (errno = %d)\n",
  -		r->filename, strerror(errno), errno);
  -    write(STDERR_FILENO, err_string, strlen(err_string));
  +    aplog_error(APLOG_MARK, APLOG_ERR, NULL, "exec of %s failed", r->filename);
       exit(0);
       /* NOT REACHED */
       return (0);
  @@ -374,14 +367,14 @@
       nph = !(strncmp(argv0, "nph-", 4));
   
       if (!(allow_options(r) & OPT_EXECCGI) && !is_scriptaliased(r))
  -	return log_scripterror(r, conf, FORBIDDEN,
  +	return log_scripterror(r, conf, FORBIDDEN, APLOG_NOERRNO,
   			       "Options ExecCGI is off in this directory");
       if (nph && is_included)
  -	return log_scripterror(r, conf, FORBIDDEN,
  +	return log_scripterror(r, conf, FORBIDDEN, APLOG_NOERRNO,
   			       "attempt to include NPH CGI script");
   
       if (S_ISDIR(r->finfo.st_mode))
  -	return log_scripterror(r, conf, FORBIDDEN,
  +	return log_scripterror(r, conf, FORBIDDEN, APLOG_NOERRNO,
   			       "attempt to invoke directory as script");
   #if defined(__EMX__) || defined(WIN32)
       /* Allow for cgi files without the .EXE extension on them under OS/2 */
  @@ -391,13 +384,13 @@
   	r->filename = pstrcat(r->pool, r->filename, ".EXE", NULL);
   
   	if ((stat(r->filename, &statbuf) != 0) || (!S_ISREG(statbuf.st_mode))) {
  -	    return log_scripterror(r, conf, NOT_FOUND,
  +	    return log_scripterror(r, conf, NOT_FOUND, 0,
   				   "script not found or unable to stat");
   	}
       }
   #else
       if (r->finfo.st_mode == 0)
  -	return log_scripterror(r, conf, NOT_FOUND,
  +	return log_scripterror(r, conf, NOT_FOUND, APLOG_NOERRNO,
   			       "script not found or unable to stat");
   #endif
   
  
  
  
  1.24      +7 -7      apachen/src/modules/standard/mod_digest.c
  
  Index: mod_digest.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_digest.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- mod_digest.c	1997/09/18 08:12:23	1.23
  +++ mod_digest.c	1997/10/07 05:27:25	1.24
  @@ -140,7 +140,8 @@
   	return DECLINED;
   
       if (!auth_name(r)) {
  -	aplog_error(APLOG_MARK, APLOG_ERR, r->server, "need AuthName: %s", r->uri);
  +	aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +		    "need AuthName: %s", r->uri);
   	return SERVER_ERROR;
       }
   
  @@ -151,7 +152,7 @@
   
       if (strcmp(getword(r->pool, &auth_line, ' '), "Digest")) {
   	/* Client tried to authenticate using wrong auth scheme */
  -	aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +	aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
   		    "client used wrong authentication scheme: %s", r->uri);
   	note_digest_auth_failure(r);
   	return AUTH_REQUIRED;
  @@ -274,7 +275,6 @@
       digest_header_rec *response = pcalloc(r->pool, sizeof(digest_header_rec));
       conn_rec *c = r->connection;
       char *a1;
  -    char errstr[MAX_STRING_LEN];
       int res;
   
       if ((res = get_digest_rec(r, response)))
  @@ -284,15 +284,15 @@
   	return DECLINED;
   
       if (!(a1 = get_hash(r, c->user, sec->pwfile))) {
  -	ap_snprintf(errstr, sizeof(errstr), "user %s not found", c->user);
  -	aplog_error(APLOG_MARK, APLOG_ERR, r->server, "%s: %s", errstr, r->uri);
  +	aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +		    "user %s not found: %s", c->user, r->uri);
   	note_digest_auth_failure(r);
   	return AUTH_REQUIRED;
       }
       /* anyone know where the prototype for crypt is? */
       if (strcmp(response->digest, find_digest(r, response, a1))) {
  -	ap_snprintf(errstr, sizeof(errstr), "user %s: password mismatch", c->user);
  -	aplog_error(APLOG_MARK, APLOG_ERR, r->server, "%s: %s", errstr, r->uri);
  +	aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +		    "user %s: password mismatch: %s", c->user, r->uri);
   	note_digest_auth_failure(r);
   	return AUTH_REQUIRED;
       }
  
  
  
  1.19      +2 -2      apachen/src/modules/standard/mod_expires.c
  
  Index: mod_expires.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_expires.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- mod_expires.c	1997/09/18 18:40:52	1.18
  +++ mod_expires.c	1997/10/07 05:27:26	1.19
  @@ -415,7 +415,7 @@
   
       conf = (expires_dir_config *) get_module_config(r->per_dir_config, &expires_module);
       if (conf == NULL) {
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                       "internal error: %s", r->filename);
           return SERVER_ERROR;
       };
  @@ -465,7 +465,7 @@
           /* expecting the add_* routines to be case-hardened this 
            * is just a reminder that module is beta
            */
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                       "internal error: bad expires code: %s", r->filename);
           return SERVER_ERROR;
       };
  
  
  
  1.33      +2 -2      apachen/src/modules/standard/mod_imap.c
  
  Index: mod_imap.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_imap.c,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- mod_imap.c	1997/09/26 03:19:31	1.32
  +++ mod_imap.c	1997/10/07 05:27:26	1.33
  @@ -432,7 +432,7 @@
       my_base[sizeof(my_base) - 1] = '\0';
       if (strchr(my_base, '/') == NULL && (!strncmp(value, "../", 3) || !strcmp(value, ".."))) {
           url[0] = '\0';
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                       "invalid base directive in map file: %s", r->uri);
           return;
       }
  @@ -486,7 +486,7 @@
           }
           else if (directory) {
               url[0] = '\0';
  -            aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +            aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                           "invalid directory name in map file: %s", r->uri);
               return;
           }
  
  
  
  1.56      +46 -42    apachen/src/modules/standard/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_include.c,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- mod_include.c	1997/09/26 03:23:02	1.55
  +++ mod_include.c	1997/10/07 05:27:27	1.56
  @@ -508,8 +508,9 @@
                   var[vlen] = vtext[vtlen] = '\0';
                   if (braces == 1) {
                       if (*in != '}') {
  -                        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  -                                    "Invalid variable \"%s%s\"", vtext, in);
  +                        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR,
  +				    r->server, "Invalid variable \"%s%s\"",
  +				    vtext, in);
                           *next = '\0';
                           return;
                       }
  @@ -654,8 +655,8 @@
               chdir_file(r->filename);
   
               if (error_fmt) {
  -                aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  -                            error_fmt, tag_val, r->filename);
  +                aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR,
  +			    r->server, error_fmt, tag_val, r->filename);
                   rputs(error, r);
               }
   
  @@ -667,7 +668,7 @@
               return 0;
           }
           else {
  -            aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +            aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                           "unknown parameter \"%s\" to tag include in %s",
                           tag, r->filename);
               rputs(error, r);
  @@ -787,7 +788,7 @@
           if (!strcmp(tag, "cmd")) {
               parse_string(r, tag_val, parsed_string, MAX_STRING_LEN, 1);
               if (include_cmd(parsed_string, r) == -1) {
  -                aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +                aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                               "execution failure for parameter \"%s\" "
                               "to tag exec in file %s",
                               tag, r->filename);
  @@ -799,7 +800,7 @@
           else if (!strcmp(tag, "cgi")) {
               parse_string(r, tag_val, parsed_string, MAX_STRING_LEN, 0);
               if (include_cgi(parsed_string, r) == -1) {
  -                aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +                aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                               "invalid CGI ref \"%s\" in %s", tag_val, file);
                   rputs(error, r);
               }
  @@ -810,7 +811,7 @@
               return 0;
           }
           else {
  -            aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +            aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                           "unknown parameter \"%s\" to tag exec in %s",
                           tag, file);
               rputs(error, r);
  @@ -842,7 +843,7 @@
               return 0;
           }
           else {
  -            aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +            aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                           "unknown parameter \"%s\" to tag echo in %s",
                           tag, r->filename);
               rputs(error, r);
  @@ -859,7 +860,7 @@
       AV *av = newAV();
   
       if (!(allow_options(r) & OPT_INCLUDES)) {
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                       "httpd: #perl SSI disallowed by IncludesNoExec in %s",
                       r->filename);
           return DECLINED;
  @@ -929,7 +930,7 @@
               return 0;
           }
           else {
  -            aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +            aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                           "unknown parameter \"%s\" to tag config in %s",
                           tag, r->filename);
               rputs(error, r);
  @@ -967,7 +968,7 @@
               return 0;
           }
           else {
  -            aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +            aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                           "unable to get information about \"%s\" "
                           "in parsed file %s",
                           tag_val, r->filename);
  @@ -977,7 +978,7 @@
           }
       }
       else {
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                       "unknown parameter \"%s\" to tag %s in %s",
                       tag, directive, r->filename);
           rputs(error, r);
  @@ -1057,7 +1058,7 @@
   
       compiled = pregcomp(r->pool, rexp, REG_EXTENDED | REG_NOSUB);
       if (compiled == NULL) {
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                       "unable to compile pattern \"%s\"", rexp);
           return -1;
       }
  @@ -1245,7 +1246,7 @@
       }
       root = current = (struct parse_node *) NULL;
       if ((expr_pool = make_sub_pool(r->pool)) == (pool *) NULL) {
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                       "out of memory processing file %s", r->filename);
           rputs(error, r);
           return (0);
  @@ -1256,7 +1257,7 @@
           new = (struct parse_node *) palloc(expr_pool,
                                              sizeof(struct parse_node));
           if (new == (struct parse_node *) NULL) {
  -            aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +            aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                           "out of memory processing file %s", r->filename);
               rputs(error, r);
               goto RETURN;
  @@ -1299,7 +1300,7 @@
                   current = current->right = new;
                   break;
               default:
  -                aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +                aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                               "Invalid expression \"%s\" in file %s",
                               expr, r->filename);
                   rputs(error, r);
  @@ -1313,7 +1314,7 @@
               rputs("     Token: and/or\n", r);
   #endif
               if (current == (struct parse_node *) NULL) {
  -                aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +                aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                               "Invalid expression \"%s\" in file %s",
                               expr, r->filename);
                   rputs(error, r);
  @@ -1338,7 +1339,7 @@
                   case token_lbrace:
                       break;
                   default:
  -                    aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +                    aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                                   "Invalid expression \"%s\" in file %s",
                                   expr, r->filename);
                       rputs(error, r);
  @@ -1383,7 +1384,7 @@
                   case token_lt:
                       break;
                   default:
  -                    aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +                    aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                                   "Invalid expression \"%s\" in file %s",
                                   expr, r->filename);
                       rputs(error, r);
  @@ -1415,7 +1416,7 @@
               rputs("     Token: eq/ne/ge/gt/le/lt\n", r);
   #endif
               if (current == (struct parse_node *) NULL) {
  -                aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +                aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                               "Invalid expression \"%s\" in file %s",
                               expr, r->filename);
                   rputs(error, r);
  @@ -1440,7 +1441,7 @@
                   case token_le:
                   case token_lt:
                   default:
  -                    aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +                    aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                                   "Invalid expression \"%s\" in file %s",
                                   expr, r->filename);
                       rputs(error, r);
  @@ -1474,8 +1475,9 @@
                   current = current->parent;
               }
               if (current == (struct parse_node *) NULL) {
  -                aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  -                            "Unmatched ')' in %s", expr, r->filename);
  +                aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +                            "Unmatched ')' in \"%s\" in file %s",
  +			    expr, r->filename);
                   rputs(error, r);
                   goto RETURN;
               }
  @@ -1506,7 +1508,7 @@
                   case token_string:
                   case token_group:
                   default:
  -                    aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +                    aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                                   "Invalid expression \"%s\" in file %s",
                                   expr, r->filename);
                       rputs(error, r);
  @@ -1555,7 +1557,7 @@
   #endif
               if (current->left == (struct parse_node *) NULL ||
                   current->right == (struct parse_node *) NULL) {
  -                aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +                aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                               "Invalid expression \"%s\" in file %s",
                               expr, r->filename);
                   rputs(error, r);
  @@ -1622,7 +1624,7 @@
                   (current->right == (struct parse_node *) NULL) ||
                   (current->left->token.type != token_string) ||
                   (current->right->token.type != token_string)) {
  -                aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +                aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                               "Invalid expression \"%s\" in file %s",
                               expr, r->filename);
                   rputs(error, r);
  @@ -1643,7 +1645,7 @@
                       current->right->token.value[len - 1] = '\0';
                   }
                   else {
  -                    aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +                    aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                                   "Invalid rexp \"%s\" in file %s",
                                   current->right->token.value, r->filename);
                       rputs(error, r);
  @@ -1687,7 +1689,7 @@
                   (current->right == (struct parse_node *) NULL) ||
                   (current->left->token.type != token_string) ||
                   (current->right->token.type != token_string)) {
  -                aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +                aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                               "Invalid expression \"%s\" in file %s",
                               expr, r->filename);
                   rputs(error, r);
  @@ -1768,21 +1770,22 @@
               break;
   
           case token_lbrace:
  -            aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +            aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                           "Unmatched '(' in \"%s\" in file %s",
                           expr, r->filename);
               rputs(error, r);
               goto RETURN;
   
           case token_rbrace:
  -            aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +            aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                           "Unmatched ')' in \"%s\" in file %s\n",
                           expr, r->filename);
               rputs(error, r);
               goto RETURN;
   
           default:
  -            aplog_error(APLOG_MARK, APLOG_ERR, r->server, "bad token type");
  +            aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +			"bad token type");
               rputs(error, r);
               goto RETURN;
           }
  @@ -1821,7 +1824,7 @@
   #endif
           }
           else {
  -            aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +            aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                           "unknown parameter \"%s\" to tag if in %s",
                           tag, r->filename);
               rputs(error, r);
  @@ -1864,7 +1867,7 @@
   #endif
           }
           else {
  -            aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +            aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                           "unknown parameter \"%s\" to tag if in %s",
                           tag, r->filename);
               rputs(error, r);
  @@ -1891,7 +1894,7 @@
           return 0;
       }
       else {
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                       "else directive does not take tags");
           if (*printing) {
               rputs(error, r);
  @@ -1919,7 +1922,7 @@
           return 0;
       }
       else {
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                       "endif directive does not take tags");
           rputs(error, r);
           return -1;
  @@ -1946,7 +1949,7 @@
           }
           else if (!strcmp(tag, "value")) {
               if (var == (char *) NULL) {
  -                aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +                aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                               "variable must precede value in set directive");
                   rputs(error, r);
                   return -1;
  @@ -1974,7 +1977,7 @@
           return 0;
       }
       else {
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                       "printenv directive does not take tags");
           rputs(error, r);
           return -1;
  @@ -2062,7 +2065,7 @@
               }
               if (!strcmp(directive, "exec")) {
                   if (noexec) {
  -                    aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +                    aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                                   "httpd: exec used but not allowed in %s",
                                   r->filename);
                       if (printing) {
  @@ -2101,7 +2104,7 @@
               }
   #endif
               else {
  -                aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +                aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                               "httpd: unknown directive \"%s\" "
                               "in parsed doc %s",
                               directive, r->filename);
  @@ -2111,7 +2114,7 @@
                   ret = find_string(f, ENDING_SEQUENCE, r, 0);
               }
               if (ret) {
  -                aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +                aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                               "httpd: premature EOF in parsed file %s",
                               r->filename);
                   return;
  @@ -2181,7 +2184,8 @@
           return DECLINED;
       }
       if (r->finfo.st_mode == 0) {
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server, "File does not exist: %s",
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +		    "File does not exist: %s",
                       (r->path_info
                        ? pstrcat(r->pool, r->filename, r->path_info, NULL)
                        : r->filename));
  
  
  
  1.16      +55 -51    apachen/src/modules/standard/mod_mime_magic.c
  
  Index: mod_mime_magic.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_mime_magic.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- mod_mime_magic.c	1997/09/16 04:30:21	1.15
  +++ mod_mime_magic.c	1997/10/07 05:27:28	1.16
  @@ -570,7 +570,7 @@
       palloc(r->pool, sizeof(magic_req_rec));
   
       if (!req_dat) {
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                       "%s: memory allocation failure in magic_set_config()",
                       MODNAME);
           return NULL;
  @@ -590,7 +590,7 @@
   
       /* make sure we have a list to put it in */
       if (!req_dat) {
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                       "%s: request config should not be NULL",
                       MODNAME);
           if (!(req_dat = magic_set_config(r))) {
  @@ -601,7 +601,7 @@
   
       /* allocate the list entry */
       if (!(rsl = (magic_rsl *) palloc(r->pool, sizeof(magic_rsl)))) {
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                       "%s: memory allocation failure in magic_rsl_add()",
                       MODNAME);
           /* failure */
  @@ -673,7 +673,7 @@
   
       /* allocate the result string */
       if (!(result = (char *) palloc(r->pool, len + 1))) {
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                       "%s: memory allocation failure in rsl_strdup()",
                       MODNAME);
           return NULL;
  @@ -706,7 +706,7 @@
       /* clean up and return */
       result[res_pos] = 0;
   #if MIME_MAGIC_DEBUG
  -    aplog_error(APLOG_MARK, APLOG_DEBUG, r->server,
  +    aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server,
                "%s: rsl_strdup() %d chars: %s", MODNAME, res_pos - 1, result);
   #endif
       return result;
  @@ -778,8 +778,8 @@
                   else {
                       /* should not be possible */
                       /* abandon malfunctioning module */
  -                    aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  -                                "%s: bad state %d (ws)", MODNAME);
  +                    aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +                                "%s: bad state %d (ws)", MODNAME, state);
                       return DECLINED;
                   }
                   /* NOTREACHED */
  @@ -822,8 +822,8 @@
                   else {
                       /* should not be possible */
                       /* abandon malfunctioning module */
  -                    aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  -                                "%s: bad state %d (ns)", MODNAME);
  +                    aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +                                "%s: bad state %d (ns)", MODNAME, state);
                       return DECLINED;
                   }
                   /* NOTREACHED */
  @@ -886,7 +886,8 @@
            * if (sb.st_mode & 0002) magic_rsl_puts(r,"writable, ");
            * if (sb.st_mode & 0111) magic_rsl_puts(r,"executable, ");
            */
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server, "can't read `%s'", r->filename);
  +        aplog_error(APLOG_MARK, APLOG_ERR, r->server, "can't read `%s'",
  +		    r->filename);
           return;
       }
   
  @@ -1015,27 +1016,28 @@
       (void) pfclose(p, f);
   
   #if MIME_MAGIC_DEBUG
  -    aplog_error(APLOG_MARK, APLOG_DEBUG, s,
  +    aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, s,
                   "%s: apprentice conf=%x file=%s m=%s m->next=%s last=%s",
                   MODNAME, conf,
                   conf->magicfile ? conf->magicfile : "NULL",
                   conf->magic ? "set" : "NULL",
                   (conf->magic && conf->magic->next) ? "set" : "NULL",
                   conf->last ? "set" : "NULL");
  -    aplog_error(APLOG_MARK, APLOG_DEBUG, s,
  +    aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, s,
                   "%s: apprentice read %d lines, %d rules, %d errors",
                   MODNAME, lineno, rule, errs);
   #endif
   
   #if MIME_MAGIC_DEBUG
       prevm = 0;
  -    aplog_error(APLOG_MARK, APLOG_DEBUG, s, "%s: apprentice test", MODNAME);
  +    aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, s,
  +		"%s: apprentice test", MODNAME);
       for (m = conf->magic; m; m = m->next) {
           if (isprint((((unsigned long) m) >> 24) & 255) &&
               isprint((((unsigned long) m) >> 16) & 255) &&
               isprint((((unsigned long) m) >> 8) & 255) &&
               isprint(((unsigned long) m) & 255)) {
  -            aplog_error(APLOG_MARK, APLOG_DEBUG, s,
  +            aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, s,
                           "%s: apprentice: POINTER CLOBBERED! "
                           "m=\"%c%c%c%c\" line=%d", MODNAME,
                           (((unsigned long) m) >> 24) & 255,
  @@ -1082,7 +1084,7 @@
           case STRING:
               break;
           default:
  -            aplog_error(APLOG_MARK, APLOG_ERR, s,
  +            aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, s,
                           "%s: can't happen: m->type=%d", MODNAME, m->type);
               return -1;
           }
  @@ -1102,7 +1104,7 @@
   
       /* allocate magic structure entry */
       if ((m = (struct magic *) pcalloc(p, sizeof(struct magic))) == NULL) {
  -        (void) aplog_error(APLOG_MARK, APLOG_ERR, serv,
  +        (void) aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, serv,
                              "%s: Out of memory.", MODNAME);
           return -1;
       }
  @@ -1135,7 +1137,7 @@
       /* get offset, then skip over it */
       m->offset = (int) strtol(l, &t, 0);
       if (l == t) {
  -        aplog_error(APLOG_MARK, APLOG_ERR, serv,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, serv,
                       "%s: offset %s invalid", MODNAME, l);
       }
       l = t;
  @@ -1158,7 +1160,7 @@
                   m->in.type = BYTE;
                   break;
               default:
  -                aplog_error(APLOG_MARK, APLOG_ERR, serv,
  +                aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, serv,
                           "%s: indirect offset type %c invalid", MODNAME, *l);
                   break;
               }
  @@ -1175,7 +1177,7 @@
           else
               t = l;
           if (*t++ != ')') {
  -            aplog_error(APLOG_MARK, APLOG_ERR, serv,
  +            aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, serv,
                           "%s: missing ')' in indirect offset", MODNAME);
           }
           l = t;
  @@ -1249,7 +1251,7 @@
           l += NLEDATE;
       }
       else {
  -        aplog_error(APLOG_MARK, APLOG_ERR, serv,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, serv,
                       "%s: type %s invalid", MODNAME, l);
           return -1;
       }
  @@ -1313,7 +1315,7 @@
            /* NULLBODY */ ;
   
   #if MIME_MAGIC_DEBUG
  -    aplog_error(APLOG_MARK, APLOG_DEBUG, serv,
  +    aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, serv,
                   "%s: parse line=%d m=%x next=%x cont=%d desc=%s",
                   MODNAME, lineno, m, m->next, m->cont_level,
                   m->desc ? m->desc : "NULL");
  @@ -1358,7 +1360,8 @@
           if (isspace((unsigned char) c))
               break;
           if (p >= pmax) {
  -            aplog_error(APLOG_MARK, APLOG_ERR, serv, "String too long: %s", origs);
  +            aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, serv,
  +			"String too long: %s", origs);
               break;
           }
           if (c == '\\') {
  @@ -1584,7 +1587,7 @@
       case S_IFREG:
           break;
       default:
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                       "%s: invalid mode 0%o.", MODNAME, sb->st_mode);
           /* NOTREACHED */
       }
  @@ -1651,7 +1654,7 @@
       struct magic *m;
   
   #if MIME_MAGIC_DEBUG
  -    aplog_error(APLOG_MARK, APLOG_DEBUG, r->server,
  +    aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server,
                   "%s: match conf=%x file=%s m=%s m->next=%s last=%s",
                   MODNAME, conf,
                   conf->magicfile ? conf->magicfile : "NULL",
  @@ -1666,7 +1669,7 @@
               isprint((((unsigned long) m) >> 16) & 255) &&
               isprint((((unsigned long) m) >> 8) & 255) &&
               isprint(((unsigned long) m) & 255)) {
  -            aplog_error(APLOG_MARK, APLOG_DEBUG, r->server,
  +            aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server,
                           "%s: match: POINTER CLOBBERED! "
                           "m=\"%c%c%c%c\"", MODNAME,
                           (((unsigned long) m) >> 24) & 255,
  @@ -1681,7 +1684,7 @@
       for (m = conf->magic; m; m = m->next) {
   #if MIME_MAGIC_DEBUG
           rule_counter++;
  -        aplog_error(APLOG_MARK, APLOG_DEBUG, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server,
                       "%s: line=%d desc=%s", MODNAME, m->lineno, m->desc);
   #endif
   
  @@ -1701,7 +1704,7 @@
               while (m_cont && (m_cont->cont_level != 0)) {
   #if MIME_MAGIC_DEBUG
                   rule_counter++;
  -                aplog_error(APLOG_MARK, APLOG_DEBUG, r->server,
  +                aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server,
                               "%s: line=%d mc=%x mc->next=%x cont=%d desc=%s",
                               MODNAME, m_cont->lineno, m_cont,
                               m_cont->next, m_cont->cont_level,
  @@ -1720,7 +1723,7 @@
           /* if we get here, the main entry rule was a match */
           /* this will be the last run through the loop */
   #if MIME_MAGIC_DEBUG
  -        aplog_error(APLOG_MARK, APLOG_DEBUG, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server,
                       "%s: rule matched, line=%d type=%d %s",
                       MODNAME, m->lineno, m->type,
                       (m->type == STRING) ? m->value.s : "");
  @@ -1744,7 +1747,7 @@
           m = m->next;
           while (m && (m->cont_level != 0)) {
   #if MIME_MAGIC_DEBUG
  -            aplog_error(APLOG_MARK, APLOG_DEBUG, r->server,
  +            aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server,
                           "%s: match line=%d cont=%d type=%d %s",
                           MODNAME, m->lineno, m->cont_level, m->type,
                           (m->type == STRING) ? m->value.s : "");
  @@ -1788,13 +1791,13 @@
               m = m->next;
           }
   #if MIME_MAGIC_DEBUG
  -        aplog_error(APLOG_MARK, APLOG_DEBUG, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server,
                       "%s: matched after %d rules", MODNAME, rule_counter);
   #endif
           return 1;               /* all through */
       }
   #if MIME_MAGIC_DEBUG
  -    aplog_error(APLOG_MARK, APLOG_DEBUG, r->server,
  +    aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server,
                   "%s: failed after %d rules", MODNAME, rule_counter);
   #endif
       return 0;                   /* no match at all */
  @@ -1841,7 +1844,7 @@
           (void) magic_rsl_printf(r, m->desc, pp);
           return;
       default:
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                       "%s: invalid m->type (%d) in mprint().",
                       MODNAME, m->type);
           return;
  @@ -1887,7 +1890,7 @@
               ((p->hl[3] << 24) | (p->hl[2] << 16) | (p->hl[1] << 8) | (p->hl[0]));
           return 1;
       default:
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                       "%s: invalid type %d in mconvert().", MODNAME, m->type);
           return 0;
       }
  @@ -1939,7 +1942,7 @@
       int matched;
   
       if ((m->value.s[0] == 'x') && (m->value.s[1] == '\0')) {
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server, "BOINK");
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server, "BOINK");
           return 1;
       }
   
  @@ -1983,7 +1986,7 @@
           }
           break;
       default:
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                       "%s: invalid type %d in mcheck().", MODNAME, m->type);
           return 0;               /* NOTREACHED */
       }
  @@ -1993,7 +1996,7 @@
       switch (m->reln) {
       case 'x':
   #if MIME_MAGIC_DEBUG
  -        aplog_error(APLOG_MARK, APLOG_DEBUG, r->server, "%lu == *any* = 1", v);
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server, "%lu == *any* = 1", v);
   #endif
           matched = 1;
           break;
  @@ -2001,7 +2004,7 @@
       case '!':
           matched = v != l;
   #if MIME_MAGIC_DEBUG
  -        aplog_error(APLOG_MARK, APLOG_DEBUG, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server,
                       "%lu != %lu = %d", v, l, matched);
   #endif
           break;
  @@ -2009,7 +2012,7 @@
       case '=':
           matched = v == l;
   #if MIME_MAGIC_DEBUG
  -        aplog_error(APLOG_MARK, APLOG_DEBUG, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server,
                       "%lu == %lu = %d", v, l, matched);
   #endif
           break;
  @@ -2018,14 +2021,14 @@
           if (m->flag & UNSIGNED) {
               matched = v > l;
   #if MIME_MAGIC_DEBUG
  -            aplog_error(APLOG_MARK, APLOG_DEBUG, r->server,
  +            aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server,
                           "%lu > %lu = %d", v, l, matched);
   #endif
           }
           else {
               matched = (long) v > (long) l;
   #if MIME_MAGIC_DEBUG
  -            aplog_error(APLOG_MARK, APLOG_DEBUG, r->server,
  +            aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server,
                           "%ld > %ld = %d", v, l, matched);
   #endif
           }
  @@ -2035,14 +2038,14 @@
           if (m->flag & UNSIGNED) {
               matched = v < l;
   #if MIME_MAGIC_DEBUG
  -            aplog_error(APLOG_MARK, APLOG_DEBUG, r->server,
  +            aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server,
                           "%lu < %lu = %d", v, l, matched);
   #endif
           }
           else {
               matched = (long) v < (long) l;
   #if MIME_MAGIC_DEBUG
  -            aplog_error(APLOG_MARK, APLOG_DEBUG, r->server,
  +            aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server,
                           "%ld < %ld = %d", v, l, matched);
   #endif
           }
  @@ -2051,7 +2054,7 @@
       case '&':
           matched = (v & l) == l;
   #if MIME_MAGIC_DEBUG
  -        aplog_error(APLOG_MARK, APLOG_DEBUG, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server,
                       "((%lx & %lx) == %lx) = %d", v, l, l, matched);
   #endif
           break;
  @@ -2059,14 +2062,14 @@
       case '^':
           matched = (v & l) != l;
   #if MIME_MAGIC_DEBUG
  -        aplog_error(APLOG_MARK, APLOG_DEBUG, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server,
                       "((%lx & %lx) != %lx) = %d", v, l, l, matched);
   #endif
           break;
   
       default:
           matched = 0;
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                       "%s: mcheck: can't happen: invalid relation %d.",
                       MODNAME, m->reln);
           break;                  /* NOTREACHED */
  @@ -2263,7 +2266,7 @@
           }
           (void) close(fdin[1]);
           if ((*newch = (unsigned char *) palloc(r->pool, n)) == NULL) {
  -            aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +            aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                           "%s: out of memory in uncompress()", MODNAME);
               return -1;
           }
  @@ -2379,7 +2382,7 @@
       request_rec *sub;
   
   #if MIME_MAGIC_DEBUG
  -    aplog_error(APLOG_MARK, APLOG_DEBUG, r->server,
  +    aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server,
                   "%s: revision_suffix checking%s", MODNAME, r->filename);
   #endif                          /* MIME_MAGIC_DEBUG */
   
  @@ -2398,7 +2401,7 @@
       result = 0;
       sub_filename = pstrndup(r->pool, r->filename, suffix_pos);
   #if MIME_MAGIC_DEBUG
  -    aplog_error(APLOG_MARK, APLOG_DEBUG, r->server,
  +    aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server,
                   "%s: subrequest lookup for %s", MODNAME, sub_filename);
   #endif                          /* MIME_MAGIC_DEBUG */
       sub = sub_req_lookup_file(sub_filename, r);
  @@ -2407,7 +2410,7 @@
       if (sub->content_type) {
           r->content_type = pstrdup(r->pool, sub->content_type);
   #if MIME_MAGIC_DEBUG
  -        aplog_error(APLOG_MARK, APLOG_DEBUG, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server,
                       "%s: subrequest %s got %s",
                       MODNAME, sub_filename, r->content_type);
   #endif                          /* MIME_MAGIC_DEBUG */
  @@ -2446,13 +2449,14 @@
               return;
   #if MIME_MAGIC_DEBUG
           prevm = 0;
  -        aplog_error(APLOG_MARK, APLOG_DEBUG, s, "%s: magic_init 1 test", MODNAME);
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, s,
  +		    "%s: magic_init 1 test", MODNAME);
           for (m = conf->magic; m; m = m->next) {
               if (isprint((((unsigned long) m) >> 24) & 255) &&
                   isprint((((unsigned long) m) >> 16) & 255) &&
                   isprint((((unsigned long) m) >> 8) & 255) &&
                   isprint(((unsigned long) m) & 255)) {
  -                aplog_error(APLOG_MARK, APLOG_DEBUG, s,
  +                aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, s,
                               "%s: magic_init 1: POINTER CLOBBERED! "
                               "m=\"%c%c%c%c\" line=%d", MODNAME,
                               (((unsigned long) m) >> 24) & 255,
  
  
  
  1.58      +8 -8      apachen/src/modules/standard/mod_negotiation.c
  
  Index: mod_negotiation.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_negotiation.c,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- mod_negotiation.c	1997/09/15 17:19:55	1.57
  +++ mod_negotiation.c	1997/10/07 05:27:30	1.58
  @@ -675,7 +675,7 @@
       }
   
       if (!*cp) {
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                       "Syntax error in type map --- no ':': %s", r->filename);
           return NULL;
       }
  @@ -685,7 +685,7 @@
       } while (*cp && isspace(*cp));
   
       if (!*cp) {
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                       "Syntax error in type map --- no header body: %s",
                       r->filename);
           return NULL;
  @@ -711,7 +711,7 @@
       map = pfopen(neg->pool, rr->filename, "r");
       if (map == NULL) {
           aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  -                    "cannot access type map file", rr->filename);
  +                    "cannot access type map file: %s", rr->filename);
           return HTTP_FORBIDDEN;
       }
   
  @@ -802,7 +802,7 @@
   
       if (dirp == NULL) {
           aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  -                    "cannot read directory for multi", neg->dir_name);
  +                    "cannot read directory for multi: %s", neg->dir_name);
           return HTTP_FORBIDDEN;
       }
   
  @@ -2046,8 +2046,8 @@
       }
   
       if (!best) {
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  -                    "no acceptable variant", r->filename);
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +                    "no acceptable variant: %s", r->filename);
   
           set_neg_headers(r, neg, na_result);
           store_variant_list(r, neg);
  @@ -2133,8 +2133,8 @@
       }
   
       if (!best) {
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  -                    "no acceptable variant", r->filename);
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +                    "no acceptable variant: %s", r->filename);
   
           set_neg_headers(r, neg, na_result);
           store_variant_list(r, neg);
  
  
  
  1.53      +9 -9      apachen/src/modules/standard/mod_rewrite.c
  
  Index: mod_rewrite.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_rewrite.c,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- mod_rewrite.c	1997/09/18 22:54:05	1.52
  +++ mod_rewrite.c	1997/10/07 05:27:31	1.53
  @@ -987,9 +987,9 @@
                * we can actually use it!
                */
               if (!proxy_available) {
  -                aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +                aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                               "attempt to make remote request from mod_rewrite "
  -                            "without proxy enabled", r->filename);
  +                            "without proxy enabled: %s", r->filename);
                   return FORBIDDEN;
               }
   
  @@ -1206,7 +1206,7 @@
        */
       if (!(allow_options(r) & (OPT_SYM_LINKS | OPT_SYM_OWNER))) {
           /* FollowSymLinks is mandatory! */
  -        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                       "Options FollowSymLinks or SymLinksIfOwnerMatch is off "
                       "which implies that RewriteRule directive is forbidden: %s",
                       r->filename);
  @@ -2252,7 +2252,7 @@
               if (cpT != NULL) {
                   n = strlen(cpT);
                   if (cpO + n >= newuri + sizeof(newuri)) {
  -                    aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +                    aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                                   "insufficient space in expand_map_lookups, aborting");
                       return;
                   }
  @@ -2262,7 +2262,7 @@
               else {
                   n = strlen(defaultvalue);
                   if (cpO + n >= newuri + sizeof(newuri)) {
  -                    aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +                    aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                                   "insufficient space in expand_map_lookups, aborting");
                       return;
                   }
  @@ -2276,7 +2276,7 @@
                   cpT = cpI+strlen(cpI);
               n = cpT-cpI;
               if (cpO + n >= newuri + sizeof(newuri)) {
  -                aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +                aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                               "insufficient space in expand_map_lookups, aborting");
                   return;
               }
  @@ -2327,8 +2327,8 @@
               if (s->type == MAPTYPE_TXT) {
                   if (stat(s->checkfile, &st) == -1) {
                       aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  -                                "mod_rewrite: can't access text RewriteMap file %s: %s",
  -                                s->checkfile, strerror(errno));
  +                                "mod_rewrite: can't access text RewriteMap file %s",
  +                                s->checkfile);
                       rewritelog(r, 1,
                                  "can't open RewriteMap file, see error log");
                       return NULL;
  @@ -2356,7 +2356,7 @@
                   if (stat(s->checkfile, &st) == -1) {
                       aplog_error(APLOG_MARK, APLOG_ERROR, r->server,
                                   "mod_rewrite: can't access dbm RewriteMap file %s: %s",
  -                                s->checkfile, strerror(errno));
  +                                s->checkfile);
                       rewritelog(r, 1,
                                  "can't open RewriteMap file, see error log");
                       return NULL;
  
  
  
  1.5       +2 -2      apachen/src/modules/standard/mod_speling.c
  
  Index: mod_speling.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_speling.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mod_speling.c	1997/09/16 04:50:49	1.4
  +++ mod_speling.c	1997/10/07 05:27:32	1.5
  @@ -340,7 +340,7 @@
               table_set(r->headers_out, "Location",
                         construct_url(r->pool, nuri, r->server));
   
  -            aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +            aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
                           ref ? "Fixed spelling: %s to %s from %s"
                           : "Fixed spelling: %s to %s",
                           r->uri, nuri, ref);
  @@ -401,7 +401,7 @@
               /* Pass our table to http_protocol.c (see mod_negotiation): */
               table_set(notes, "variant-list", t);
   
  -            aplog_error(APLOG_MARK, APLOG_WARNING, r->server,
  +            aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r->server,
                           ref ? "Spelling fix: %s: %d candidates from %s"
                           : "Spelling fix: %s: %d candidates",
                           r->uri, candidates->nelts, ref);
  
  
  
  1.65      +1 -1      apachen/src/modules/standard/mod_status.c
  
  Index: mod_status.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_status.c,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- mod_status.c	1997/09/18 08:23:35	1.64
  +++ mod_status.c	1997/10/07 05:27:33	1.65
  @@ -244,7 +244,7 @@
       status[SERVER_GRACEFUL] = 'G';
   
       if (!exists_scoreboard_image()) {
  -	aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +	aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
   		    "Server status unavailable in inetd mode");
   	return HTTP_NOT_IMPLEMENTED;
       }
  
  
  
  1.5       +5 -5      apachen/src/modules/standard/mod_unique_id.c
  
  Index: mod_unique_id.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_unique_id.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mod_unique_id.c	1997/09/16 04:49:50	1.4
  +++ mod_unique_id.c	1997/10/07 05:27:33	1.5
  @@ -145,7 +145,7 @@
        */
       if (XtOffsetOf(unique_id_rec, counter) + sizeof(cur_unique_id.counter)
           != 14) {
  -        aplog_error(APLOG_MARK, APLOG_ALERT, s,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ALERT, s,
                       "mod_unique_id: sorry the size assumptions are wrong "
                       "in mod_unique_id.c, please remove it from your server "
                       "or fix the code!");
  @@ -158,20 +158,20 @@
        * be unique as the physical address of the machine
        */
       if (gethostname(str, sizeof(str) - 1) != 0) {
  -        aplog_error(APLOG_MARK, APLOG_ALERT, s,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ALERT, s,
             "gethostname: mod_unique_id requires the hostname of the server");
           exit(1);
       }
   
       if ((hent = gethostbyname(str)) == NULL) {
  -        aplog_error(APLOG_MARK, APLOG_ALERT, s,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ALERT, s,
                       "mod_unique_id: unable to gethostbyname(\"%s\")", str);
           exit(1);
       }
   
       global_in_addr = ((struct in_addr *) hent->h_addr_list[0])->s_addr;
   
  -    aplog_error(APLOG_MARK, APLOG_INFO, s,
  +    aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, s,
                   "mod_unique_id: using ip addr %s",
                   inet_ntoa(*(struct in_addr *) hent->h_addr_list[0]));
   
  @@ -228,7 +228,7 @@
        * global_init ... but oh well.
        */
       if (cur_unique_id.pid != pid) {
  -        aplog_error(APLOG_MARK, APLOG_CRIT, s,
  +        aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_CRIT, s,
                       "oh no! pids are greater than 32-bits!  I'm broken!");
       }
   
  
  
  

Mime
View raw message