diff -ur samba-3.0.6rc2.orig/source/include/includes.h samba-3.0.6rc2/source/include/includes.h
--- samba-3.0.6rc2.orig/source/include/includes.h	2004-08-06 23:38:21.000000000 +0200
+++ samba-3.0.6rc2/source/include/includes.h	2004-08-18 15:01:06.000000000 +0200
@@ -369,12 +369,12 @@
 #endif
 
 #if defined (HAVE_NETGROUP)
-#if defined(HAVE_RPCSVC_YP_PROT_H)
-#include <rpcsvc/yp_prot.h>
-#endif
 #if defined(HAVE_RPCSVC_YPCLNT_H)
 #include <rpcsvc/ypclnt.h>
 #endif
+#if defined(HAVE_RPCSVC_YP_PROT_H)
+#include <rpcsvc/yp_prot.h>
+#endif
 #endif /* HAVE_NETGROUP */
 
 #if defined(HAVE_SYS_IPC_H)
Only in samba-3.0.6rc2/source/include: includes.h~
diff -ur samba-3.0.6rc2.orig/source/lib/util.c samba-3.0.6rc2/source/lib/util.c
--- samba-3.0.6rc2.orig/source/lib/util.c	2004-07-08 19:06:13.000000000 +0200
+++ samba-3.0.6rc2/source/lib/util.c	2004-08-18 15:21:02.000000000 +0200
@@ -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 */
 
@@ -1123,7 +1119,7 @@
 *******************************************************************/
 
 #ifdef WITH_NISPLUS_HOME
-char *automount_lookup(const char *user_name)
+char *automount_lookup( char *user_name)
 {
 	static fstring last_key = "";
 	static pstring last_value = "";
@@ -1166,7 +1162,7 @@
 }
 #else /* WITH_NISPLUS_HOME */
 
-char *automount_lookup(const char *user_name)
+char *automount_lookup( char *user_name)
 {
 	static fstring last_key = "";
 	static pstring last_value = "";