summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1998-03-16 20:59:47 +0000
committerJeremy Allison <jra@samba.org>1998-03-16 20:59:47 +0000
commitc54af0f8b20e3f93c59da6a817920e1de6c4a870 (patch)
treeb0da64f4bb04846bdf9562ecb445b22fbd6f1885 /source3/lib
parent14d6ee34de8935cb3ef59820fabf98d588dab11f (diff)
downloadsamba-c54af0f8b20e3f93c59da6a817920e1de6c4a870.tar.gz
samba-c54af0f8b20e3f93c59da6a817920e1de6c4a870.tar.bz2
samba-c54af0f8b20e3f93c59da6a817920e1de6c4a870.zip
Adding the same change as was added to 1.9.18 branch to add the
"name resolve order" parameter. source/Makefile: Re-ordered link for name resolve order code. source/clientgen.c: source/clientutil.c: Added calls to resolve_name(). source/includes.h: Added HPUX zombie fix. source/loadparm.c: Added new name resolve order parameter. source/namequery.c: Re-wrote to include parsing of lmhosts file, new resolve_name() function requested by John. source/nmbd.c: Tell resolve_name not to do WINS lookups if we are the WINS server. source/nmbd_lmhosts.c: Call lmhosts parsing functions in namequery.c source/password.c: Call resolve_name() to lookup security=server name. source/reply.c: source/time.c: source/trans2.c: "fake directory create times" fix from Jim Hague - hague@research.canon.com.au. source/util.c: Removed isalnum() test in Get_Hostname() that seems to cause problems on many systems. Jeremy. (This used to be commit 7f118970da7c43eaddcf92dc056d3e849f1e7d5c)
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/time.c11
-rw-r--r--source3/lib/util.c9
2 files changed, 17 insertions, 3 deletions
diff --git a/source3/lib/time.c b/source3/lib/time.c
index c5584fd143..050b4725a7 100644
--- a/source3/lib/time.c
+++ b/source3/lib/time.c
@@ -500,10 +500,15 @@ char *timestring(void )
structure.
****************************************************************************/
-time_t get_create_time(struct stat *st)
+time_t get_create_time(struct stat *st,BOOL fake_dirs)
{
- time_t ret = MIN(st->st_ctime, st->st_mtime);
- time_t ret1 = MIN(ret, st->st_atime);
+ time_t ret, ret1;
+
+ if(S_ISDIR(st->st_mode) && fake_dirs)
+ return (time_t)315493200L; /* 1/1/1980 */
+
+ ret = MIN(st->st_ctime, st->st_mtime);
+ ret1 = MIN(ret, st->st_atime);
if(ret1 != (time_t)0)
return ret1;
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 3bc96e1034..e9ece49170 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -4047,11 +4047,20 @@ struct hostent *Get_Hostbyname(char *name)
exit(0);
}
+
+ /*
+ * This next test is redundent and causes some systems (with
+ * broken isalnum() calls) problems.
+ * JRA.
+ */
+
+#if 0
if (!isalnum(*name2))
{
free(name2);
return(NULL);
}
+#endif /* 0 */
ret = sys_gethostbyname(name2);
if (ret != NULL)