Derrell Lipman [Tue, 19 Apr 2005 19:23:49 +0000 (19:23 +0000)]
r6392: - Fixes bug 2564: when smbc_opendir() was called with a file rather than
a directory, the errno returned could end up as ENOENT rather than ENOTDIR.
- Fixes some compiler warnings which showed up on IRIX, as reported by
James Peach.
Gerald Carter [Tue, 19 Apr 2005 14:03:08 +0000 (14:03 +0000)]
r6388: BUG 2626: ensure that the calling_name is set to something after parsing smb.conf (if not set via -n)
Jeremy Allison [Tue, 19 Apr 2005 07:12:44 +0000 (07:12 +0000)]
r6385: Convert checking of egid and secondary egid list into
iterator functions so it can be used easily in a for loop.
Drops duplicated code from posix_acls.c
Jeremy.
Jeremy Allison [Mon, 18 Apr 2005 22:53:51 +0000 (22:53 +0000)]
r6378: Other systems may not return 1 for checking WRITE permission.
Canaonicalise any +ve return to 1.
Jeremy.
Gerald Carter [Mon, 18 Apr 2005 17:48:31 +0000 (17:48 +0000)]
r6373: minor changes to solaris packaging readme to bring it up to date
Gerald Carter [Mon, 18 Apr 2005 17:46:46 +0000 (17:46 +0000)]
r6372: removing outdated Mandrake packaging files and pointing at Mandriva cooker (after clearing with Buchan)
Volker Lendecke [Mon, 18 Apr 2005 16:07:49 +0000 (16:07 +0000)]
r6367: Slim down pdb_interface.c a bit. next_entry and search_end are function
pointers now.
Yes, Jeremy, this is about re-inventing C++... :-)
Volker
Jeremy Allison [Sun, 17 Apr 2005 07:57:45 +0000 (07:57 +0000)]
r6365: Wow, how much worse does this get. From info provided by
Eric Stewart <eric@lib.usf.edu> I realised we weren't checking
against the current effective groupid (set by force group) as
well as the group list. Fix this.
Jeremy.
Gerald Carter [Sat, 16 Apr 2005 20:48:04 +0000 (20:48 +0000)]
r6358: merging SMB_ASSERT() changes from the release branch
Stefan Metzmacher [Fri, 15 Apr 2005 15:39:00 +0000 (15:39 +0000)]
r6354: merge from 4_0 rev 6353:
we need the english output from the svn commands
metze
Volker Lendecke [Fri, 15 Apr 2005 13:41:49 +0000 (13:41 +0000)]
r6351: This is quite a large and intrusive patch, but there are not many pieces that
can be taken out of it, so I decided to commit this in one lump. It changes
the passdb enumerating functions to use ldap paged results where possible. In
particular the samr calls querydispinfo, enumdomusers and friends have
undergone significant internal changes. I have tested this extensively with
rpcclient and a bit with usrmgr.exe. More tests and the merge to trunk will
follow later.
The code is based on a first implementation by Günther Deschner, but has
evolved quite a bit since then.
Volker
Steve French [Fri, 15 Apr 2005 05:42:03 +0000 (05:42 +0000)]
r6349: Update cifs umount utility
Jeremy Allison [Fri, 15 Apr 2005 00:39:03 +0000 (00:39 +0000)]
r6348: Fix for bug #2605 reported by Daniel Patterson <Daniel_Patterson@national.com.au>.
Ensure smbclient doesn't perform commands if the "chdir" fails in a scripted set.
Jeremy.
Jeremy Allison [Thu, 14 Apr 2005 23:32:56 +0000 (23:32 +0000)]
r6346: Add a counter for the number of SMB operations per connection/file.
You will need to do a make clean after SVN updating this. Next will
come a smbcontrol message to dump this info. This should be interesting
to profile client activity.
Jeremy.
Jeremy Allison [Thu, 14 Apr 2005 21:01:01 +0000 (21:01 +0000)]
r6344: Fix bug #2601 - it seems that DOS_OPEN_EXEC does mean readonly. Needed
for Win9x and OS/2 clients. More Samba4 tests against W2k3 will be needed
to confirm this but in the meantime get it up and running.
Jeremy.
Herb Lewis [Tue, 12 Apr 2005 21:56:34 +0000 (21:56 +0000)]
r6319: add prototype so -Wstrict-prototypes will not fail
Herb Lewis [Tue, 12 Apr 2005 18:59:49 +0000 (18:59 +0000)]
r6318: don't include smbwrapper stuff unless asked for
Jeremy Allison [Tue, 12 Apr 2005 17:30:14 +0000 (17:30 +0000)]
r6316: Remove over-cautious asserts. Damn wish I'd made the release
with this....
Jeremy.
Gerald Carter [Tue, 12 Apr 2005 06:47:04 +0000 (06:47 +0000)]
r6311: setting version to 3.0.15pre2
Jeremy Allison [Tue, 12 Apr 2005 01:20:23 +0000 (01:20 +0000)]
r6307: Ensure info requested bitmask is printed in log when querying security descriptors.
Jeremy.
Jeremy Allison [Tue, 12 Apr 2005 00:00:19 +0000 (00:00 +0000)]
r6302: OS/2 fix from Marcel Müller <mueller@maazl.de>. Don't check for mangled names
if mangled names is off.
Jeremy.
Jeremy Allison [Mon, 11 Apr 2005 20:52:02 +0000 (20:52 +0000)]
r6297: Fix bug in our trans2 secondary processing. We need to pass in the
trans2 call info from the primary trans2 packet as it isn't present
in secondary transs packets. We only need to do this for functions that
satisfy more than one case in the switch statement. Found by Marcel Müller <mueller@maazl.de>.
Jeremy.
Gerald Carter [Mon, 11 Apr 2005 19:41:47 +0000 (19:41 +0000)]
r6296: add message about known interoperability issue with Windows 2003 SP1 DCs
Gerald Carter [Mon, 11 Apr 2005 03:34:27 +0000 (03:34 +0000)]
r6291: BUG 2588: force smbclient messages to port 139 unless someone set the -p option
Gerald Carter [Mon, 11 Apr 2005 00:15:28 +0000 (00:15 +0000)]
r6290: and now the development tree becomes 3.0.15pre1
Volker Lendecke [Sun, 10 Apr 2005 17:12:25 +0000 (17:12 +0000)]
r6282: Before converting enum_dom_groups, better get the previous version a bit
closer to being correct. 'svn blame' shows CVSIN, but somehow I get the
feeling this is my code...
Volker
Volker Lendecke [Sun, 10 Apr 2005 15:54:18 +0000 (15:54 +0000)]
r6281: Fix the build for FreeBSD 4 -- no winbind
Volker Lendecke [Sun, 10 Apr 2005 15:45:46 +0000 (15:45 +0000)]
r6279: Convert the RAP enum functions to the pdb_search API. Who is using this
nowadays? This looks rather broken, but survives basic tests with 'net'.
Volker
Volker Lendecke [Sun, 10 Apr 2005 15:26:37 +0000 (15:26 +0000)]
r6277: This implements a new caching API for enumerating the pdb elements. It is
modeled after query_displayinfo and should hide the differences between users,
groups and aliases while allowing a cache analog load_sampw_entries:
struct pdb_search *pdb_search_users(uint16 acct_flags);
struct pdb_search *pdb_search_groups(void);
struct pdb_search *pdb_search_aliases(const DOM_SID *sid);
uint32 pdb_search_entries(struct pdb_search *search, uint32 start_idx,
uint32 max_entries,
struct samr_displayentry **result);
void pdb_search_destroy(struct pdb_search *search);
Why this API? Eventually we will need to apply the work gd has started on
enumerating users with paged ldap searches to groups and aliases. Before doing
that I want to clean up the search routines we have.
The sample application (more to follow) is 'net maxrid'.
Volker
Volker Lendecke [Sun, 10 Apr 2005 14:44:56 +0000 (14:44 +0000)]
r6275: Implement RAP version of enumusers/enumgroups level 0. No, I've not gone mad,
this is to test future changes to enumeration functions...
This can successfully list users from nt4 and w2k3sp1.
Volker
Volker Lendecke [Sun, 10 Apr 2005 14:20:29 +0000 (14:20 +0000)]
r6273: Remove some unused code, minor cleanup
Jeremy Allison [Sun, 10 Apr 2005 06:57:55 +0000 (06:57 +0000)]
r6269: With help from Marcel Müller <mueller@maazl.de> in tracking down the bug,
fix trans2 and nttrans secondary packet processing. We were being too strict checking
the incoming packet (by 1 byte).
Jeremy.
Jeremy Allison [Sun, 10 Apr 2005 04:27:14 +0000 (04:27 +0000)]
r6266: Add includes for sys/extattr.h and sys/uio.h for FreeBSD xattr code.
Jeremy.
Volker Lendecke [Sat, 9 Apr 2005 11:46:40 +0000 (11:46 +0000)]
r6263: Get rid of generate_wellknown_sids, they are const static and initializable
statically.
Volker
Steve French [Sat, 9 Apr 2005 05:01:00 +0000 (05:01 +0000)]
r6262: Minor updates to cifs umount helper
Jeremy Allison [Sat, 9 Apr 2005 00:50:12 +0000 (00:50 +0000)]
r6261: Tidyup message str printf. Ensure tvs struct is zeroed.
Jeremy.
Jeremy Allison [Sat, 9 Apr 2005 00:41:38 +0000 (00:41 +0000)]
r6258: Fix found by OS/2 set_ea call. When setting specific info remember to terminate
once we've done that and not "break" into the generic file metadata set code.
Jeremy.
Jeremy Allison [Fri, 8 Apr 2005 22:58:07 +0000 (22:58 +0000)]
r6256: Fix fprintf errors in smbpasswd. Fix for bug #2585 Ulf Härnhammar <metaur@telia.com>
Jeremy.
Steve French [Fri, 8 Apr 2005 22:46:31 +0000 (22:46 +0000)]
r6255: Initial checkin of cifs umount utility
Jeremy Allison [Fri, 8 Apr 2005 21:05:14 +0000 (21:05 +0000)]
r6253: Add FreeBSD EA API support. Bug #2576 - patch donated by Timur Bakeyev <timur@com.bat.ru>
Jeremy.
Jeremy Allison [Fri, 8 Apr 2005 19:21:41 +0000 (19:21 +0000)]
r6252: Re-order position of become_root() to allow directory to be
read first.
Jeremy.
Jeremy Allison [Fri, 8 Apr 2005 17:04:59 +0000 (17:04 +0000)]
r6249: Get the comparison the right way around...
Jeremy.
Gerald Carter [Fri, 8 Apr 2005 04:13:19 +0000 (04:13 +0000)]
r6243: Yes. I *will* hate myself in the morning for this one.
I need to gather some more information to know if these
extra context id's may be used later. But for now,
pw changes via CTL+ALT+DEL from win2k3sp1 clients work.
Gerald Carter [Thu, 7 Apr 2005 22:37:03 +0000 (22:37 +0000)]
r6242: after talking to jeremy, we can actually consolidate
the 2 BOOL flags in dfs_redirect() down to one since
they both are used in essentially the same context
(from what we can tell).
Tested Win98SE, WinXP sp 1 & 2, Win2k3 sp1, and WIn2k Sp4.
All dfs operations still seem to work.
Jeremy Allison [Thu, 7 Apr 2005 20:59:37 +0000 (20:59 +0000)]
r6240: Fix for bug #2581. Add size limit (in kb) to stat cache.
Jeremy.
Gerald Carter [Thu, 7 Apr 2005 19:43:19 +0000 (19:43 +0000)]
r6237: fix my breakage of WinXP sp2 msdfs support.
We did need the special case for RESOLVE_DFSPATH
in the findfirst() code.
Jeremy, please verify I haven't broken the allow_wcard
code you added to resolve_dfs_path()
Jeremy Allison [Thu, 7 Apr 2005 19:39:34 +0000 (19:39 +0000)]
r6235: Partial fix for bugid #2581. Ensure if realloc fails on an internal
tdb we fail gracefully.
Jeremy.
Jeremy Allison [Thu, 7 Apr 2005 18:27:28 +0000 (18:27 +0000)]
r6234: Fix for possible root squash nfs bugs from psz@maths.usyd.edu.au
Jeremy.
Gerald Carter [Thu, 7 Apr 2005 04:58:38 +0000 (04:58 +0000)]
r6232: more cleanups; remove BUFFER3; rename BUFFER4 -> RPC_DATA_BLOB; rename REG_CREATE_VALE -> REG_SET_VALUE
Gerald Carter [Thu, 7 Apr 2005 03:24:02 +0000 (03:24 +0000)]
r6231: Herb, I think this checkin was a mistake. Are you sure this is
what you meant to change?
Fix build breakage....
Herb Lewis [Wed, 6 Apr 2005 23:50:48 +0000 (23:50 +0000)]
r6230: don't know how this ever worked! the compiler complained we
were comparing an integer to a pointer and it was right.
Gerald Carter [Wed, 6 Apr 2005 22:27:55 +0000 (22:27 +0000)]
r6228: remove BUFHDR2 and clean up LsaEnumTrustedDomains()
Tested client and server code.
Herb Lewis [Wed, 6 Apr 2005 16:28:04 +0000 (16:28 +0000)]
r6225: get rid of warnings from my compiler about nested externs
Gerald Carter [Wed, 6 Apr 2005 03:08:25 +0000 (03:08 +0000)]
r6221: format cleanup (got tied of looking for related structures)
also remove unused SID_ARRAY structure....
Gerald Carter [Tue, 5 Apr 2005 23:47:42 +0000 (23:47 +0000)]
r6220: cleaning up spoolss header; removing unused structures
Gerald Carter [Tue, 5 Apr 2005 17:49:16 +0000 (17:49 +0000)]
r6218: * fix a segv in EnumPrinters():rpc_buffer_alloc when the caller does not provide an
RPC_BUFFER in the request
* add initial (but wire untested) support for RegRestoreKey()
Volker Lendecke [Tue, 5 Apr 2005 16:42:06 +0000 (16:42 +0000)]
r6217: After talking to jerry, commit the partial fix for wbinfo -r. This fixes the
expansion of domain local groups in case the netsamlogon_cache is valid. The
non-samlogon-cache side needs more work, as well as the samlogon cache itself.
Volker
Volker Lendecke [Tue, 5 Apr 2005 14:24:50 +0000 (14:24 +0000)]
r6216: Brown paper-bag bug fix for wbinfo --user-sids.... Nobody seems to really use
domain local groups ...
Volker
Jeremy Allison [Tue, 5 Apr 2005 01:24:04 +0000 (01:24 +0000)]
r6204: Fix double-free of talloc context.
Jeremy.
Jeremy Allison [Tue, 5 Apr 2005 01:20:32 +0000 (01:20 +0000)]
r6203: Fix attribute return on creating a directory with nttrans_create.
Fix strange allocation semantics of openX.
Jeremy.
Jeremy Allison [Mon, 4 Apr 2005 20:46:16 +0000 (20:46 +0000)]
r6200: Returned access should contain share mode as well as open mode.
Jeremy.
Jeremy Allison [Mon, 4 Apr 2005 20:40:39 +0000 (20:40 +0000)]
r6199: Only do the strange DOS error for openX, not trans2open.
Jeremy.
Tim Potter [Sat, 2 Apr 2005 00:59:12 +0000 (00:59 +0000)]
r6176: Fix a possibly uninitialised variable warning.
Tim Potter [Sat, 2 Apr 2005 00:56:30 +0000 (00:56 +0000)]
r6175: Fix crash bug and compiler warnings in strchr_m() test. Bugzilla #2565.
Jeremy Allison [Sat, 2 Apr 2005 00:13:27 +0000 (00:13 +0000)]
r6174: Fixup T2 open call - we were returning 2 bytes short.
Jeremy.
Jeremy Allison [Fri, 1 Apr 2005 23:11:28 +0000 (23:11 +0000)]
r6172: Tidy up error processing significantly. Remove unix_ERR_XXX global nastyness.
Jeremy.
Steve French [Fri, 1 Apr 2005 21:15:09 +0000 (21:15 +0000)]
r6170: Remove redundant flag that I had just added.
Jeremy Allison [Fri, 1 Apr 2005 19:57:22 +0000 (19:57 +0000)]
r6169: Fix bug #2563. Infinite loop on non-existant file with findnext.
Jeremy
Steve French [Fri, 1 Apr 2005 18:14:24 +0000 (18:14 +0000)]
r6167: Add more defines for POSIX extensions to match the newly added
client implementation
Günther Deschner [Fri, 1 Apr 2005 13:12:51 +0000 (13:12 +0000)]
r6166: Derell, I'm reverting this part of -r4917 because it modifies the keys
to search in tdbs in a way that is not upgrade-safe and somewhat weird
to use: Users have to modify policies like
pdbedit -P "maximum password policies (seconds since 1970)"
The value-description should better go into the manpage.
Guenther
Jeremy Allison [Fri, 1 Apr 2005 00:54:55 +0000 (00:54 +0000)]
r6163: Well I never, all this time the t2open code was incorrectly decting
oplock requests and no one noticed. Hmmm. Don't think this is a commonly
used codepath :-).
Jeremy.
Jeremy Allison [Fri, 1 Apr 2005 00:21:55 +0000 (00:21 +0000)]
r6160: Ensure allocation size is correctly returned for OpenX. Only set allocation
on create/truncate for nttrans.
Jeremy.
Gerald Carter [Thu, 31 Mar 2005 22:02:38 +0000 (22:02 +0000)]
r6158: fix some misleading error messages
Derrell Lipman [Thu, 31 Mar 2005 21:17:36 +0000 (21:17 +0000)]
r6157: 'editorial changes' to example code
Derrell Lipman [Thu, 31 Mar 2005 21:16:20 +0000 (21:16 +0000)]
r6156: Fixes bug #2543. Properly cache anonmous username when reverting to anonymous login, in libsmbclient.
Derrell Lipman [Thu, 31 Mar 2005 20:28:47 +0000 (20:28 +0000)]
r6155: Fixes bug #1133
Added provision for overloading some global configuration options via the new,
per-user file ~/.smb/smb.conf.append which is read after the global config
file is read (and only if the global config file was read). This leave the
original, BC behavior of ~/.smb/smb.conf which, if found, is read but causes
the global config file to not be read.
Also fixed a potential seg fault in to lp_dump_one().
Gerald Carter [Thu, 31 Mar 2005 20:11:20 +0000 (20:11 +0000)]
r6154: fix winbindd <-> Windows 2003 sp1 issue.
Can't do LsaOpenPolicy() over schannel anymore.
This is an interesting find as it could imply that there are
other changes we haven't seen yet in sp1.
Volker, You might want to look at this for trunk.
Jeremy Allison [Thu, 31 Mar 2005 19:10:59 +0000 (19:10 +0000)]
r6152: Correctly check OpenX open modes.
Jeremy.
Derrell Lipman [Thu, 31 Mar 2005 16:26:15 +0000 (16:26 +0000)]
r6151: additional examples/tests for libsmbclient
Derrell Lipman [Thu, 31 Mar 2005 05:06:04 +0000 (05:06 +0000)]
r6149: Fixes bugs #2498 and 2484.
1. using smbc_getxattr() et al, one may now request all access control
entities in the ACL without getting all other NT attributes.
2. added the ability to exclude specified attributes from the result set
provided by smbc_getxattr() et al, when requesting all attributes,
all NT attributes, or all DOS attributes.
3. eliminated all compiler warnings, including when --enable-developer
compiler flags are in use. removed -Wcast-qual flag from list, as that
is specifically to force warnings in the case of casting away qualifiers.
Note: In the process of eliminating compiler warnings, a few nasties were
discovered. In the file libads/sasl.c, PRIVATE kerberos interfaces
are being used; and in libsmb/clikrb5.c, both PRIAVE and DEPRECATED
kerberos interfaces are being used. Someone who knows kerberos
should look at these and determine if there is an alternate method
of accomplishing the task.
Jeremy Allison [Thu, 31 Mar 2005 02:12:09 +0000 (02:12 +0000)]
r6146: Added OS/2 EA support in trans2_open and trans2_mkdir. Fixed in nttrans_create.
Jeremy.
Jeremy Allison [Thu, 31 Mar 2005 00:36:22 +0000 (00:36 +0000)]
r6141: Fix OS/2 EA's for NTcreate. OpenX and mkdir to follow.
Jeremy.
Jeremy Allison [Wed, 30 Mar 2005 20:53:02 +0000 (20:53 +0000)]
r6138: Refactor length reading out of EA code so we can read length
external to buffer. Needed to add EA code to create calls.
Jeremy.
Derrell Lipman [Wed, 30 Mar 2005 04:40:24 +0000 (04:40 +0000)]
r6127: Eliminated all compiler warnings pertaining to mismatched "qualifiers". The
whole of samba comiles warning-free with the default compiler flags.
Temporarily defined -Wall to locate other potential problems. Found an
unused static function (#ifdefed out rather than deleted, in case it's
needed for something in progress).
There are also a number of uses of undeclared functions, mostly krb5_*.
Files with these problems need to have appropriate header files included,
but they are not fixed in this update.
oplock_linux.c.c has undefined functions capget() and capset(), which need
to have "#undef _POSIX_SOURCE" specified before including <sys/capability.h>,
but that could potentially have other side effects, so that remains uncorrected
as well.
The flag -Wall should be added permanently to CFLAGS, and all warnings then
generated should be eliminated.
Derrell Lipman [Wed, 30 Mar 2005 02:39:22 +0000 (02:39 +0000)]
r6126: added utility for testing smbc_stat()
Derrell Lipman [Wed, 30 Mar 2005 02:35:31 +0000 (02:35 +0000)]
r6125: smbc_stat() returned incorrect timestamps IFF it used cli_qpathinfo2() to
retrieve the timestamps (Win2k) and not if it used cli-getatr() to retrieve
the timestamps (Win98). Timestamps are supposed to be in GMT, and should
not have serverzone deducted from them in cli_qpathinfo2().
Jeremy Allison [Wed, 30 Mar 2005 02:24:47 +0000 (02:24 +0000)]
r6124: Fix for bug #2242 from Tom Lackemann <cessnatomny@yahoo.com> - don't
set SD on an NTtransact create unless we created the file.
Jeremy.
Jeremy Allison [Wed, 30 Mar 2005 02:05:22 +0000 (02:05 +0000)]
r6122: Added "hack" fix for broken SMB_INFO_VOLUME level - used by OS/2
I believe. Reported as fixed by Marcel Müller <mueller@maazl.de>.
Jeremy.
Jeremy Allison [Wed, 30 Mar 2005 00:47:57 +0000 (00:47 +0000)]
r6120: Added "volume" command to smbclient that prints out the volume name and
serial number.
Jeremy.
Günther Deschner [Tue, 29 Mar 2005 15:17:26 +0000 (15:17 +0000)]
r6117: Close handles after group-creation as well.
Guenther
Simo Sorce [Tue, 29 Mar 2005 14:08:49 +0000 (14:08 +0000)]
r6116: update debian changelog
Volker Lendecke [Tue, 29 Mar 2005 06:45:10 +0000 (06:45 +0000)]
r6110: Close handles on user creation. This allows easy mass creation of users with
rpcclient.
Volker
Derrell Lipman [Tue, 29 Mar 2005 00:42:51 +0000 (00:42 +0000)]
r6108: Added smbsh/smbwrapper for Linux to example/libsmbclient tree; provided more complete libsmbclient testbrowse utility
Jeremy Allison [Tue, 29 Mar 2005 00:36:30 +0000 (00:36 +0000)]
r6106: Fix bug #2551. It turns out that the incoming flags2 flag FLAGS2_LONG_PATH_COMPONENTS
determines if a reply is uppercased on a SMBsearch request, not the protocol level.
This could clear up quite a few hacks going forward I think.
Jeremy.
Jeremy Allison [Mon, 28 Mar 2005 21:31:01 +0000 (21:31 +0000)]
r6104: Update dos filetimes to default yes for Office 2000.
Jeremy.
Steve French [Mon, 28 Mar 2005 20:32:04 +0000 (20:32 +0000)]
r6103: Update list of mount options for mount.cifs
Derrell Lipman [Mon, 28 Mar 2005 19:52:23 +0000 (19:52 +0000)]
r6102: add support for opening a file for write with O_APPEND in libsmbclient
Jeremy Allison [Mon, 28 Mar 2005 03:27:44 +0000 (03:27 +0000)]
r6092: This much const causes the compiler on Fedora Core 2
to throw up.
Jeremy.
Jeremy Allison [Mon, 28 Mar 2005 03:18:57 +0000 (03:18 +0000)]
r6090: Patch to fix sys_select so it can't drop signals if another fd
is ready to read. Patch from Mark Weaver <mark-clist@npsl.co.uk>.
The only question is, how did we miss this for so long..... :-).
Jeremy.
Jeremy Allison [Sun, 27 Mar 2005 20:44:06 +0000 (20:44 +0000)]
r6082: Fix for bugid #2541. Fixes from Guenter Kukkukk <guenter.kukkukk@kukkukk.com>
Jeremy.