From 4a090ba06a54f5da179ac02bb307cc03d08831bf Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Wed, 16 Jul 2003 05:34:56 +0000
Subject: trying to get HEAD building again.  If you want the code prior to
 this merge, checkout HEAD_PRE_3_0_0_BETA_3_MERGE (This used to be commit
 adb98e7b7cd0f025b52c570e4034eebf4047b1ad)

---
 source3/smbwrapper/shared.c   | 4 ++--
 source3/smbwrapper/smbw_dir.c | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'source3/smbwrapper')

diff --git a/source3/smbwrapper/shared.c b/source3/smbwrapper/shared.c
index b4cfcf7148..ca8df5841d 100644
--- a/source3/smbwrapper/shared.c
+++ b/source3/smbwrapper/shared.c
@@ -179,8 +179,8 @@ void smbw_setshared(const char *name, const char *val)
 	SSVAL(&variables[shared_size], 0, l1);
 	SSVAL(&variables[shared_size], 2, l2);
 
-	pstrcpy(&variables[shared_size] + 4, name);
-	pstrcpy(&variables[shared_size] + 4 + l1, val);
+	safe_strcpy(&variables[shared_size] + 4, name, l1-1);
+	safe_strcpy(&variables[shared_size] + 4 + l1, val, l2-1);
 
 	shared_size += l1+l2+4;
 
diff --git a/source3/smbwrapper/smbw_dir.c b/source3/smbwrapper/smbw_dir.c
index 31d81a1e7e..6d55c1d9da 100644
--- a/source3/smbwrapper/smbw_dir.c
+++ b/source3/smbwrapper/smbw_dir.c
@@ -216,7 +216,7 @@ int smbw_dir_open(const char *fname)
 		smbw_NetServerEnum(&srv->cli, srv->server_name, SV_TYPE_ALL,
 				   smbw_server_add, NULL);
 		*p = '#';
-	} else if (strcmp(srv->cli.dev,"IPC") == 0) {
+	} else if ((strcmp(srv->cli.dev,"IPC") == 0) || (strcasecmp(share,"IPC$") == 0)) {
 		DEBUG(4,("doing NetShareEnum\n"));
 		smbw_share_add(".",0,"", NULL);
 		smbw_share_add("..",0,"", NULL);
@@ -412,7 +412,8 @@ int smbw_chdir(const char *name)
 		goto failed;
 	}
 
-	if (strncmp(srv->cli.dev,"IPC",3) &&
+	if (strncmp(srv->cli.dev,"IPC",3) && 
+	    strcasecmp(share, "IPC$") &&
 	    strncmp(srv->cli.dev,"LPT",3) &&
 	    !smbw_getatr(srv, path, 
 			 &mode, NULL, NULL, NULL, NULL, NULL)) {
-- 
cgit