f02a0408dc
This patch bumps Samba version to 3.2.5. In the process Samba now depends on libiconv. This dependency is needed because Samba wants to use various formats when talking to the different parts of the system. Two new patches are introduced, one to double check if BSD functions are available, and one to skip checking for glibc version. The use unsigned enum patch could be removed since this can be supplied with a autoconf variable. Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
19 lines
589 B
Diff
19 lines
589 B
Diff
--- a/source/client/mount.cifs.c
|
|
+++ b/source/client/mount.cifs.c
|
|
@@ -91,6 +91,7 @@ char * prefixpath = NULL;
|
|
|
|
/* glibc doesn't have strlcpy, strlcat. Ensure we do. JRA. We
|
|
* don't link to libreplace so need them here. */
|
|
+#if defined(__GLIBC__) && !(defined(__UCLIBC__) && defined(__USE_BSD))
|
|
|
|
/* like strncpy but does not 0 fill the buffer and always null
|
|
* terminates. bufsize is the size of the destination buffer */
|
|
@@ -126,6 +127,7 @@ static size_t strlcat(char *d, const cha
|
|
}
|
|
return ret;
|
|
}
|
|
+#endif /* __GLIBC__ && !(__UCLIBC__ && __USE_BSD) */
|
|
|
|
/* BB finish BB
|
|
|