diff options
| author | Volker Lendecke <vl@samba.org> | 2008-09-21 20:39:17 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-09-21 22:56:50 +0200 |
| commit | 73aebd7d070099d4d6d6da98817f42937bc7fd03 (patch) | |
| tree | 632ec2efc1cc7aef930a031dfe1f7b9a9d00c68e /source3/client | |
| parent | e194ded26e716fad510191f85e67ff1d775bdcb8 (diff) | |
| download | samba-73aebd7d070099d4d6d6da98817f42937bc7fd03.tar.gz samba-73aebd7d070099d4d6d6da98817f42937bc7fd03.tar.bz2 samba-73aebd7d070099d4d6d6da98817f42937bc7fd03.zip | |
Attempt to fix bug 5778
Jeff, Steve, please check!
Diffstat (limited to 'source3/client')
| -rw-r--r-- | source3/client/mount.cifs.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/source3/client/mount.cifs.c b/source3/client/mount.cifs.c index 3b56e5f861..b7a76c6102 100644 --- a/source3/client/mount.cifs.c +++ b/source3/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 |