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)
-#define VERSION "1.9.17alpha4"
+#define VERSION "1.9.17alpha3"
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
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);
}
/* 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;