summaryrefslogtreecommitdiff
path: root/package/samba/samba-fix-mount.cifs.patch
diff options
context:
space:
mode:
authorHans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>2009-01-13 07:29:35 +0000
committerHans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>2009-01-13 07:29:35 +0000
commit8e1e3e58fb326ed21506ff04f4950578fa066287 (patch)
treef6560941c5f8c71bd40dc3fb1fb767a9149be24e /package/samba/samba-fix-mount.cifs.patch
parentb9a79cd8f03225944b1339146c90cb30b81689e1 (diff)
samba: bump version to 3.2.7 and refresh patches against this version
This patch bumps the Samba version to 3.2.7 and refreshes the patches. It also fixes two minor issues by introducing two new small patches.
Diffstat (limited to 'package/samba/samba-fix-mount.cifs.patch')
-rw-r--r--package/samba/samba-fix-mount.cifs.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/package/samba/samba-fix-mount.cifs.patch b/package/samba/samba-fix-mount.cifs.patch
new file mode 100644
index 000000000..dcb30ebec
--- /dev/null
+++ b/package/samba/samba-fix-mount.cifs.patch
@@ -0,0 +1,40 @@
+--- a/source/client/mount.cifs.c
++++ b/source/client/mount.cifs.c
+@@ -16,6 +16,10 @@
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
++#ifdef _SAMBA_BUILD_
++#include "include/config.h"
++#endif
++
+ #ifndef _GNU_SOURCE
+ #define _GNU_SOURCE
+ #endif
+@@ -57,10 +61,6 @@
+ #endif /* _SAMBA_BUILD_ */
+ #endif /* MOUNT_CIFS_VENDOR_SUFFIX */
+
+-#ifdef _SAMBA_BUILD_
+-#include "include/config.h"
+-#endif
+-
+ #ifndef MS_MOVE
+ #define MS_MOVE 8192
+ #endif
+@@ -138,6 +138,7 @@ static size_t strlcat(char *d, const cha
+ return ret;
+ }
+ #endif
++#endif /* __GLIBC__ && !(__UCLIBC__ && __USE_BSD) */
+
+ /* BB finish BB
+
+@@ -178,7 +179,6 @@ static void mount_cifs_usage(void)
+ SAFE_FREE(mountpassword);
+ exit(EX_USAGE);
+ }
+-#endif /* __GLIBC__ && !(__UCLIBC__ && __USE_BSD) */
+
+ /* caller frees username if necessary */
+ static char * getusername(void) {