[SCM] Samba Shared Repository - branch v3-3-test updated -
release-3-2-0pre2-4155-g110756c
Volker Lendecke
vlendec at samba.org
Sun Sep 21 20:56:55 GMT 2008
The branch, v3-3-test has been updated
via 110756cc7bcaed5a9d6aa58f3b3fe4481f8d1f31 (commit)
from 9c464946c1f77a6f95da4a36fd590ec75734432d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit 110756cc7bcaed5a9d6aa58f3b3fe4481f8d1f31
Author: Volker Lendecke <vl at samba.org>
Date: Sun Sep 21 20:39:17 2008 +0200
Attempt to fix bug 5778
Jeff, Steve, please check!
-----------------------------------------------------------------------
Summary of changes:
source/client/mount.cifs.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/client/mount.cifs.c b/source/client/mount.cifs.c
index 3b56e5f..b7a76c6 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
--
Samba Shared Repository
More information about the samba-cvs
mailing list