summaryrefslogtreecommitdiff
path: root/package/samba/samba-fix-mount.cifs.patch
diff options
context:
space:
mode:
authorSven Neumann <s.neumann@raumfeld.com>2011-09-13 10:42:07 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2011-09-13 21:31:55 +0200
commitb25b711e4a62095817e415c4961ea5530c28876e (patch)
tree0406c2a09f8281a747631fc4bd9173aff548c435 /package/samba/samba-fix-mount.cifs.patch
parentab6b9e77fed118acb8a757d947708fc1773d21dc (diff)
samba: bump to 3.5.11
Bump to version 3.5.11 and also update the download location. Signed-off-by: Sven Neumann <s.neumann@raumfeld.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/samba/samba-fix-mount.cifs.patch')
-rw-r--r--package/samba/samba-fix-mount.cifs.patch35
1 files changed, 19 insertions, 16 deletions
diff --git a/package/samba/samba-fix-mount.cifs.patch b/package/samba/samba-fix-mount.cifs.patch
index 90bff234c..9c235ea7b 100644
--- a/package/samba/samba-fix-mount.cifs.patch
+++ b/package/samba/samba-fix-mount.cifs.patch
@@ -1,18 +1,21 @@
---- a/source/client/mount.cifs.c
-+++ b/source/client/mount.cifs.c
-@@ -138,6 +138,7 @@ static size_t strlcat(char *d, const cha
- return ret;
- }
- #endif
-+#endif /* __GLIBC__ && !(__UCLIBC__ && __USE_BSD) */
-
- /* BB finish BB
+--- a/client/mount.cifs.c 2011-09-13 10:26:21.000000000 +0200
++++ b/client/mount.cifs.c 2011-09-13 10:27:16.000000000 +0200
+@@ -39,7 +39,6 @@
+ #include <mntent.h>
+ #include <fcntl.h>
+ #include <limits.h>
+-#include <fstab.h>
+ #include "mount.h"
-@@ -178,7 +179,6 @@ static void mount_cifs_usage(void)
- SAFE_FREE(mountpassword);
- exit(EX_USAGE);
+ #define MOUNT_CIFS_VERSION_MAJOR "1"
+@@ -255,6 +254,10 @@
+ return 0;
}
--#endif /* __GLIBC__ && !(__UCLIBC__ && __USE_BSD) */
-
- /* caller frees username if necessary */
- static char * getusername(void) {
+ #else /* CIFS_LEGACY_SETUID_CHECK */
++
++#ifndef _PATH_FSTAB
++#define _PATH_FSTAB "/etc/fstab"
++#endif
+ static int
+ check_fstab(const char *progname, char *mountpoint, char *devname,
+ char **options)