diff options
| author | David O'Neill <dmo@samba.org> | 2000-11-14 15:50:30 +0000 |
|---|---|---|
| committer | David O'Neill <dmo@samba.org> | 2000-11-14 15:50:30 +0000 |
| commit | 47dc568a3b44b89ca6a4238bb8f0030dae4ba9b1 (patch) | |
| tree | e9ec88992ff304c68d1288312dbf75a6f5e502a5 | |
| parent | f9680a444bcba72540ab5e23bb44677ef74a9f13 (diff) | |
| download | samba-47dc568a3b44b89ca6a4238bb8f0030dae4ba9b1.tar.gz samba-47dc568a3b44b89ca6a4238bb8f0030dae4ba9b1.tar.bz2 samba-47dc568a3b44b89ca6a4238bb8f0030dae4ba9b1.zip | |
- fix "declaration of 'time' shadows global declaration" warning.
(This used to be commit 92ff07132b3834b469ad7bb73d6e714b175a12af)
| -rw-r--r-- | source3/include/proto.h | 12 | ||||
| -rw-r--r-- | source3/passdb/passdb.c | 24 |
2 files changed, 18 insertions, 18 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index c18d013f62..3bcf6e1e90 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1674,12 +1674,12 @@ uint32 pdb_get_unknown3 (SAM_ACCOUNT *sampass); uint32 pdb_get_unknown5 (SAM_ACCOUNT *sampass); uint32 pdb_get_unknown6 (SAM_ACCOUNT *sampass); BOOL pdb_set_acct_ctrl (SAM_ACCOUNT *sampass, uint16 flags); -BOOL pdb_set_logon_time (SAM_ACCOUNT *sampass, time_t time); -BOOL pdb_set_logoff_time (SAM_ACCOUNT *sampass, time_t time); -BOOL pdb_set_kickoff_time (SAM_ACCOUNT *sampass, time_t time); -BOOL pdb_set_pass_can_change_time (SAM_ACCOUNT *sampass, time_t time); -BOOL pdb_set_pass_must_change_time (SAM_ACCOUNT *sampass, time_t time); -BOOL pdb_set_pass_last_set_time (SAM_ACCOUNT *sampass, time_t time); +BOOL pdb_set_logon_time (SAM_ACCOUNT *sampass, time_t mytime); +BOOL pdb_set_logoff_time (SAM_ACCOUNT *sampass, time_t mytime); +BOOL pdb_set_kickoff_time (SAM_ACCOUNT *sampass, time_t mytime); +BOOL pdb_set_pass_can_change_time (SAM_ACCOUNT *sampass, time_t mytime); +BOOL pdb_set_pass_must_change_time (SAM_ACCOUNT *sampass, time_t mytime); +BOOL pdb_set_pass_last_set_time (SAM_ACCOUNT *sampass, time_t mytime); BOOL pdb_set_hours_len (SAM_ACCOUNT *sampass, uint32 len); BOOL pdb_set_logons_divs (SAM_ACCOUNT *sampass, uint16 hours); BOOL pdb_set_uid (SAM_ACCOUNT *sampass, uid_t uid); diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c index 14597129df..7b7179b1ec 100644 --- a/source3/passdb/passdb.c +++ b/source3/passdb/passdb.c @@ -1273,66 +1273,66 @@ BOOL pdb_set_acct_ctrl (SAM_ACCOUNT *sampass, uint16 flags) return False; } -BOOL pdb_set_logon_time (SAM_ACCOUNT *sampass, time_t time) +BOOL pdb_set_logon_time (SAM_ACCOUNT *sampass, time_t mytime) { if (sampass) { - sampass->logon_time = time; + sampass->logon_time = mytime; return True; } return False; } -BOOL pdb_set_logoff_time (SAM_ACCOUNT *sampass, time_t time) +BOOL pdb_set_logoff_time (SAM_ACCOUNT *sampass, time_t mytime) { if (sampass) { - sampass->logoff_time = time; + sampass->logoff_time = mytime; return True; } return False; } -BOOL pdb_set_kickoff_time (SAM_ACCOUNT *sampass, time_t time) +BOOL pdb_set_kickoff_time (SAM_ACCOUNT *sampass, time_t mytime) { if (sampass) { - sampass->kickoff_time = time; + sampass->kickoff_time = mytime; return True; } return False; } -BOOL pdb_set_pass_can_change_time (SAM_ACCOUNT *sampass, time_t time) +BOOL pdb_set_pass_can_change_time (SAM_ACCOUNT *sampass, time_t mytime) { if (sampass) { - sampass->pass_can_change_time = time; + sampass->pass_can_change_time = mytime; return True; } return False; } -BOOL pdb_set_pass_must_change_time (SAM_ACCOUNT *sampass, time_t time) +BOOL pdb_set_pass_must_change_time (SAM_ACCOUNT *sampass, time_t mytime) { if (sampass) { - sampass->pass_must_change_time = time; + sampass->pass_must_change_time = mytime; return True; } return False; } -BOOL pdb_set_pass_last_set_time (SAM_ACCOUNT *sampass, time_t time) +BOOL pdb_set_pass_last_set_time (SAM_ACCOUNT *sampass, time_t mytime) { if (sampass) { - sampass->pass_last_set_time = time; + sampass->pass_last_set_time = mytime; return True; } |