From d113aff1083750b1d2b393544b27024f1bb9d650 Mon Sep 17 00:00:00 2001
From: david <zathrasorama@gmail.com>
Date: Mon, 27 Jul 2015 23:02:02 +0100
Subject: [PATCH] Correctly pass a pointer when handling a mapid_reply. Change
 text slightly for connection messages. Improve the scope of .gitignore.

---
 .gitignore      | 12 ++++++++++++
 fuse/commands.c |  4 ++--
 lib/proto_map.c |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0331bbb..d9f648c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,8 @@
 # Libraries
 *.lib
 *.a
+*.la
+*.lo
 
 # Shared objects (inc. Windows DLLs)
 *.dll
@@ -15,3 +17,13 @@
 *.exe
 *.out
 *.app
+
+# Build directories & generated files
+.deps
+.libs
+Makefile
+config.h
+config.log
+config.status
+libtool
+
diff --git a/fuse/commands.c b/fuse/commands.c
index 90780c0..874cb06 100644
--- a/fuse/commands.c
+++ b/fuse/commands.c
@@ -512,14 +512,14 @@ static int process_mount(struct fuse_client * c)
 				break;
 			default:
 				log_for_client((void *)c,AFPFSD,LOG_ERR,
-					"Mounting of volume %s of server %s failed.\n", 
+					"Mounting of volume %s from server %s failed.\n", 
 						volume->volume_name_printable, 
 						volume->server->server_name_printable);
 			}
 			goto error;
 		} else {
 			log_for_client((void *)c,AFPFSD,LOG_NOTICE,
-				"Mounting of volume %s of server %s succeeded.\n", 
+				"Mounting of volume %s from server %s succeeded.\n", 
 					volume->volume_name_printable, 
 					volume->server->server_name_printable);
 			return 0;
diff --git a/lib/proto_map.c b/lib/proto_map.c
index 4782faa..e41bd45 100644
--- a/lib/proto_map.c
+++ b/lib/proto_map.c
@@ -122,7 +122,7 @@ int afp_mapid_reply(struct afp_server *server, char * buf, unsigned int size, vo
 
 	if (reply->header.return_code.error_code!=kFPNoErr) return -1;
 
-	copy_from_pascal_two(name,reply->name,255);
+	copy_from_pascal_two(name, &reply->name, 255);
 
 	return 0;
 }