summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2001-12-31 14:05:22 +0000
committerAndrew Tridgell <tridge@samba.org>2001-12-31 14:05:22 +0000
commit84ecd95dba6cf03070432b3cc37d511d310d1325 (patch)
treebdc3059f3fc45b243eab0bbc48075796cadd6ef3
parenteb4e10115310b6ed23b92abac2e79454c80930b1 (diff)
downloadsamba-84ecd95dba6cf03070432b3cc37d511d310d1325.tar.gz
samba-84ecd95dba6cf03070432b3cc37d511d310d1325.tar.xz
samba-84ecd95dba6cf03070432b3cc37d511d310d1325.zip
more irix -64 portability fixes
(This used to be commit 65e857b36e170e3ecd78bf6695ae73342e9c04cd)
-rw-r--r--source3/lib/account_pol.c10
-rw-r--r--source3/lib/charcnv.c1
-rw-r--r--source3/passdb/passdb.c11
-rw-r--r--source3/rpc_parse/parse_net.c2
-rw-r--r--source3/tdb/tdb.c3
5 files changed, 9 insertions, 18 deletions
diff --git a/source3/lib/account_pol.c b/source3/lib/account_pol.c
index 1b70d0ceb0c..33579108fa3 100644
--- a/source3/lib/account_pol.c
+++ b/source3/lib/account_pol.c
@@ -71,34 +71,24 @@ static char *decode_account_policy_name(int field)
switch (field) {
case AP_MIN_PASSWORD_LEN:
return "min password length";
- break;
case AP_PASSWORD_HISTORY:
return "password history";
- break;
case AP_USER_MUST_LOGON_TO_CHG_PASS:
return "user must logon to change password";
- break;
case AP_MAX_PASSWORD_AGE:
return "maximum password age";
- break;
case AP_MIN_PASSWORD_AGE:
return "minimum password age";
- break;
case AP_LOCK_ACCOUNT_DURATION:
return "lockout duration";
- break;
case AP_RESET_COUNT_TIME:
return "reset count minutes";
- break;
case AP_BAD_ATTEMPT_LOCKOUT:
return "bad lockout attempt";
- break;
case AP_TIME_TO_LOGOUT:
return "disconnect time";
- break;
default:
return "undefined value";
- break;
}
}
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index 256bd7e88c7..481effbad52 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -213,7 +213,6 @@ convert:
break;
case E2BIG:
goto convert;
- break;
case EILSEQ:
reason="Illegal myltibyte sequence";
break;
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index d6204fc96c2..7fafd9a75c3 100644
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -790,12 +790,13 @@ BOOL local_sid_to_gid(gid_t *pgid, DOM_SID *psid, enum SID_NAME_USE *name_type)
return False;
if (get_group_map_from_sid(*psid, &map, MAPPING_WITHOUT_PRIV)) {
-
+
/* the SID is in the mapping table but not mapped */
if (map.gid==-1)
return False;
- sid_peek_rid(&map.sid, pgid);
+ sid_peek_rid(&map.sid, &rid);
+ *pgid = rid;
*name_type = map.sid_name_use;
} else {
*pgid = pdb_group_rid_to_gid(rid);
@@ -1765,7 +1766,7 @@ BOOL pdb_set_hours (SAM_ACCOUNT *sampass, const uint8 *hours)
BOOL pdb_set_pass_changed_now (SAM_ACCOUNT *sampass)
{
- time_t expire;
+ uint32 expire;
if (!sampass)
return False;
@@ -1773,9 +1774,9 @@ BOOL pdb_set_pass_changed_now (SAM_ACCOUNT *sampass)
if (!pdb_set_pass_last_set_time (sampass, time(NULL)))
return False;
- account_policy_get(AP_MAX_PASSWORD_AGE, (int *)&expire);
+ account_policy_get(AP_MAX_PASSWORD_AGE, &expire);
- if (expire==-1) {
+ if (expire==(uint32)-1) {
if (!pdb_set_pass_must_change_time (sampass, 0))
return False;
} else {
diff --git a/source3/rpc_parse/parse_net.c b/source3/rpc_parse/parse_net.c
index b584673f386..c113daefab4 100644
--- a/source3/rpc_parse/parse_net.c
+++ b/source3/rpc_parse/parse_net.c
@@ -744,7 +744,7 @@ BOOL net_io_r_auth_2(char *desc, NET_R_AUTH_2 *r_a, prs_struct *ps, int depth)
********************************************************************/
void init_q_srv_pwset(NET_Q_SRV_PWSET *q_s, char *logon_srv, char *sess_key, char *acct_name,
- uint16 sec_chan, char *comp_name, DOM_CRED *cred, char hashed_mach_pwd[16])
+ uint16 sec_chan, char *comp_name, DOM_CRED *cred, uchar hashed_mach_pwd[16])
{
unsigned char nt_cypher[16];
diff --git a/source3/tdb/tdb.c b/source3/tdb/tdb.c
index 28425c29892..840b5b4af94 100644
--- a/source3/tdb/tdb.c
+++ b/source3/tdb/tdb.c
@@ -424,7 +424,8 @@ static tdb_off tdb_dump_record(TDB_CONTEXT *tdb, tdb_off offset)
}
if (tailer != rec.rec_len + sizeof(rec)) {
- printf("ERROR: tailer does not match record! tailer=%u totalsize=%u\n", tailer, rec.rec_len + sizeof(rec));
+ printf("ERROR: tailer does not match record! tailer=%u totalsize=%u\n",
+ (unsigned)tailer, (unsigned)(rec.rec_len + sizeof(rec)));
}
return rec.next;
}