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

1999-07-20 Thread Ben Laurie
[EMAIL PROTECTED] wrote:
> 
> coar99/07/20 10:44:21
> 
>   Modified:src/main http_main.c
>   Log:
> *SecurityDescriptor() should be returning an error on Win98, but
> sometimes doesn't -- so check the last error if it claims all
> went well, just in case it's fibbing.

Eeek! Things that _don't_ fail don't clear the last error in general.

Cheers,

Ben.

--
http://www.apache-ssl.org/ben.html

"My grandfather once told me that there are two kinds of people: those
who work and those who take the credit. He told me to try to be in the
first group; there was less competition there."
 - Indira Gandhi


cvs commit: apache-1.3/src Configure

1999-07-20 Thread rasmus
rasmus  99/07/20 10:59:44

  Modified:src  Configure
  Log:
  This should make mod_dav build using apxs under AIX again.
  
  Revision  ChangesPath
  1.359 +1 -0  apache-1.3/src/Configure
  
  Index: Configure
  ===
  RCS file: /home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.358
  retrieving revision 1.359
  diff -u -r1.358 -r1.359
  --- Configure 1999/06/25 21:24:34 1.358
  +++ Configure 1999/07/20 17:59:42 1.359
  @@ -1191,6 +1191,7 @@
;;
esac
LDFLAGS_MOD_SHLIB="$LDFLAGS_SHLIB -bI:@libexecdir@/httpd.exp -lc"
  + LDFLAGS_MOD_SHLIB="$LDFLAGS_MOD_SHLIB -bE:\`echo \$@|sed -e 
's:\.so\$\$:.exp:'\`"
LDFLAGS_SHLIB="$LDFLAGS_SHLIB -bI:\$(SRCDIR)/support/httpd.exp "
LDFLAGS_SHLIB="$LDFLAGS_SHLIB -bE:\`echo \$@|sed -e 
's:\.so\$\$:.exp:'\`"
LDFLAGS_SHLIB="$LDFLAGS_SHLIB -lc"
  
  
  


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

1999-07-20 Thread coar
coar99/07/20 10:44:21

  Modified:src/main http_main.c
  Log:
*SecurityDescriptor() should be returning an error on Win98, but
sometimes doesn't -- so check the last error if it claims all
went well, just in case it's fibbing.
  
  Submitted by: Allan Edwards <[EMAIL PROTECTED]>,
Keith Wannamaker <[EMAIL PROTECTED]>
  Reviewed by:  Ken Coar
  
  Revision  ChangesPath
  1.455 +9 -5  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.454
  retrieving revision 1.455
  diff -u -r1.454 -r1.455
  --- http_main.c   1999/07/02 15:55:07 1.454
  +++ http_main.c   1999/07/20 17:44:16 1.455
  @@ -5757,16 +5757,20 @@
   PSECURITY_DESCRIPTOR pSD;
   PSECURITY_ATTRIBUTES sa;
   
  -sa  = (PSECURITY_ATTRIBUTES) LocalAlloc(LPTR, sizeof 
(SECURITY_ATTRIBUTES));
  -pSD = (PSECURITY_DESCRIPTOR) LocalAlloc(LPTR, 
SECURITY_DESCRIPTOR_MIN_LENGTH);
  -if (pSD == NULL || sa == NULL)
  +sa  = (PSECURITY_ATTRIBUTES) LocalAlloc(LPTR, 
sizeof(SECURITY_ATTRIBUTES));
  +pSD = (PSECURITY_DESCRIPTOR) LocalAlloc(LPTR,
  + SECURITY_DESCRIPTOR_MIN_LENGTH);
  +if (pSD == NULL || sa == NULL) {
   return NULL;
  -if (!InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION)) {
  +}
  +if (!InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION)
  + || GetLastError()) {
   LocalFree( pSD );
   LocalFree( sa );
   return NULL;
   }
  -if (!SetSecurityDescriptorDacl(pSD, TRUE, (PACL) NULL, FALSE)) {
  +if (!SetSecurityDescriptorDacl(pSD, TRUE, (PACL) NULL, FALSE)
  + || GetLastError()) {
   LocalFree( pSD );
   LocalFree( sa );
   return NULL;