The samba user from Herefordshire with the wife's Win95 box
downstairs here again... your patch certainly fixes my compile of
most of samba-1.9.18p10! But due to incompatibilities in header
files, the Samba Makefile barfs.
My very quick and very dirty fix for this is enclosed... the
typedefs for __u16 and __u32 don't get seen by the samba suite
and <asm/posix_types.h> needs to be included. They're probably all
put in the wrong places, but it makes it compile and work.
The reason I'm sending this to you first before the samba crowd is
because I can't help feeling there's a far more elegant way of doing
it, and you (knowing the code) might know where it is.
Best wishes
John Hayward-Warburton
linux@billabong.demon.co.uk
diff -u -r samba-1.9.18p10/source/Makefile samba-1.9.18p10-2.1.118/source/Makefile
--- samba-1.9.18p10/source/Makefile Mon Jun 15 17:32:28 1998
+++ samba-1.9.18p10-2.1.118/source/Makefile Thu Aug 27 11:37:02 1998
@@ -200,7 +200,7 @@
# you must use the smbfs utilities from
# ftp://ftp.gwdg.de/pub/linux/misc/smbfs
-# MOUNT_PROGS = smbmount smbmnt smbumount
+MOUNT_PROGS = smbmount smbmnt # smbumount
# Use this for Linux with shadow passwords - but not using PAM!
# contributed by Andrew.Tridgell@anu.edu.au
@@ -237,8 +237,8 @@
# Use this for Linux with glibc2 (libc6)
# contributed by Eloy Paris <peloy@ven.ra.rockwell.com>
-# FLAGSM = -DLINUX -DNETGROUP -DSHADOW_PWD -DALLOW_CHANGE_PASSWORD -DFAST_SHARE_MODES -DNO_ASMSIGNALH -DGLIBC2
-# LIBSM = -lnsl -lcrypt
+FLAGSM = -DLINUX -DALLOW_CHANGE_PASSWORD -DFAST_SHARE_MODES -DNO_ASMSIGNALH -DGLIBC2
+LIBSM = -lnsl -lcrypt
# Use this for Linux with glibc2 (libc6) - RedHat Linux v5.0 with PAM
# contributed by John H Terpstra <jht@aquasoft.com.au>
diff -u -r samba-1.9.18p10/source/smbmnt.c samba-1.9.18p10-2.1.118/source/smbmnt.c
--- samba-1.9.18p10/source/smbmnt.c Fri Jan 23 08:30:04 1998
+++ samba-1.9.18p10-2.1.118/source/smbmnt.c Thu Aug 27 11:35:47 1998
@@ -4,7 +4,9 @@
* Copyright (C) 1995-1998 by Paal-Kr. Engstad and Volker Lendecke
*
*/
-
+typedef unsigned short __u16;
+typedef unsigned int __u32;
+#include <asm/posix_types.h>
#include <stdio.h>
#include <string.h>
#include <signal.h>
diff -u -r samba-1.9.18p10/source/smbmount.c samba-1.9.18p10-2.1.118/source/smbmount.c
--- samba-1.9.18p10/source/smbmount.c Tue May 12 22:52:51 1998
+++ samba-1.9.18p10-2.1.118/source/smbmount.c Thu Aug 27 11:34:29 1998
@@ -29,6 +29,9 @@
#error this code will only compile on versions of linux after 2.1.70
#endif
+
+typedef unsigned short __u16;
+typedef unsigned int __u32;
#include "includes.h"
#include <linux/smb_fs.h>
static struct smb_conn_opt conn_options;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.altern.org/andrebalsa/doc/lkml-faq.html