smbfs

[Jan Kratochvil]

Hi

> > includes smbumount, or (b) suggestions why I can't compile it myself. 
> > I'm running RH5.1, 2.0.35 kernel, glibc 2.0.7-29 rpm.
[snipped]

> The problem could be that you are using glibc - the structure of the include
> files seem to have changed with libc6/glibc2. Scan the sources, and look for
> includes from linux/<some file> sys/<some file> and play around - I got some
> programms to compile with libc6 this way...
  I attached my diff file to compile Samba under Linux kernel 2.1.126 with
glibc-2.0.7-980507 (shipped w/RedHat 5.1 as RPM glibc-2.0.7-7) installed.
There was a huge amount of errors and just these simple include fixes made it
go well.


							Lace
-------------- next part --------------
diff -ruN samba-1.9.18p10-orig/source/Makefile samba-1.9.18p10/source/Makefile
--- samba-1.9.18p10-orig/source/Makefile	Mon Jun 15 19:32:28 1998
+++ samba-1.9.18p10/source/Makefile	Fri Oct 30 21:55:36 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 at anu.edu.au
@@ -237,8 +237,8 @@
 
 # Use this for Linux with glibc2 (libc6)
 # contributed by Eloy Paris <peloy at ven.ra.rockwell.com>
-# FLAGSM = -DLINUX -DNETGROUP -DSHADOW_PWD -DALLOW_CHANGE_PASSWORD -DFAST_SHARE_MODES -DNO_ASMSIGNALH -DGLIBC2
-# LIBSM = -lnsl -lcrypt
+FLAGSM = -DLINUX -DNETGROUP -DSHADOW_PWD -DALLOW_CHANGE_PASSWORD -DFAST_SHARE_MODES -DNO_ASMSIGNALH -DGLIBC2 -DQUOTAS
+LIBSM = -lnsl -lcrypt
 
 # Use this for Linux with glibc2 (libc6) - RedHat Linux v5.0 with PAM
 # contributed by John H Terpstra <jht at aquasoft.com.au>
@@ -779,11 +779,11 @@
 
 smbmnt: $(MNT_OBJ)
 	@echo Linking smbmnt
-	@$(CC) $(CFLAGS) -o smbmnt $(MNT_OBJ)
+	@$(CC) $(CFLAGS) -o smbmnt $(MNT_OBJ) $(LIBS)
 
 smbumount: $(UMOUNT_OBJ)
 	@echo Linking smbumount
-	@$(CC) $(CFLAGS) -o smbumount $(UMOUNT_OBJ)
+	@$(CC) $(CFLAGS) -o smbumount $(UMOUNT_OBJ) $(LIBS)
 
 smbtorture: torture.o clientgen.o getsmbpass.o $(UTILOBJ)
 	@echo Linking smbtorture
diff -ruN samba-1.9.18p10-orig/source/smbmnt.c samba-1.9.18p10/source/smbmnt.c
--- samba-1.9.18p10-orig/source/smbmnt.c	Fri Jan 23 09:30:04 1998
+++ samba-1.9.18p10/source/smbmnt.c	Fri Oct 30 21:50:36 1998
@@ -24,9 +24,11 @@
 #include <errno.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include <sys/mount.h>
+/* #include <sys/mount.h> */
 #include <mntent.h>
 
+#include <asm/types.h>
+#include <asm/posix_types.h>
 #include <linux/fs.h>
 #include <linux/smb.h>
 #include <linux/smb_mount.h>
diff -ruN samba-1.9.18p10-orig/source/smbmount.c samba-1.9.18p10/source/smbmount.c
--- samba-1.9.18p10-orig/source/smbmount.c	Wed May 13 00:52:51 1998
+++ samba-1.9.18p10/source/smbmount.c	Sat Oct 31 09:52:45 1998
@@ -30,6 +30,7 @@
 #endif
 
 #include "includes.h"
+#include <asm/types.h>
 #include <linux/smb_fs.h>
 static struct smb_conn_opt conn_options;
 
diff -ruN samba-1.9.18p10-orig/source/smbumount.c samba-1.9.18p10/source/smbumount.c
--- samba-1.9.18p10-orig/source/smbumount.c	Mon Jun 15 19:32:32 1998
+++ samba-1.9.18p10/source/smbumount.c	Fri Oct 30 21:52:40 1998
@@ -24,11 +24,13 @@
 #include <errno.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include <sys/mount.h>
+/* #include <sys/mount.h> */
 #include <mntent.h>
 
 #include <sys/ioctl.h>
-#include <linux/fs.h>
+/* #include <linux/fs.h> */
+#include <asm/types.h>
+#include <asm/posix_types.h>
 #include <linux/smb.h>
 #include <linux/smb_mount.h>
 #include <linux/smb_fs.h>
@@ -94,7 +96,7 @@
 	if (realpath (path, canonical))
 		return canonical;
 
-	pstrcpy (canonical, path);
+	pstrcpy (canonical, (char *)path);
 	return canonical;
 }