Merge from HEAD. Use pstrcpy not safe_strcpy.

Jeremy.
(This used to be commit 9634b1fba059228d436198629a5c7cf01fb6736c)

diff --git a/source3/msdfs/msdfs.c b/source3/msdfs/msdfs.c
index 4df31450095d261bd8fe756ae9d29daade84b9f1..bf3b3cc21302421a4c5b1b8ef2392a5f2c7abb5b 100644 (file)
--- a/source3/msdfs/msdfs.c
+++ b/source3/msdfs/msdfs.c
@@ -266,7 +266,7 @@ static BOOL resolve_dfs_path(char* dfspath, struct dfs_path* dp,
                        if (consumedcntp) {
                                char *q;
                                pstring buf;
-                               safe_strcpy(buf, dfspath, sizeof(buf));
+                               pstrcpy(buf, dfspath);
                                trim_string(buf, NULL, "\\");
                                q = strrchr(buf, '\\');
                                if (q) 
@@ -633,7 +633,7 @@ int setup_dfs_referral(char* pathname, int max_referral_level, char** ppdata)
               && pathnamep[1] == '\\')
                pathnamep++;
 
-       safe_strcpy(buf, pathnamep, sizeof(buf));
+       pstrcpy(buf, pathnamep);
        if (!get_referred_path(buf, &junction, &consumedcnt,
                               &self_referral))
                return -1;