diff options
author | Jeremy Allison <jra@samba.org> | 2009-02-19 13:36:45 -0800 |
---|---|---|
committer | Karolin Seeger <kseeger@samba.org> | 2009-02-20 08:53:31 +0100 |
commit | b054455edc927a2a031173b2e9bcb2583ea0cffb (patch) | |
tree | dd045785aeca66cc970edf82c0b8e16e70acc00e | |
parent | 6681d9066f462e5f403498eaa6066a2b7bd7f08c (diff) | |
download | samba-b054455edc927a2a031173b2e9bcb2583ea0cffb.tar.gz |
Fix printf warnings found on systems where time_t <> long int.
Jeremy.
(cherry picked from commit ea256b2d6d35327d63038554bf0a67d986c8e594)
-rw-r--r-- | source/passdb/pdb_ldap.c | 16 | ||||
-rw-r--r-- | source/utils/smbget.c | 3 |
2 files changed, 10 insertions, 9 deletions
diff --git a/source/passdb/pdb_ldap.c b/source/passdb/pdb_ldap.c index 043b6207560..70a1c62bef8 100644 --- a/source/passdb/pdb_ldap.c +++ b/source/passdb/pdb_ldap.c @@ -1249,7 +1249,7 @@ static bool init_ldap_from_sam (struct ldapsam_privates *ldap_state, get_userattr_key2string(ldap_state->schema_ver, LDAP_ATTR_PROFILE_PATH), pdb_get_profile_path(sampass)); - if (asprintf(&temp, "%li", pdb_get_logon_time(sampass)) < 0) { + if (asprintf(&temp, "%li", (long int)pdb_get_logon_time(sampass)) < 0) { return false; } if (need_update(sampass, PDB_LOGONTIME)) @@ -1257,7 +1257,7 @@ static bool init_ldap_from_sam (struct ldapsam_privates *ldap_state, get_userattr_key2string(ldap_state->schema_ver, LDAP_ATTR_LOGON_TIME), temp); SAFE_FREE(temp); - if (asprintf(&temp, "%li", pdb_get_logoff_time(sampass)) < 0) { + if (asprintf(&temp, "%li", (long int)pdb_get_logoff_time(sampass)) < 0) { return false; } if (need_update(sampass, PDB_LOGOFFTIME)) @@ -1265,7 +1265,7 @@ static bool init_ldap_from_sam (struct ldapsam_privates *ldap_state, get_userattr_key2string(ldap_state->schema_ver, LDAP_ATTR_LOGOFF_TIME), temp); SAFE_FREE(temp); - if (asprintf(&temp, "%li", pdb_get_kickoff_time(sampass)) < 0) { + if (asprintf(&temp, "%li", (long int)pdb_get_kickoff_time(sampass)) < 0) { return false; } if (need_update(sampass, PDB_KICKOFFTIME)) @@ -1273,7 +1273,7 @@ static bool init_ldap_from_sam (struct ldapsam_privates *ldap_state, get_userattr_key2string(ldap_state->schema_ver, LDAP_ATTR_KICKOFF_TIME), temp); SAFE_FREE(temp); - if (asprintf(&temp, "%li", pdb_get_pass_can_change_time_noncalc(sampass)) < 0) { + if (asprintf(&temp, "%li", (long int)pdb_get_pass_can_change_time_noncalc(sampass)) < 0) { return false; } if (need_update(sampass, PDB_CANCHANGETIME)) @@ -1281,7 +1281,7 @@ static bool init_ldap_from_sam (struct ldapsam_privates *ldap_state, get_userattr_key2string(ldap_state->schema_ver, LDAP_ATTR_PWD_CAN_CHANGE), temp); SAFE_FREE(temp); - if (asprintf(&temp, "%li", pdb_get_pass_must_change_time(sampass)) < 0) { + if (asprintf(&temp, "%li", (long int)pdb_get_pass_must_change_time(sampass)) < 0) { return false; } if (need_update(sampass, PDB_MUSTCHANGETIME)) @@ -1361,7 +1361,7 @@ static bool init_ldap_from_sam (struct ldapsam_privates *ldap_state, if (need_update(sampass, PDB_PASSLASTSET)) { if (asprintf(&temp, "%li", - pdb_get_pass_last_set_time(sampass)) < 0) { + (long int)pdb_get_pass_last_set_time(sampass)) < 0) { return false; } smbldap_make_mod(ldap_state->smbldap_state->ldap_struct, existing, mods, @@ -1423,7 +1423,7 @@ static bool init_ldap_from_sam (struct ldapsam_privates *ldap_state, temp); SAFE_FREE(temp); - if (asprintf(&temp, "%li", badtime) < 0) { + if (asprintf(&temp, "%li", (long int)badtime) < 0) { return false; } smbldap_make_mod( @@ -5941,7 +5941,7 @@ static bool ldapsam_set_trusteddom_pw(struct pdb_methods *methods, smbldap_make_mod(priv2ld(ldap_state), entry, &mods, "sambaSID", sid_string_tos(sid)); smbldap_make_mod(priv2ld(ldap_state), entry, &mods, "sambaPwdLastSet", - talloc_asprintf(talloc_tos(), "%li", time(NULL))); + talloc_asprintf(talloc_tos(), "%li", (long int)time(NULL))); smbldap_make_mod(priv2ld(ldap_state), entry, &mods, "sambaClearTextPassword", pwd); diff --git a/source/utils/smbget.c b/source/utils/smbget.c index c062134a55e..7c01f5db3a0 100644 --- a/source/utils/smbget.c +++ b/source/utils/smbget.c @@ -487,7 +487,8 @@ static void clean_exit(void) { char bs[100]; human_readable(total_bytes, bs, sizeof(bs)); - if(!quiet)fprintf(stderr, "Downloaded %s in %lu seconds\n", bs, time(NULL) - total_start_time); + if(!quiet)fprintf(stderr, "Downloaded %s in %lu seconds\n", bs, + (unsigned long)(time(NULL) - total_start_time)); exit(0); } |