4 files changed, 15 insertions, 2 deletions
diff --git a/source/lib/fault.c b/source/lib/fault.c
index d8364ff2257..3cb66846393 100644
--- a/source/lib/fault.c
+++ b/source/lib/fault.c
@@ -35,7 +35,8 @@ static void fault_report(int sig)
 
 	DEBUG(0,("===============================================================\n"));
 	DEBUG(0,("INTERNAL ERROR: Signal %d in pid %d (%s)",sig,(int)sys_getpid(),SAMBA_VERSION_STRING));
-	DEBUG(0,("\nPlease read the appendix Bugs of the Samba HOWTO collection\n"));
+	DEBUG(0,("\nPlease read the Trouble-Shooting section of the Samba3-HOWTO\n"));
+	DEBUG(0,("\nFrom: http://www.samba.org/samba/docs/Samba3-HOWTO.pdf\n"));
 	DEBUG(0,("===============================================================\n"));
   
 	smb_panic("internal error");
diff --git a/source/lib/sysquotas_4A.c b/source/lib/sysquotas_4A.c
index 5596481bd29..99b1a13e997 100644
--- a/source/lib/sysquotas_4A.c
+++ b/source/lib/sysquotas_4A.c
@@ -24,6 +24,12 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_QUOTA
 
+#ifndef HAVE_SYS_QUOTAS
+#ifdef HAVE_QUOTACTL_4A
+#undef HAVE_QUOTACTL_4A
+#endif
+#endif
+
 #ifdef HAVE_QUOTACTL_4A
 /* long quotactl(int cmd, char *special, qid_t id, caddr_t addr) */
 /* this is used by: HPUX,IRIX */
diff --git a/source/lib/sysquotas_linux.c b/source/lib/sysquotas_linux.c
index 4c024b04cc4..28a86196e2b 100644
--- a/source/lib/sysquotas_linux.c
+++ b/source/lib/sysquotas_linux.c
@@ -24,6 +24,12 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_QUOTA
 
+#ifndef HAVE_SYS_QUOTAS
+#ifdef HAVE_QUOTACTL_LINUX
+#undef HAVE_QUOTACTL_LINUX
+#endif
+#endif
+
 #ifdef HAVE_QUOTACTL_LINUX 
 
 #include "samba_linux_quota.h"
diff --git a/source/lib/util.c b/source/lib/util.c
index f66397104d6..39938921968 100644
--- a/source/lib/util.c
+++ b/source/lib/util.c
@@ -1618,7 +1618,7 @@ void smb_panic2(const char *why, BOOL decrement_pid_count )
   A readdir wrapper which just returns the file name.
  ********************************************************************/
 
-const char *readdirname(DIR *p)
+const char *readdirname(SMB_STRUCT_DIR *p)
 {
 	SMB_STRUCT_DIRENT *ptr;
 	char *dname;