cvs commit: apache-1.3/src/main http_main.c

[fielding]

fielding    99/08/09 00:54:54

  Modified:    src/main http_main.c
  Log:
  Fix last warning fix -- uid_t is long on some platforms.
  
  Revision  Changes    Path
  1.470     +3 -2      apache-1.3/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
  retrieving revision 1.469
  retrieving revision 1.470
  diff -u -r1.469 -r1.470
  --- http_main.c       1999/08/08 13:31:50     1.469
  +++ http_main.c       1999/08/09 07:54:52     1.470
  @@ -3700,7 +3700,7 @@
   #endif
        setuid(ap_user_id) == -1)) {
        ap_log_error(APLOG_MARK, APLOG_ALERT, server_conf,
  -                 "setuid: unable to change to uid: %d", (int) ap_user_id);
  +                 "setuid: unable to change to uid: %ld", (long) ap_user_id);
        clean_child_exit(APEXIT_CHILDFATAL);
       }
   #endif
  @@ -4885,7 +4885,8 @@
        /* Only try to switch if we're running as root */
        if (!geteuid() && setuid(ap_user_id) == -1) {
            ap_log_error(APLOG_MARK, APLOG_ALERT, server_conf,
  -                     "setuid: unable to change to uid: %d", (int) 
ap_user_id);
  +                     "setuid: unable to change to uid: %ld",
  +                     (long) ap_user_id);
            exit(1);
        }
   #endif