diff options
author | Joseph Koshy <jkoshy@FreeBSD.org> | 2002-03-28 09:03:29 +0000 |
---|---|---|
committer | Joseph Koshy <jkoshy@FreeBSD.org> | 2002-03-28 09:03:29 +0000 |
commit | 3764620eae68bb06aaff607a1872dd1a0185b587 (patch) | |
tree | 1540d70059e75c25e5937ed93a4745c56a2704b1 /www/aolserver/files | |
parent | 87a0e78a73e75ec37e7a42616488d47ba41893ec (diff) |
Notes
Diffstat (limited to 'www/aolserver/files')
-rw-r--r-- | www/aolserver/files/patch-a | 11 | ||||
-rw-r--r-- | www/aolserver/files/patch-b | 40 | ||||
-rw-r--r-- | www/aolserver/files/patch-c | 24 |
3 files changed, 75 insertions, 0 deletions
diff --git a/www/aolserver/files/patch-a b/www/aolserver/files/patch-a new file mode 100644 index 000000000000..5576bbaaea27 --- /dev/null +++ b/www/aolserver/files/patch-a @@ -0,0 +1,11 @@ +--- include/Makefile.global Fri Feb 15 11:39:00 2002 ++++ include/Makefile.global.new Fri Feb 15 11:39:00 2002 +@@ -259,7 +259,7 @@ + TCL76_DIR=tcl7.6 + ifeq (bsd, $(findstring bsd, $(PLATFORM))) + TCL76_LIB=libtcl76.a +- TCL8X_LIB=libtcl83g.a ++ TCL8X_LIB=libtcl8.3g.a + else + TCL76_LIB=libtcl7.6.a + TCL8X_LIB=libtcl8.3g.a diff --git a/www/aolserver/files/patch-b b/www/aolserver/files/patch-b new file mode 100644 index 000000000000..3f82e84c9170 --- /dev/null +++ b/www/aolserver/files/patch-b @@ -0,0 +1,40 @@ +--- nsd/nsmain.c Tue Apr 3 18:13:15 2001 ++++ nsd/nsmain.c.new Fri Feb 15 12:22:04 2002 +@@ -311,16 +311,10 @@ + /* + * Verify the uid/gid args. + */ +- +- if (garg != NULL) { +- gid = Ns_GetGid(garg); +- if (gid < 0) { +- gid = atoi(garg); +- if (gid == 0) { +- Ns_Fatal("nsmain: invalid group '%s'", garg); +- } +- } +- } ++ /* Reversed the order so this will actually work ++ * Jon Griffin <jon@jongriffin.com> 01/27/2001 ++ * ++ */ + if (uarg != NULL) { + uid = Ns_GetUid(uarg); + gid = Ns_GetUserGid(uarg); +@@ -329,6 +323,16 @@ + } + if (uid == 0) { + Ns_Fatal("nsmain: invalid user '%s'", uarg); ++ } ++ } ++ ++ if (garg != NULL) { ++ gid = Ns_GetGid(garg); ++ if (gid < 0) { ++ gid = atoi(garg); ++ if (gid == 0) { ++ Ns_Fatal("nsmain: invalid group '%s'", garg); ++ } + } + } + diff --git a/www/aolserver/files/patch-c b/www/aolserver/files/patch-c new file mode 100644 index 000000000000..5716715a1947 --- /dev/null +++ b/www/aolserver/files/patch-c @@ -0,0 +1,24 @@ +--- tcl8.3.2/unix/tclUnixPipe.c Thu Aug 17 17:46:15 2000 ++++ tcl8.3.2/unix/tclUnixPipe.c.new Fri Feb 15 12:30:19 2002 +@@ -950,12 +950,16 @@ + * nonblocking, the read will never block. + */ + +- bytesRead = read(GetFd(psPtr->inFile), buf, (size_t) toRead); +- if (bytesRead > -1) { +- return bytesRead; ++ while (1) { ++ bytesRead = read(GetFd(psPtr->inFile), buf, (size_t) toRead); ++ if (bytesRead > -1) { ++ return bytesRead; ++ } ++ if ( errno != EINTR ) { ++ *errorCodePtr = errno; ++ return -1; ++ } + } +- *errorCodePtr = errno; +- return -1; + } + + /* |