4 files changed, 5 insertions, 9 deletions
diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index 5295de8010b..15c6ea30761 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -1477,7 +1477,7 @@ accordingly.
 static int read_inclusion_file(char *filename)
 {
 	XFILE *inclusion = NULL;
-	char buf[MAXPATHLEN + 1];
+	char buf[MAX_PATH + 1];
 	char *inclusion_buffer = NULL;
 	int inclusion_buffer_size = 0;
 	int inclusion_buffer_sofar = 0;
@@ -1487,7 +1487,7 @@ static int read_inclusion_file(char *filename)
 	int error = 0;
 
 	clipn = 0;
-	buf[MAXPATHLEN] = '\0'; /* guarantee null-termination */
+	buf[MAX_PATH] = '\0'; /* guarantee null-termination */
 	if ((inclusion = x_fopen(filename, O_RDONLY, 0)) == NULL) {
 		/* XXX It would be better to include a reason for failure, but without
 		 * autoconf, it's hard to use strerror, sys_errlist, etc.
diff --git a/source3/client/smbmnt.c b/source3/client/smbmnt.c
index ce406179cfd..0e36231bac7 100644
--- a/source3/client/smbmnt.c
+++ b/source3/client/smbmnt.c
@@ -94,9 +94,9 @@ parse_args(int argc, char *argv[], struct smb_mount_data *data, char **share)
 static char *
 fullpath(const char *p)
 {
-        char path[MAXPATHLEN];
+        char path[PATH_MAX+1];
 
-	if (strlen(p) > MAXPATHLEN-1) {
+	if (strlen(p) > PATH_MAX) {
 		return NULL;
 	}
 
diff --git a/source3/client/smbmount.c b/source3/client/smbmount.c
index 343d4f26757..156130758b1 100644
--- a/source3/client/smbmount.c
+++ b/source3/client/smbmount.c
@@ -428,7 +428,7 @@ static void send_fs_socket(char *the_service, char *mount_point, struct cli_stat
  **/
 static void init_mount(void)
 {
-	char mount_point[MAXPATHLEN+1];
+	char mount_point[PATH_MAX+1];
 	pstring tmp;
 	pstring svc2;
 	struct cli_state *c;
diff --git a/source3/include/includes.h b/source3/include/includes.h
index eb7f73b9d35..09375c84d8f 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -958,10 +958,6 @@ struct smb_ldap_privates;
 #define SYNC_DNS 1
 #endif
 
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 256
-#endif
-
 #ifndef SEEK_SET
 #define SEEK_SET 0
 #endif