diff options
| author | Volker Lendecke <vl@samba.org> | 2008-09-21 20:39:17 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-10-06 13:08:58 +0200 |
| commit | ecc67001315111493738e893917c4550be7828a1 (patch) | |
| tree | fcc685425da8b76b6a75573c0d81f924cdb8ebd5 /source/client/mount.cifs.c | |
| parent | 7cb9d82244a8e93261d12a3800334d8152a2431e (diff) | |
| download | samba-ecc67001315111493738e893917c4550be7828a1.tar.gz samba-ecc67001315111493738e893917c4550be7828a1.tar.xz samba-ecc67001315111493738e893917c4550be7828a1.zip | |
Attempt to fix bug 5778
Jeff, Steve, please check!
(cherry picked from commit 110756cc7bcaed5a9d6aa58f3b3fe4481f8d1f31)
(cherry picked from commit 46b050e525b339fbac68329f668e47ebd11b3e08)
Diffstat (limited to 'source/client/mount.cifs.c')
| -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 8fb652be80b..56778dd4683 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 |