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

[stoddard]

stoddard    99/11/04 11:49:43

  Modified:    src/main http_main.c
  Log:
  At one time the assumption we made about InitSecurityDescriptor was true,
  but on NT 4/SP 5 this is not the case. It's safer to set the last error 
beforehand.
  Without this, net start apache & apache -k shutdown is broken.
  
  PR: 4689 4889
  Submitted by: Keith Wannamaker
  Reviewed by:  Bill Stoddard
  
  Revision  Changes    Path
  1.481     +2 -3      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.480
  retrieving revision 1.481
  diff -u -r1.480 -r1.481
  --- http_main.c       1999/10/29 07:47:57     1.480
  +++ http_main.c       1999/11/04 19:49:40     1.481
  @@ -6239,10 +6239,9 @@
           return NULL;
       }
       /*
  -     * We can safely use GetLastError() here without presetting it;
  -     * {Initialize,Set}SecurityDescriptor() have been verified as clearing it
  -     * on successful completion.
  +     * Win98 returns nonzero on failure; check LastError to make sure.
        */
  +    SetLastError(0);
       if (!InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION)
        || GetLastError()) {
           LocalFree( pSD );