4 files changed, 8 insertions, 6 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index f021fa952e..218ce19955 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -554,6 +554,7 @@ char *mktemp(char *); /* No standard include */
 #include <sys/priv.h>
 #include <netinet/tcp.h>
 #include <locale.h>
+#include <arpa/inet.h>    /* needed for inet_ntoa proto */
 #define SYSV
 #define USE_WAITPID
 #define USE_SIGBLOCK
diff --git a/source3/include/local.h b/source3/include/local.h
index 10906d1ff1..0e2a927d2e 100644
--- a/source3/include/local.h
+++ b/source3/include/local.h
@@ -39,6 +39,11 @@
 #define MAX_CONNECTIONS 127
 #define MAX_OPEN_FILES 100
 
+/* Default size of shared memory used for share mode locking */
+#ifndef SHMEM_SIZE
+#define SHMEM_SIZE (1024*MAX_OPEN_FILES)
+#endif
+
 /* the max number of connections that the smbstatus program will show */
 #define MAXSTATUS 1000
 
diff --git a/source3/include/proto.h b/source3/include/proto.h
index f422b8fc90..fd31db7e62 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -47,7 +47,7 @@ BOOL chgpasswd(char *name,char *oldpass,char *newpass);
 BOOL chgpasswd(char *name,char *oldpass,char *newpass);
 BOOL check_lanman_password(char *user, unsigned char *pass1, 
                            unsigned char *pass2, struct smb_passwd **psmbpw);
-BOOL change_lanman_password(struct smb_passwd *smbpw, char *pass1, char *pass2);
+BOOL change_lanman_password(struct smb_passwd *smbpw, unsigned char *pass1, unsigned char *pass2);
 
 /*The following definitions come from  client.c  */
 
@@ -710,6 +710,7 @@ struct response_record *make_response_record( struct subnet_record *subrec,
                     struct userdata_struct *userdata);
 struct response_record *find_response_record(struct subnet_record **ppsubrec,
 				uint16 id);
+BOOL is_refresh_already_queued(struct subnet_record *subrec, struct name_record *namerec);
 
 /*The following definitions come from  nmbd_sendannounce.c  */
 
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 9c55e3f8be..9a7278069d 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -27,11 +27,6 @@
 #define BUFFER_SIZE (0xFFFF)
 #define SAFETY_MARGIN 1024
 
-/* Default size of shared memory used for share mode locking */
-#ifndef SHMEM_SIZE
-#define SHMEM_SIZE 102400
-#endif
-
 #define NMB_PORT 137
 #define DGRAM_PORT 138
 #define SMB_PORT 139