more-uafs-support-20040417

Some more minor uafs fixes

diff --git a/src/libuafs/MakefileProto.AIX.in b/src/libuafs/MakefileProto.AIX.in
index 86e81e5..993c056 100644 (file)
--- a/src/libuafs/MakefileProto.AIX.in
+++ b/src/libuafs/MakefileProto.AIX.in
@@ -12,7 +12,7 @@ include @TOP_OBJDIR@/src/config/Makefile.config
 
 # System specific build commands and flags
 DEFINES= -DKERNEL -DUKERNEL
-CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBG}
 AR = /usr/bin/ar
 ARFLAGS = -r
 RANLIB = /bin/ranlib

diff --git a/src/libuafs/MakefileProto.DARWIN.in b/src/libuafs/MakefileProto.DARWIN.in
index ef58ada..5f79c1f 100644 (file)
--- a/src/libuafs/MakefileProto.DARWIN.in
+++ b/src/libuafs/MakefileProto.DARWIN.in
@@ -13,7 +13,7 @@ include @TOP_OBJDIR@/src/config/Makefile.config
 CC = cc
 DEFINES= -D_REENTRANT -DKERNEL -DUKERNEL
 KOPTS=
-CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG} $(XCFLAGS)
+CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBG} $(XCFLAGS)
 OPTF=-O
 # WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 

diff --git a/src/libuafs/MakefileProto.DUX.in b/src/libuafs/MakefileProto.DUX.in
index ddf0aec..9336c35 100644 (file)
--- a/src/libuafs/MakefileProto.DUX.in
+++ b/src/libuafs/MakefileProto.DUX.in
@@ -11,9 +11,9 @@ include @TOP_OBJDIR@/src/config/Makefile.config
 # System specific build commands and flags
 DEFINES=-DKERNEL -DUKERNEL -D_NO_PROTO -DOSF
 KOPTS=
-DBUG=
+DBG=
 OPTF=-O
-CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG} -pthread
+CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBG} -pthread
 WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 
 TEST_CFLAGS=-pthread -D_NO_PROTO -D_REENTRANT -DAFS_PTHREAD_ENV -Dosf -DAFS_OSF_ENV -DOSF

diff --git a/src/libuafs/MakefileProto.FBSD.in b/src/libuafs/MakefileProto.FBSD.in
index 55e90dd..91d36ee 100644 (file)
--- a/src/libuafs/MakefileProto.FBSD.in
+++ b/src/libuafs/MakefileProto.FBSD.in
@@ -13,7 +13,7 @@ include @TOP_OBJDIR@/src/config/Makefile.config
 CC = @CC@
 DEFINES= -D_REENTRANT -DKERNEL -DUKERNEL
 KOPTS=
-CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBG}
 OPTF=-O
 # WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 

diff --git a/src/libuafs/MakefileProto.HPUX.in b/src/libuafs/MakefileProto.HPUX.in
index 6666c27..00cde72 100644 (file)
--- a/src/libuafs/MakefileProto.HPUX.in
+++ b/src/libuafs/MakefileProto.HPUX.in
@@ -16,7 +16,7 @@ KOPTS=-Wp,-H200000 -Wl,-a,archive +DA1.0 +z
 <ia64_hpux1122 ia64_hpux1123>
 KOPTS=-Wp,-H200000 -Wl,-a,archive_shared
 <all>
-CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBG}
 OPTF=-O
 WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 

diff --git a/src/libuafs/MakefileProto.IRIX.in b/src/libuafs/MakefileProto.IRIX.in
index de5f3f9..2042a88 100644 (file)
--- a/src/libuafs/MakefileProto.IRIX.in
+++ b/src/libuafs/MakefileProto.IRIX.in
@@ -11,7 +11,7 @@ include @TOP_OBJDIR@/src/config/Makefile.config
 # System specific build commands and flags
 CC = cc
 DEFINES=-D_SGI_MP_SOURCE -DKERNEL -DUKERNEL
-CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBG}
 OPTF=-O
 WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 

diff --git a/src/libuafs/MakefileProto.LINUX.in b/src/libuafs/MakefileProto.LINUX.in
index 0c556e6..c1a998c 100644 (file)
--- a/src/libuafs/MakefileProto.LINUX.in
+++ b/src/libuafs/MakefileProto.LINUX.in
@@ -17,7 +17,7 @@ include @TOP_OBJDIR@/src/config/Makefile.config
 # System specific build commands and flags
 DEFINES= -D_REENTRANT -DKERNEL -DUKERNEL
 KOPTS=
-CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBG}
 OPTF=-O
 # WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 

diff --git a/src/libuafs/MakefileProto.NBSD.in b/src/libuafs/MakefileProto.NBSD.in
index c1a085b..66f53e0 100644 (file)
--- a/src/libuafs/MakefileProto.NBSD.in
+++ b/src/libuafs/MakefileProto.NBSD.in
@@ -13,7 +13,7 @@ include @TOP_OBJDIR@/src/config/Makefile.config
 CC = gcc
 DEFINES= -DKERNEL -DUKERNEL
 KOPTS=
-CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBG}
 OPTF=-O
 
 TEST_CFLAGS=   -DAFS_NBSD_ENV

diff --git a/src/libuafs/MakefileProto.OBSD.in b/src/libuafs/MakefileProto.OBSD.in
index 200d829..c1b7058 100644 (file)
--- a/src/libuafs/MakefileProto.OBSD.in
+++ b/src/libuafs/MakefileProto.OBSD.in
@@ -13,7 +13,7 @@ include @TOP_OBJDIR@/src/config/Makefile.config
 CC = gcc
 DEFINES= -DKERNEL -DUKERNEL
 KOPTS=
-CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBG}
 OPTF=-O
 
 TEST_CFLAGS=   -DAFS_OBSD_ENV

diff --git a/src/libuafs/MakefileProto.SOLARIS.in b/src/libuafs/MakefileProto.SOLARIS.in
index 14000a5..a87d65b 100644 (file)
--- a/src/libuafs/MakefileProto.SOLARIS.in
+++ b/src/libuafs/MakefileProto.SOLARIS.in
@@ -10,7 +10,7 @@ include @TOP_OBJDIR@/src/config/Makefile.config
 
 # System specific build commands and flags
 DEFINES= -D_REENTRANT -DKERNEL -DUKERNEL
-CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
+CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBG}
 OPTF=-O
 WEBOPTS = -KPIC -I../nsapi -DNETSCAPE_NSAPI -DSOLARIS -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 

diff --git a/src/rx/UKERNEL/rx_knet.c b/src/rx/UKERNEL/rx_knet.c
index 3928ad0..bf00f86 100644 (file)
--- a/src/rx/UKERNEL/rx_knet.c
+++ b/src/rx/UKERNEL/rx_knet.c
@@ -228,7 +228,7 @@ rxk_InitializeSocket(void)
     optlen = sizeof(optval);
     rc = getsockopt(sock, SOL_SOCKET, SO_SNDBUF, (void *)&optval, &optlen);
     usr_assert(rc == 0);
-    usr_assert(optval == optval0);
+    /* usr_assert(optval == optval0); */
 #ifdef AFS_USR_LINUX22_ENV
     optval0 = 131070;
 #else
@@ -241,7 +241,7 @@ rxk_InitializeSocket(void)
     optlen = sizeof(optval);
     rc = getsockopt(sock, SOL_SOCKET, SO_RCVBUF, (void *)&optval, &optlen);
     usr_assert(rc == 0);
-    usr_assert(optval == optval0);
+    /* usr_assert(optval == optval0); */
 
 #ifdef AFS_USR_AIX_ENV
     optval = 1;