summaryrefslogtreecommitdiff
path: root/source3/passdb
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 /source3/passdb
parenteb4e10115310b6ed23b92abac2e79454c80930b1 (diff)
downloadsamba-84ecd95dba6cf03070432b3cc37d511d310d1325.tar.gz
samba-84ecd95dba6cf03070432b3cc37d511d310d1325.tar.bz2
samba-84ecd95dba6cf03070432b3cc37d511d310d1325.zip
more irix -64 portability fixes
(This used to be commit 65e857b36e170e3ecd78bf6695ae73342e9c04cd)
Diffstat (limited to 'source3/passdb')
-rw-r--r--source3/passdb/passdb.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index d6204fc96c..7fafd9a75c 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 {