[OpenAFS-devel] Unified patch, fixes compilation problem on openafs-1.0.4 for S/390

[Adam Thornton]

--k+w/mQv8wyuph6w0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

This is a patch set that includes Carsten Jacobi's password fixes and
also a very small tweak to the libafs Makefile prototype that lets it
compile without error under Linux/390.  I'm a little nervous about
running something called redhat.sh, since the distro *I'm* using is not
Red Hat based, and I think the script ought to be renamed something a
bit more generic (although, if it's a temporary measure, I guess it
doesn't matter).

Adam

--k+w/mQv8wyuph6w0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="openafs-1.0.4.patch"

diff -cbr openafs-1.0.4/src/kauth/admin_tools.c openafs-1.0.4-orig/src/kauth/admin_tools.c
*** openafs-1.0.4/src/kauth/admin_tools.c	Tue May 22 10:54:24 2001
--- openafs-1.0.4-orig/src/kauth/admin_tools.c	Mon Apr 23 02:11:32 2001
***************
*** 768,778 ****
      if (as->parms[3].items) 
        sscanf (as->parms[3].items->data, "%d", &kvno);
  
- #ifdef AFS_S390_LINUX20_ENV
-     code = ubik_Call (KAM_SetPassword, conn, 0, name, instance, kvno, 0, key);
- #else
      code = ubik_Call (KAM_SetPassword, conn, 0, name, instance, kvno, key);
- #endif
      if (code) com_err (whoami, code,
  		       "so can't set password for %s.%s", name, instance);
      return code;
--- 768,774 ----
diff -cbr openafs-1.0.4/src/kauth/authclient.c openafs-1.0.4-orig/src/kauth/authclient.c
*** openafs-1.0.4/src/kauth/authclient.c	Tue May 22 10:54:24 2001
--- openafs-1.0.4-orig/src/kauth/authclient.c	Mon Apr 23 02:26:17 2001
***************
*** 788,800 ****
      afs_int32	   code;
  
      LOCK_GLOBAL_MUTEX
- #ifdef AFS_S390_LINUX20_ENV
-     code = ubik_Call_New (KAM_SetPassword, conn, 0, name, 
- 			  instance, 0, 0, *newkey);
- #else
      code = ubik_Call_New (KAM_SetPassword, conn, 0, name, 
  			  instance, 0, *newkey);
- #endif
      UNLOCK_GLOBAL_MUTEX
      return code;
  }
--- 788,795 ----
diff -cbr openafs-1.0.4/src/libafs/MakefileProto.LINUX openafs-1.0.4-orig/src/libafs/MakefileProto.LINUX
*** openafs-1.0.4/src/libafs/MakefileProto.LINUX	Tue May 22 11:26:54 2001
--- openafs-1.0.4-orig/src/libafs/MakefileProto.LINUX	Mon Apr 23 22:52:33 2001
***************
*** 91,97 ****
  			mkdir -p $${KDIR}; \
  			ln -fs ../Makefile $${KDIR}/Makefile ; \
  			ln -fs ../Makefile.common $${KDIR}/Makefile.common; \
! <i386_linux22 i386_linux24 s390_linux22>
  			sh ./redhat.sh ${LINUX_SRCDIR}$$v $${KDIR}/Makefile.extradefs; \
  <all>
  		done \
--- 91,97 ----
  			mkdir -p $${KDIR}; \
  			ln -fs ../Makefile $${KDIR}/Makefile ; \
  			ln -fs ../Makefile.common $${KDIR}/Makefile.common; \
! <i386_linux22 i386_linux24>
  			sh ./redhat.sh ${LINUX_SRCDIR}$$v $${KDIR}/Makefile.extradefs; \
  <all>
  		done \

--k+w/mQv8wyuph6w0--