cvs-20020521 lib/util.c on AIX

[Harald Koenig]

Hi,

compiling yesterday's CVS version of samba on AIX 4.3 breaks in lib/util.c
with the following error message (warnings removed)

Compiling lib/util.c
                 from /soft/samba/samba-pre3/samba-pre3-20020521/source/lib/util.c:23:
/usr/include/rpcsvc/yp_prot.h:342: warning: `struct ypall_callback' declared inside parameter list
/usr/include/rpcsvc/yp_prot.h:342: warning: its scope is only this definition or declaration, which is probably not what you want.
In file included from /soft/samba/samba-pre3/samba-pre3-20020521/source/lib/util.c:50:
/usr/include/rpcsvc/ypclnt.h:64: redefinition of `struct ypall_callback'
/soft/samba/samba-pre3/samba-pre3-20020521/source/lib/util.c: In function `automount_lookup':
/soft/samba/samba-pre3/samba-pre3-20020521/source/lib/util.c:992: warning: passing arg 3 of `yp_match' discards qualifiers from pointer target type
gmake: *** [lib/util.o] Error 1

because rpcsvc/yp_prot.h is included before/without rpcsvc/ypclnt.h
(IMHO that's a bug in AIX include files ?!).

my easy fix within samba is the patch below...


Index: util.c
===================================================================
RCS file: /cvsroot/samba/source/lib/util.c,v
retrieving revision 1.365
diff -u -r1.365 util.c
--- util.c	17 May 2002 14:51:22 -0000	1.365
+++ util.c	22 May 2002 08:09:21 -0000
@@ -20,8 +20,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "includes.h"
-
 #if (defined(HAVE_NETGROUP) && defined (WITH_AUTOMOUNT))
 #ifdef WITH_NISPLUS_HOME
 #ifdef BROKEN_NISPLUS_INCLUDE_FILES
@@ -51,6 +49,8 @@
 
 #endif /* WITH_NISPLUS_HOME */
 #endif /* HAVE_NETGROUP && WITH_AUTOMOUNT */
+
+#include "includes.h"
 
 int Protocol = PROTOCOL_COREPLUS;
 


Harald Koenig
-- 
"I hope to die                                      ___       _____
before I *have* to use Microsoft Word.",           0--,|    /OOOOOOO\
Donald E. Knuth, 02-Oct-2001 in Tuebingen.        <_/  /  /OOOOOOOOOOO\
                                                    \  \/OOOOOOOOOOOOOOO\
                                                      \ OOOOOOOOOOOOOOOOO|//
Harald Koenig                                          \/\/\/\/\/\/\/\/\/
science+computing ag                                    //  /     \\  \
koenig at science-computing.de                            ^^^^^       ^^^^^