summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-10-02 06:57:18 +0000
committerJeremy Allison <jra@samba.org>2001-10-02 06:57:18 +0000
commitcb4b13a82ba26c70674fe903d89db1d38103dff7 (patch)
tree7b2588835f38e224c1cd14114cd63c3e3432f9d2 /source3/lib
parent58bc10518bad61e6c8dee38fda82eb8fb1de4bf6 (diff)
downloadsamba-cb4b13a82ba26c70674fe903d89db1d38103dff7.tar.gz
samba-cb4b13a82ba26c70674fe903d89db1d38103dff7.tar.bz2
samba-cb4b13a82ba26c70674fe903d89db1d38103dff7.zip
Fixed the bug with member servers in a Samba PDC hosted domain not allowing
other access. Problem was max time was being set to 0xffffffff, instead of 0x7fffffff. Jeremy. (This used to be commit 94403d841710391ec26539e4b4157439d5778ff7)
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/debug.c10
-rw-r--r--source3/lib/time.c18
2 files changed, 26 insertions, 2 deletions
diff --git a/source3/lib/debug.c b/source3/lib/debug.c
index 9eb490c27e..6524d58ecb 100644
--- a/source3/lib/debug.c
+++ b/source3/lib/debug.c
@@ -346,8 +346,14 @@ BOOL reopen_logs( void )
oldumask = umask( 022 );
pstrcpy(fname, debugf );
- if (lp_loaded() && (*lp_logfile()))
- pstrcpy(fname, lp_logfile());
+
+ if (lp_loaded()) {
+ char *logfname;
+
+ logfname = lp_logfile();
+ if (*logfname)
+ pstrcpy(fname, logfname);
+ }
pstrcpy( debugf, fname );
if (append_log)
diff --git a/source3/lib/time.c b/source3/lib/time.c
index 59106386d4..cf088e8ee4 100644
--- a/source3/lib/time.c
+++ b/source3/lib/time.c
@@ -42,7 +42,19 @@ int extra_time_offset = 0;
#define TIME_T_MAX (~ (time_t) 0 - TIME_T_MIN)
#endif
+/*******************************************************************
+ External access to time_t_min and time_t_max.
+********************************************************************/
+time_t get_time_t_min(void)
+{
+ return TIME_T_MIN;
+}
+
+time_t get_time_t_max(void)
+{
+ return TIME_T_MAX;
+}
/*******************************************************************
a gettimeofday wrapper
@@ -305,6 +317,12 @@ void unix_to_nt_time(NTTIME *nt, time_t t)
nt->high = 0;
return;
}
+ if (t == TIME_T_MAX)
+ {
+ nt->low = 0xffffffff;
+ nt->high = 0x7fffffff;
+ return;
+ }
if (t == -1)
{
nt->low = 0xffffffff;