This commit was generated by cvs2svn to compensate for changes in r282,

which included commits to RCS files with non-trunk default branches.

diff --git a/acconfig.h b/acconfig.h
index 0979d194f26ad358fc7b64e24ce517e424324446..395c77a26ec7b1aa7f6105c17cedcff7917b3607 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -30,3 +30,10 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 #undef INODE_SETATTR_NOT_VOID
 #undef STRUCT_INODE_HAS_I_BYTES
 #undef STRUCT_ADDRESS_SPACE_HAS_PAGE_LOCK
+
+/* glue for RedHat kernel bug */
+#undef ENABLE_REDHAT_BUILDSYS
+
+#if defined(ENABLE_REDHAT_BUILDSYS) && defined(KERNEL) && defined(REDHAT_FIX)
+#include "redhat-fix.h"
+#endif

diff --git a/src/WINNT/doc/help/en_US/AFS-NT.HLP b/src/WINNT/doc/help/en_US/AFS-NT.HLP
index a220034dfc6865ef0dfd9e024a6f2e81851222a2..9c583c038c746fb4794c58b196cf528eaa3876f7 100755 (executable)
Binary files a/src/WINNT/doc/help/en_US/AFS-NT.HLP and b/src/WINNT/doc/help/en_US/AFS-NT.HLP differ

diff --git a/src/auth/cellconfig.c b/src/auth/cellconfig.c
index e14787be4050828f485e0420072c0f1b94ef67e4..cc00297ac71bf3dda588d028940fa6c93e3ec4f5 100644 (file)
--- a/src/auth/cellconfig.c
+++ b/src/auth/cellconfig.c
@@ -10,7 +10,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-RCSID("$Header: /tmp/cvstemp/openafs/src/auth/cellconfig.c,v 1.1.1.7 2001/07/14 22:20:39 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/auth/cellconfig.c,v 1.1.1.8 2001/07/16 07:16:46 hartmans Exp $");
 
 #include <afs/stds.h>
 #include <afs/pthread_glock.h>
@@ -600,14 +600,17 @@ afsconf_GetAfsdbInfo(acellName, aservice, acellInfo)
 
        if (type == T_AFSDB) {
            struct hostent *he;
+           short afsdb_type;
 
+           afsdb_type = (p[0] << 8) | p[1];
            code = dn_expand(answer, answer+len, p+2, host, sizeof(host));
            if (code < 0)
                return AFSCONF_NOTFOUND;
 
-           /* Do we want to get TTL data for the A record as well? */
-           he = gethostbyname(host);
-           if (he && server_num < MAXHOSTSPERCELL) {
+           if ((afsdb_type == 1) &&
+               (server_num < MAXHOSTSPERCELL) &&
+               /* Do we want to get TTL data for the A record as well? */
+               (he = gethostbyname(host))) {
                afs_int32 ipaddr;
                memcpy(&ipaddr, he->h_addr, he->h_length);
                acellInfo->hostAddr[server_num].sin_addr.s_addr = ipaddr;

diff --git a/src/cf/linux-test3.m4 b/src/cf/linux-test3.m4
index 202c9eb915325ba50d38993e0072478b87cd137f..d82c88829a0443b4c7529bcff899ea7ab1e45724 100644 (file)
--- a/src/cf/linux-test3.m4
+++ b/src/cf/linux-test3.m4
@@ -1,21 +1,20 @@
 AC_DEFUN(LINUX_NEED_RHCONFIG,[
+RHCONFIG_SP=""
+RHCONFIG_MP=""
 if test "x$enable_redhat_buildsys" = "xyes"; then
-  RHCONFIG_SP=""
-  RHCONFIG_MP=""
+  AC_MSG_WARN(Configured to build from a Red Hat SPEC file)
 else
   AC_MSG_CHECKING(for redhat kernel configuration)
   if test -f "${LINUX_KERNEL_PATH}/include/linux/rhconfig.h"; then
     ac_linux_rhconfig=yes
-    RHCONFIG_SP="-D__BOOT_KERNEL_UP=1 -D__BOOT_KERNEL_SMP=0 -U__SMP__"
-    RHCONFIG_MP="-D__BOOT_KERNEL_UP=0 -D__BOOT_KERNEL_SMP=1 -D__SMP__"
+    RHCONFIG_SP="-D__BOOT_KERNEL_UP=1 -D__BOOT_KERNEL_SMP=0"
+    RHCONFIG_MP="-D__BOOT_KERNEL_UP=0 -D__BOOT_KERNEL_SMP=1"
     AC_MSG_RESULT($ac_linux_rhconfig)
     if test ! -f "/boot/kernel.h"; then
         AC_MSG_WARN([/boot/kernel.h does not exist. build may fail])
     fi
   else
     ac_linux_rhconfig=no
-    RHCONFIG_SP="-U__SMP__"
-    RHCONFIG_MP="-D__SMP__"
     AC_MSG_RESULT($ac_linux_rhconfig)
   fi
 fi