diff options
| author | Samba Release Account <samba-bugs@samba.org> | 1997-07-03 20:45:06 +0000 |
|---|---|---|
| committer | Samba Release Account <samba-bugs@samba.org> | 1997-07-03 20:45:06 +0000 |
| commit | 3e37f8f70f67d441582f84021ce185ced5e6baaf (patch) | |
| tree | b1d38a1f7d18825e1cf868039c86185407990f8d | |
| parent | 4a2cc7bb2b5b4485d91f5ef7a7c88d7520f8ad28 (diff) | |
| download | samba-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)
| -rw-r--r-- | source3/include/version.h | 2 | ||||
| -rw-r--r-- | source3/lib/util.c | 16 | ||||
| -rw-r--r-- | source3/namedbwork.c | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/source3/include/version.h b/source3/include/version.h index 9211793166..37e26dd65e 100644 --- a/source3/include/version.h +++ b/source3/include/version.h @@ -1 +1 @@ -#define VERSION "1.9.17alpha4" +#define VERSION "1.9.17alpha3" 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); } diff --git a/source3/namedbwork.c b/source3/namedbwork.c index a17de731bb..9b4b6a5300 100644 --- a/source3/namedbwork.c +++ b/source3/namedbwork.c @@ -122,7 +122,7 @@ static struct work_record *make_workgroup(char *name) /* WfWg uses 01040b01 */ /* Win95 uses 01041501 */ /* NTAS uses ???????? */ - work->ElectionCriterion = (MAINTAIN_LIST<<1)|(ELECTION_VERSION<<8); + work->ElectionCriterion = (MAINTAIN_LIST)|(ELECTION_VERSION<<8); work->ElectionCriterion |= (lp_os_level() << 24); if (lp_domain_master()) { work->ElectionCriterion |= 0x80; |