diff options
| author | Volker Lendecke <vl@samba.org> | 2008-09-21 20:39:17 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-09-29 03:54:24 -0700 |
| commit | 238f02b35720b9a8d49a0defba7be8ddb1b107d9 (patch) | |
| tree | 5cb220347e7c09a474fc27c32805d0ad1d1b5f58 | |
| parent | b9c9bab8f732d1b63a7e07086742cb00d04dbbf0 (diff) | |
| download | samba-238f02b35720b9a8d49a0defba7be8ddb1b107d9.tar.gz samba-238f02b35720b9a8d49a0defba7be8ddb1b107d9.tar.xz samba-238f02b35720b9a8d49a0defba7be8ddb1b107d9.zip | |
Attempt to fix bug 5778
Jeff, Steve, please check!
(cherry picked from commit 110756cc7bcaed5a9d6aa58f3b3fe4481f8d1f31)
| -rw-r--r-- | source/client/mount.cifs.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/source/client/mount.cifs.c b/source/client/mount.cifs.c index 3b56e5f861a..b7a76c61024 100644 --- a/source/client/mount.cifs.c +++ b/source/client/mount.cifs.c @@ -56,6 +56,10 @@ #endif /* _SAMBA_BUILD_ */ #endif /* MOUNT_CIFS_VENDOR_SUFFIX */ +#ifdef _SAMBA_BUILD_ +#include "include/config.h" +#endif + #ifndef MS_MOVE #define MS_MOVE 8192 #endif @@ -94,6 +98,8 @@ char * prefixpath = NULL; /* like strncpy but does not 0 fill the buffer and always null * terminates. bufsize is the size of the destination buffer */ + +#ifndef HAVE_STRLCPY static size_t strlcpy(char *d, const char *s, size_t bufsize) { size_t len = strlen(s); @@ -104,10 +110,13 @@ static size_t strlcpy(char *d, const char *s, size_t bufsize) d[len] = 0; return ret; } +#endif /* like strncat but does not 0 fill the buffer and always null * terminates. bufsize is the length of the buffer, which should * be one more than the maximum resulting string length */ + +#ifndef HAVE_STRLCAT static size_t strlcat(char *d, const char *s, size_t bufsize) { size_t len1 = strlen(d); @@ -126,6 +135,7 @@ static size_t strlcat(char *d, const char *s, size_t bufsize) } return ret; } +#endif /* BB finish BB |