3 files changed, 6 insertions, 2 deletions
diff --git a/source/include/includes.h b/source/include/includes.h
index 03f71f5cb5d..eef1c1e0bc1 100644
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -497,8 +497,10 @@
 
 #ifdef LARGE_SMB_OFF_T
 #define SOFF_T(p, ofs, v) (SIVAL(p,ofs,(v)&0xFFFFFFFF), SIVAL(p,(ofs)+4,(v)>>32))
+#define SOFF_T_R(p, ofs, v) (SIVAL(p,(ofs)+4,(v)&0xFFFFFFFF), SIVAL(p,ofs,(v)>>32))
 #else 
 #define SOFF_T(p, ofs, v) (SIVAL(p,ofs,v),SIVAL(p,(ofs)+4,0))
+#define SOFF_T_R(p, ofs, v) (SIVAL(p,(ofs)+4,v),SIVAL(p,ofs,0))
 #endif
 
 /*
diff --git a/source/include/proto.h b/source/include/proto.h
index a1d21db27ee..3fb430af16b 100644
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -1149,6 +1149,7 @@ int share_mode_forall(SHAREMODE_FN(fn));
 /*The following definitions come from  locking/posix.c  */
 
 int fd_close_posix(struct connection_struct *conn, files_struct *fsp);
+uint32 map_lock_offset(uint32 high, uint32 low);
 BOOL is_posix_locked(files_struct *fsp, SMB_BIG_UINT u_offset, SMB_BIG_UINT u_count, enum brl_type lock_type);
 BOOL set_posix_lock(files_struct *fsp, SMB_BIG_UINT u_offset, SMB_BIG_UINT u_count, enum brl_type lock_type);
 BOOL release_posix_lock(files_struct *fsp, SMB_BIG_UINT u_offset, SMB_BIG_UINT u_count);
@@ -1840,6 +1841,7 @@ struct passdb_ops *nisplus_initialize_password_db(void);
 /*The following definitions come from  passdb/pampass.c  */
 
 BOOL pam_session(BOOL flag, const connection_struct *conn, char *tty);
+BOOL pam_accountcheck(char * user);
 BOOL pam_passcheck(char * user, char * password);
 
 /*The following definitions come from  passdb/pass_check.c  */
diff --git a/source/include/smb.h b/source/include/smb.h
index 3972035cafb..eb52821a490 100644
--- a/source/include/smb.h
+++ b/source/include/smb.h
@@ -1658,11 +1658,11 @@ struct pwd_info
 
 	uchar smb_lm_owf[24];
 	uchar smb_nt_owf[128];
-	size_t nt_owf_len;
+	uint32 nt_owf_len;
 
 	uchar lm_cli_chal[8];
 	uchar nt_cli_chal[128];
-	size_t nt_cli_chal_len;
+	uint32 nt_cli_chal_len;
 
 	uchar sess_key[16];
 };