portability fixed for sco1.samba.org

7 files changed, 13 insertions, 9 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];
 };
diff --git a/source/lib/genrand.c b/source/lib/genrand.c
index c8c39d026e4..4a7de802e8f 100644
--- a/source/lib/genrand.c
+++ b/source/lib/genrand.c
@@ -249,5 +249,5 @@ char *generate_random_str(size_t len)
 
 	retstr[i] = '\0';
 
-	return retstr;
+	return (char *)retstr;
 }
diff --git a/source/libsmb/clifile.c b/source/libsmb/clifile.c
index e38b65e3f39..63706f7669e 100644
--- a/source/libsmb/clifile.c
+++ b/source/libsmb/clifile.c
@@ -543,8 +543,8 @@ BOOL cli_lock64(struct cli_state *cli, int fnum,
 
 	p = smb_buf(cli->outbuf);
 	SIVAL(p, 0, cli->pid);
-	S_OFF_T_R(p, 0, offset);
-	S_OFF_T_R(p, 12, len);
+	SOFF_T_R(p, 0, offset);
+	SOFF_T_R(p, 12, len);
 	cli_send_smb(cli);
 
         cli->timeout = (timeout == -1) ? 0x7FFFFFFF : (timeout + 2*1000);
@@ -588,8 +588,8 @@ BOOL cli_unlock64(struct cli_state *cli, int fnum, SMB_BIG_UINT offset, SMB_BIG_
 
 	p = smb_buf(cli->outbuf);
 	SIVAL(p, 0, cli->pid);
-	S_OFF_T_R(p, 4, offset);
-	S_OFF_T_R(p, 12, len);
+	SOFF_T_R(p, 4, offset);
+	SOFF_T_R(p, 12, len);
 
 	cli_send_smb(cli);
 	if (!cli_receive_smb(cli)) {
diff --git a/source/rpc_parse/parse_spoolss.c b/source/rpc_parse/parse_spoolss.c
index bf178b4ab81..ff3e53273a0 100644
--- a/source/rpc_parse/parse_spoolss.c
+++ b/source/rpc_parse/parse_spoolss.c
@@ -2400,7 +2400,7 @@ BOOL smb_io_job_info_1(char *desc, NEW_BUFFER *buffer, JOB_INFO_1 *info, int dep
 
 BOOL smb_io_job_info_2(char *desc, NEW_BUFFER *buffer, JOB_INFO_2 *info, int depth)
 {	
-	uint pipo=0;
+	uint32 pipo=0;
 	prs_struct *ps=&buffer->prs;
 	
 	prs_debug(ps, depth, desc, "smb_io_job_info_2");
diff --git a/source/rpc_server/srv_spoolss_nt.c b/source/rpc_server/srv_spoolss_nt.c
index 9a337cc9806..917885eafb3 100644
--- a/source/rpc_server/srv_spoolss_nt.c
+++ b/source/rpc_server/srv_spoolss_nt.c
@@ -6041,7 +6041,7 @@ uint32 _spoolss_setprinterdata( pipes_struct *p, SPOOL_Q_SETPRINTERDATA *q_u, SP
     ZERO_STRUCT(old_param);
 
 	if (get_specific_param(*printer, 2, param->value, &old_param.data,
-			       &old_param.type, (unsigned int *)&old_param.data_len)) {
+			       &old_param.type, (uint32 *)&old_param.data_len)) {
 
 		if (param->type == old_param.type &&
 		    param->data_len == old_param.data_len &&