Ship date for 2.2.3.

[Albert Chin]

On Mon, Jan 28, 2002 at 12:27:50PM -0800, Jeremy Allison wrote:
> I'm hoping to ship 2.2.3 this friday (USA Pacific Time). This
> means it would really help for people to do a final check out
> of the source code from SAMBA_2_2 and test it as much as
> possible. I don't have any current show stoppers listed, but
> Jerry and I will be regression testing as much as possible
> over the next few days.

We've built the SAMBA_2_2 branch on Solaris 2.5.1, 2.6, 7, 8, HP-UX
10.20, 11.00, Tru64 UNIX 4.0D, 5.0A, 5.1, IRIX 6.2, 6.5, and AIX
4.3.2. A few problems were encountered:

1. source/include/includes.h blindly includes:
  #include "nsswitch/nss.h"

   On HP-UX 10.20, "nsswitch/nss.h" then includes
  #include "nsswitch/hp_nss_common.h"
   which wants <synch.h>. This doesn't exist on HP-UX 10.20,
   only HP-UX 11.00 and above. Our current hack is to check
   for <synch.h> with the following patch. Should we be trying
   something else?

Index: source/configure.in
===================================================================
RCS file: /cvsroot/samba/source/configure.in,v
retrieving revision 1.130.4.108
diff -u -3 -p -r1.130.4.108 configure.in
--- source/configure.in	17 Jan 2002 19:13:41 -0000	1.130.4.108
+++ source/configure.in	31 Jan 2002 08:14:05 -0000
@@ -398,6 +395,7 @@ case "$host_os" in
 esac
 AC_CHECK_HEADERS(shadow.h netinet/ip.h netinet/tcp.h netinet/in_systm.h netinet/in_ip.h)
 AC_CHECK_HEADERS(nss.h nss_common.h ns_api.h sys/security.h security/pam_appl.h security/pam_modules.h)
+AC_CHECK_HEADERS(synch.h)
 AC_CHECK_HEADERS(stropts.h poll.h)
 AC_CHECK_HEADERS(sys/capability.h syscall.h sys/syscall.h)
 AC_CHECK_HEADERS(sys/acl.h sys/cdefs.h glob.h)
Index: source/nsswitch/nss.h
===================================================================
RCS file: /cvsroot/samba/source/nsswitch/nss.h,v
retrieving revision 1.1.2.7
diff -u -3 -p -r1.1.2.7 nss.h
--- source/nsswitch/nss.h	9 Jan 2002 03:37:14 -0000	1.1.2.7
+++ source/nsswitch/nss.h	31 Jan 2002 08:14:06 -0000
@@ -73,7 +73,7 @@ typedef enum
 #define NSD_MEM_VOLATILE 1
 #define NSD_MEM_DYNAMIC 2
 
-#elif defined(HPUX)
+#elif defined(HPUX) && defined(HAVE_SYNCH_H)
 /* HP-UX 11 */
 
 #include "nsswitch/hp_nss_common.h"

2. On AIX 4.3.2, you cannot include /usr/include/rpcsvc/ypclnt.h
   multiple times. It's already included by source/include/includes.h
   so no need to include again.

Index: source/lib/util.c
===================================================================
RCS file: /cvsroot/samba/source/lib/util.c,v
retrieving revision 1.287.4.40
diff -u -3 -p -r1.287.4.40 util.c
--- source/lib/util.c	11 Jan 2002 18:27:01 -0000	1.287.4.40
+++ source/lib/util.c	31 Jan 2002 08:14:06 -0000
@@ -46,10 +46,6 @@
 
 #include <rpcsvc/nis.h>
 
-#else /* !WITH_NISPLUS_HOME */
-
-#include "rpcsvc/ypclnt.h"
-
 #endif /* WITH_NISPLUS_HOME */
 #endif /* HAVE_NETGROUP && WITH_AUTOMOUNT */
 
3. Why do you force O32 binaries under IRIX? Why not use whatever the
   default is?

Index: source/Makefile.in
===================================================================
RCS file: /cvsroot/samba/source/Makefile.in,v
retrieving revision 1.227.2.106
diff -u -3 -p -r1.227.2.106 Makefile.in
--- source/Makefile.in	18 Jan 2002 00:38:15 -0000	1.227.2.106
+++ source/Makefile.in	31 Jan 2002 08:14:02 -0000
@@ -474,8 +474,8 @@ MAKEDIR = || exec false; \
 .c.po32: 
 	@if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \
 	  dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi
-	@echo Compiling $*.c with @PICFLAG@ and -32
-	@$(CC) -32 -I. -I$(srcdir) $(FLAGS32) @PICFLAG@ -c $< \
+	@echo Compiling $*.c with @PICFLAG@
+	@$(CC) -I. -I$(srcdir) $(FLAGS32) @PICFLAG@ -c $< \
 	  -o $*.po32.o 
 @BROKEN_CC@	-mv `echo $@ | sed -e 's%^.*/%%g' -e 's%\.po32$$%.o%'` $@.o
 	@mv $*.po32.o $@
@@ -612,7 +612,7 @@ bin/smbwrapper. at SHLIBEXT@: $(PICOBJS)
 
 bin/smbwrapper.32. at SHLIBEXT@: $(PICOBJS32)
 	@echo Linking shared library $@
-	@$(SHLD) -32 @LDSHFLAGS@ -o $@ $(PICOBJS32) $(LIBS)
+	@$(SHLD) @LDSHFLAGS@ -o $@ $(PICOBJS32) $(LIBS)
 
 libsmbclient: $(LIBSMBCLIENT_PICOBJS)
 	@echo Linking libsmbclient shared library bin/$@. at SHLIBEXT@

-- 
albert chin (china at thewrittenword.com)