summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorSamba Release Account <samba-bugs@samba.org>1997-07-03 20:45:06 +0000
committerSamba Release Account <samba-bugs@samba.org>1997-07-03 20:45:06 +0000
commit3e37f8f70f67d441582f84021ce185ced5e6baaf (patch)
treeb1d38a1f7d18825e1cf868039c86185407990f8d /source3/lib
parent4a2cc7bb2b5b4485d91f5ef7a7c88d7520f8ad28 (diff)
downloadsamba-3e37f8f70f67d441582f84021ce185ced5e6baaf.tar.gz
samba-3e37f8f70f67d441582f84021ce185ced5e6baaf.tar.bz2
samba-3e37f8f70f67d441582f84021ce185ced5e6baaf.zip
Makefile: Added DGUX changes for intel.
namedbwork.c: Minor tidyup for election flah. util.c: Fix for broken readdir detectino code. version.h: Back to 1.9.17alpha3 - will be updated by release script. Jeremy jallison@whistle.com (This used to be commit 26635733a746dee2435da7ce228def5f2f292bba)
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/util.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c
index b9b647395b..31cb4d6629 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -3403,13 +3403,6 @@ char *readdirname(void *p)
dname = ptr->d_name;
- {
- static pstring buf;
- strcpy(buf, dname);
- unix_to_dos(buf, True);
- dname = buf;
- }
-
#ifdef NEXT2
if (telldir(p) < 0) return(NULL);
#endif
@@ -3425,10 +3418,17 @@ char *readdirname(void *p)
broken_readdir = True;
}
if (broken_readdir)
- return(dname-2);
+ dname = dname - 2;
}
#endif
+ {
+ static pstring buf;
+ strcpy(buf, dname);
+ unix_to_dos(buf, True);
+ dname = buf;
+ }
+
return(dname);
}