diff options
| author | Gerald Carter <jerry@samba.org> | 2002-05-02 20:02:05 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2002-05-02 20:02:05 +0000 |
| commit | d080711d9fca703bde76ec87c5c83002ebe57bd7 (patch) | |
| tree | 3de171002d0f53f4f9744c9e8ba356fd9e2a73a1 /packaging | |
| parent | d44846fabf38d07868ad69fa309bf9021933be86 (diff) | |
| download | samba-d080711d9fca703bde76ec87c5c83002ebe57bd7.tar.gz samba-d080711d9fca703bde76ec87c5c83002ebe57bd7.tar.xz samba-d080711d9fca703bde76ec87c5c83002ebe57bd7.zip | |
Debian packaging updates from Eloy P. & Steve L.
Diffstat (limited to 'packaging')
48 files changed, 4156 insertions, 6593 deletions
diff --git a/packaging/Debian/README b/packaging/Debian/README index 042499b46fa..7eb205969f3 100644 --- a/packaging/Debian/README +++ b/packaging/Debian/README @@ -9,22 +9,25 @@ you want to add --this-cool-switch to configure, or whatever, follow these instructions: 0) Make sure you have the following packages installed: - debhelper - libpam0g-dev - libreadline4-dev - libcupsys2-dev - + the minimum Debian development stuff (dpkg-dev, libc6-dev, etc.) - Note: libcupsys2-dev is not available for Potato. It's safe - to not install it if you don't need CUPS support. + debhelper + libpam0g-dev + libreadline4-dev + libcupsys2-dev + + the minimum Debian development stuff (dpkg-dev, libc6-dev, etc.) + Note: the libcupsys2-dev is not available in Debian Potato. That's + fine; the configure script won't detect CUPS support and the + resulting binaries won't support CUPS. 1) cd samba[-<version>] 2) cp -a packaging/Debian/debian/ debian It's important that you copy instead of symlink because the build tools in Potato have a problem that prevents the build to work with a symlink. -3) dch -i +3) dch -i (this is completely optional - only do it if you understand + Debian version numbers! Don't complain later if you can't upgrade + to official versions of the Samba packages for Debian.) - Edit the changelog and make sure the version is right. For example, - for Samba 2.2.3, the version number should be 2.2.3-0.1 (use - a number less than 1 like 0.1, 0.2, etc. so there is no conflict + for Samba 2.2.4, the version number should something like 2.2.4-0.1 + (use a number less than 1 like 0.1, 0.2, etc. so there is no conflict with future upgrades to the official Debian packages.) 4) Run 'debian/rules binary'. - It is better that you prefix the above command with 'fakeroot'. @@ -32,11 +35,11 @@ these instructions: 5) That's it. Your new packages should be in ../. Install with dpkg. Please e-mail samba@packages.debian.org with comments, question or -usggestions. Please talk to us and not to the Samba Team. They have +suggestions. Please talk to us and not to the Samba Team. They have better things to do and know nothing about the Debian packaging system. Eloy A. Paris <peloy@debian.org> Steve Langasek <vorlon@debian.org> -Sat Feb 2 00:44:42 CET 2002 +$Id: README,v 1.1.2.3 2002/05/02 20:02:04 jerry Exp $ diff --git a/packaging/Debian/debian/README.build-upstream b/packaging/Debian/debian/README.build-upstream new file mode 100644 index 00000000000..83f3c32ddb8 --- /dev/null +++ b/packaging/Debian/debian/README.build-upstream @@ -0,0 +1,43 @@ +Building Samba Packages for Debian GNU/Linux +-------------------------------------------- + +If you want to build Samba packages for Debian and you just want to use +upstream sources, i.e. you don't want to wait for us to put official +packages out, or you want packages for a Debian version for which we +don't provide deb's, or you don't want to use official packages, or +you want to add --this-cool-switch to configure, or whatever, follow +these instructions: + +0) Make sure you have the following packages installed: + debhelper + libpam0g-dev + libreadline4-dev + libcupsys2-dev + + the minimum Debian development stuff (dpkg-dev, libc6-dev, etc.) + Note: the libcupsys2-dev is not available in Debian Potato. That's + fine; the configure script won't detect CUPS support and the + resulting binaries won't support CUPS. +1) cd samba[-<version>] +2) cp -a packaging/Debian/debian/ debian + It's important that you copy instead of symlink because the build + tools in Potato have a problem that prevents the build to work with + a symlink. +3) dch -i + - Edit the changelog and make sure the version is right. For example, + for Samba 2.2.3, the version number should be 2.2.3-0.1 (use + a number less than 1 like 0.1, 0.2, etc. so there is no conflict + with future upgrades to the official Debian packages.) +4) Run 'debian/rules binary'. + - It is better that you prefix the above command with 'fakeroot'. + If you have problems you might try building as root. +5) That's it. Your new packages should be in ../. Install with dpkg. + +Please e-mail samba@packages.debian.org with comments, question or +suggestions. Please talk to us and not to the Samba Team. They have +better things to do and know nothing about the Debian packaging system. + +Eloy A. Paris <peloy@debian.org> +Steve Langasek <vorlon@debian.org> + +$Id: README.build-upstream,v 1.1.2.1 2002/05/02 20:02:04 jerry Exp $ + diff --git a/packaging/Debian/debian/README.debian b/packaging/Debian/debian/README.debian index 82be3f4df4a..3caf62b9cce 100644 --- a/packaging/Debian/debian/README.debian +++ b/packaging/Debian/debian/README.debian @@ -1,30 +1,45 @@ Samba for Debian ---------------- -This package was built by Eloy Paris <peloy@debian.org> and Steve -Langasek <vorlon@debian.org>, current maintainers of the Samba packages -for Debian, based on work from Bruce Perens <Bruce@Pixar.com>, Andrew +This package was built by Eloy Paris <peloy@debian.org> and Steve Langasek +<vorlon@debian.org>, current maintainers of the Samba packages for Debian, +based on previous work from Bruce Perens <Bruce@Pixar.com>, Andrew Howell <andrew@it.com.au>, Klee Dienes <klee@debian.org> and Michael Meskes <meskes@topsystem.de>, all previous maintainers of the packages -samba and sambades (now merged together - see below). +samba and sambades (merged together for longer than we can remember.) -As of Samba 2.0.6-1, the Debian version of Samba is compiled with -Pluggable Authentication Modules (PAM) support. PAM support was -discontinued during the libc5 -> libc6 migration process and I never -brought it back until 2.0.6-1. +Contents of this README file: -The smbfs package does not support the 2.0.x Linux kernels anymore. -This has been the case since the very first packages of the CVS sources -that eventually became Samba 2.2. To use the smbfs package you need to -run a 2.2.x kernel or later. +1. Notes +2. Packages Generated from the Samba Sources +3. Support for NT Domains +4. Samba and LDAP +5. Reporting bugs -Starting with the Debian packages for Samba 2.2, the Samba log files (for -nmbd and smbd) have been moved to a new location: /var/log/samba/. The -files also have new names: log.nmbd and log.smbd. The old files -(/var/log/{nmb,smb} were moved to the new location. -As of Samba 2.2.2-11, the Samba sources produce the following binary -packages: +1. Notes +-------- + +- As of Samba 2.0.6-1, the Debian version of Samba is compiled with + Pluggable Authentication Modules (PAM) support. PAM support was + discontinued during the libc5 -> libc6 migration process and I never + brought it back until 2.0.6-1. + +- The smbfs package does not support the 2.0.x Linux kernels anymore. + This has been the case since the very first packages of the CVS sources + that eventually became Samba 2.2. To use the smbfs package you need to + run a 2.2.x kernel or later. + +- Starting with the Debian packages for Samba 2.2, the Samba log files (for + nmbd and smbd) have been moved to a new location: /var/log/samba/. The + files also have new names: log.nmbd and log.smbd. The old files + (/var/log/{nmb,smb} were moved to the new location. + + +2. Packages Generated from the Samba Sources +-------------------------------------------- + +Currently, the Samba sources produce the following binary packages: samba: A LanManager like file and printer server for Unix. samba-common: Samba common files used by both the server and the client. @@ -37,7 +52,8 @@ libpam-smbpass: pluggable authentication module for SMB password database. libsmbclient: Shared library that allows applications to talk to SMB servers. libsmbclient-dev: libsmbclient shared libraries. - +winbind: Service to resolve user and group information from a Windows NT + server. Please note that the package smbwrapper (a shared library that provides SMB client services that existed between Samba 2.0.0-1 and Samba-2.0.5a-4 @@ -47,8 +63,9 @@ recommended to disable the compilation of smbwrapper until some issues with glibc2.1 get cleared out (the problem is with glibc, not with Samba itself). -Support for NT Domains ----------------------- + +3. Support for NT Domains +------------------------- Samba 2.2 includes preliminary support for NT domains. A Samba server can now be part of a Windows NT domain whose Primary Domain Controller @@ -66,6 +83,58 @@ section). Please note that NT domain PDC support is far from complete and is still experimental. + +4. Samba and LDAP +----------------- + +Samba 2.2 has experimental LDAP code. However, the official Debian +packages have not been compiled with LDAP support for a good reason: if +LDAP support is compiled in then the other authentication methods (PAM, +smbpasswd, etc.) cannot be used, only LDAP will work. So, until LDAP +cannot coexist peacefully with the other methods we will not provided +LDAP-enabled packages. The workaround is, of course, to build your own +packages. We can help with this if you don't know how to build packages. + +We follow Samba development, so please do not file bug reports asking +for LDAP, we will add support for it when it doesn't break other +things. + + +5. Reporting Bugs +----------------- + +If you believe you have found a bug please make sure the possible bug +also exists in the latest version of Samba that is available for the +unstable Debian distribution. If you are running Debian stable this +means that you will probably have to build your own packages. And if the +problem does not exist in the latest version of Samba we have packaged it +means that you will have to run the version of Samba you built yourself +since it is not easy to upload new packages to the stable distribution, +unless they fix critical security problems. + +If you can reproduce the problem in the latest version of Samba then +it is likely to be a real bug. Your best shot is to search the Samba +mailing lists to see if it is something that has already been reported +and fixed - if it is a simple fix we can add the patch to our packages +without waiting for a new Samba release. + +If you decide that your problem deserves to be submitted to the Debian +Bug Tracking System (BTS) we expect you to be responsive if we request +more information. If we request more information and do not receive +any in a reasonable time frame expect to see your bug closed without +explanation - we can't fix bugs we can't reproduce, and most of the +time we need more information to be able to reproduce them. + +When submitting a bug to the Debian BTS please include the version of +the Debian package you are using as well as the Debian distribution you +are using. Think _twice_ about the severity you assign to the bug: we +are _very_ sensitive about bug severities; the fact that it doesn't +work for you doesn't mean that the severity must be such that it holds +a major Debian release. In fact, that it doesn't work for you it +doesn't mean that it doesn't work for others. So again: think _twice_. + + Eloy A. Paris <peloy@debian.org> Steve Langasek <vorlon@debian.org> -January 14, 2002 + +$Id: README.debian,v 1.1.2.2 2002/05/02 20:02:04 jerry Exp $ diff --git a/packaging/Debian/debian/TODO b/packaging/Debian/debian/TODO index 95bcd64e2bc..f53691f26b1 100644 --- a/packaging/Debian/debian/TODO +++ b/packaging/Debian/debian/TODO @@ -1,10 +1,8 @@ In no particular order: -- New packages for winbind stuff. - Fix stuff in packaging/Debian/ (add infrastructure for stable builds) - Compile with LDAP support. -- Finish debconf support. -- Test debconf support. - Review /etc/init.d/samba (Brian White reports problems, should add --oknodo to start-stop-daemon) + diff --git a/packaging/Debian/debian/changelog b/packaging/Debian/debian/changelog index 93bb6d4f042..445f521f08c 100644 --- a/packaging/Debian/debian/changelog +++ b/packaging/Debian/debian/changelog @@ -1,10 +1,241 @@ -samba (2.2.2.cvs20020201-1) unstable; urgency=low - - * Getting ready for Samba 2.2.3. - * Using a poor's man build system to keep our patches to upstream - under the debian/ directory. - - -- Eloy A. Paris <peloy@debian.org> Fri, 1 Feb 2002 16:10:58 -0500 +samba (2.2.4-0.1debian) unstable; urgency=low + + * This is a locally-built version of Samba for Debian. Do not pester + the Samba Team with questions about Debian packaging. Contact the + Debian Samba maintainers <samba@packages.debian.org> instead. + + -- Debian User <somebody@somewhere.com> Thu, 2 May 2002 01:36:33 -0400 + +samba (2.2.3a-7) unstable; urgency=medium + + * More README.debian updates. + * Neutralize the smb.conf 'lock dir' directive, which doesn't mean + what the FHS says it should, and causes us no end of grief. + (Closes: #122299) + * LPRng-handling patch so that jobs printed to recent versions of + LPRng show up properly as 'done' instead of 'paused' in the Windows + print queue. Thanks to Jaroslav Serdula <serdula_jaroslav@vse.sk> + for this patch. (Closes: #139458) + * Applied patch from Urban Widmark <urban@teststation.com> + (smbfs upstream maintainer) to add a '-n' option to smbmount + that does the same as mount's '-n'. (Closes: #139590) + * Minor tweak to unpatch-source so we unpatch sources in the + reverse order we patched them. + * Don't depend on grep in samba.prerm to determine if Samba was + running before the upgrade starts. + * Tweak the wording of debconf templates. + * Incorporate debconf translations for French, Spanish and Portuguese; + thanks to Carlos Valdivia Yagüe <valyag@hotpop.com> (es), + Andre Luis Lopes <andrelop@ig.com.br> (pt_BR), and Philippe + Batailler and Denis Barbier <barbier@debian.org> (fr). + (closes: #142657, #142659, #141551, #141699, #141682) + * Fixed symlinks in the swat package so the point to /usr/share/doc/ + instead of /usr/doc/. Added note to the description of the + swat packages that says that samba-doc must be installed for + the on-line documentation to work. Thanks to Torne Wuff + <torne@wolfpuppy.org.uk>. (Closes: #95437) + * 'dh_installinit -n' gives us no initscript handling -- we need to + handle all starting and stopping of daemons ourselves, which wasn't + happening in the {pre,post}rm scripts. + * Vary the priority of the debconf question "Do you want to generate + /etc/samba/smbpassd?" depending on whether the file already exists. + File exists -> priority 'medium', file does not exist -> priority + 'low'. Changed priorities of all other questions from 'high' to 'medium'. + + -- Steve Langasek <vorlon@debian.org> Sat, 20 Apr 2002 17:48:27 -0400 + +samba (2.2.3a-6) unstable; urgency=low + + * Call db_stop as soon as we're done with debconf in the postinst, to + avoid hanging bugs (closes: #137813) + * Ony call 'update-inetd --add' on first installation, just as we only + call 'update-inetd --remove' on package purge. + * Bring our shipped smb.conf closer in line with the upstream + defaults: don't twiddle the send/recv buffer sizes, since the Linux + kernel already provides a much better default setting + (closes: #80966, #80934, #137415, #133477) + * Added libnss_wins.so to the winbind package (closes: #137201) + * Updates to README.debian. + + -- Eloy A. Paris <peloy@debian.org> Tue, 12 Mar 2002 10:57:40 -0500 + +samba (2.2.3a-5) unstable; urgency=low + + * Having multiple workgroup lines in your smb.conf, though wacky, is + perfectly valid. Account for this in samba-common.config. + (closes: #137157) + + -- Steve Langasek <vorlon@debian.org> Sun, 10 Mar 2002 21:52:51 -0600 + +samba (2.2.3a-4) unstable; urgency=low + + * Fixed typo in samba.postinst. Cosmetic fixes there as well. + * Fix to improper usage of /usr/bin/tr in samba-common config script + (closes: #137744) + + -- Steve Langasek <vorlon@debian.org> Sat, 9 Mar 2002 14:14:02 -0500 + +samba (2.2.3a-3) unstable; urgency=medium + + * Make sure /etc/init.d/samba is executable before calling it + in the postinst. Quickly checked all other maintainer scripts + to make sure we are not calling an init script if it is not + executable. (closes: #137321) + * Fix up maintainer scripts to detect if samba was not running before + an upgrade. (closes: #33520, #130534) + * Make sure /etc/samba/ is included in the samba-common package. + Closes: #137157 + + -- Steve Langasek <vorlon@debian.org> Fri, 8 Mar 2002 11:13:21 -0500 + +samba (2.2.3a-2) unstable; urgency=low + + * merge in debconf support: + - Moved all smb.conf-related questions to samba-common (smb.conf + is part of the samba-common package, not the samba package.) + - smb.conf is not a samba-common conffile anymore since it is + being managed by debconf. It is ABSOLUTELY necessary to make + sure /etc/samba/smb.conf _NEVER_ gets overwritten by changes + made via debconf. In other words, any changes made by the user + should be honored by the debconf interface. + - samba.postinst now moves old log files from /var/log/ to + /var/log/samba/. There's a Debconf note that informs the user + the log files are stored now in a new location. + - debian/control: + + Make samba depend on debconf. + - New file debian/samba.templates. + - New file debian/samba.config. + - Re-worked debian/samba.postinst. + + Got rid of all /etc/samba/debian_config sillyness. + - remove /usr/sbin/sambaconfig; "dpkg-reconfigure samba" replaces + it. + - Removed debian/samba.prerm. + - Cleaned up /etc/init.d/samba. + + Added infrastructure for debconf. + + Got rid of all /etc/samba/debian_config sillyness. + + Got rid of /etc/samba/smbpasswd conversion stuff for + compatibility with versions of Samba < 2.0.0final-2. + (closes: #127959, #34408, #113594) + * make samba.postinst ignore the absence of /var/log/{s,n}mb*; + makes for a clean upgrade path. + * Building with MSDFS support (closes: #116793) + + -- Steve Langasek <vorlon@debian.org> Tue, 5 Mar 2002 14:14:33 -0600 + +samba (2.2.3a-1) unstable; urgency=low + + * New upstream version (closes: #135001) + * Potato builds were failing because debian/rules was not creating + debian/winbind/etc/logrotate.d/. A user having problems creating + Potato packages brought this to my attention. dh_installlogrotate + takes care of creating the directory for us, that's why we didn't + notice. + * Removed code that converts /etc/samba/smbpasswd from an ancient + format to the new format of Samba 2.0.0 and later. + Closes: #134375 - samba: postinst failed due to missing + /usr/bin/convert_smbpasswd. + * Re-organized FHS migration code in samba.postinst. Make sure we + don't fail when we move files that don't exist. + Closes: #133813 - samba: Install failed. + * Adding docs. to the libpam-smbpass package. + * Remove man pages for findsmb because we are not providing this + script. + Closes: #134181 - findsmb referenced, but not included. + * Removed replace.patch because it is now present upstream. + * Added patch from Jerry Carter to fix a problem when saving + document preferences for printing from NT clients. + * The real winbindd daemon is a forked process so we can't use + --make-pidfile when calling start-stop-daemon. Fixed + /etc/init.d/winbind to work around the issue. Thanks to + Lin Li <linl@xandros.com> for the patience and for reporting + the problems. Hopefully I got it right this time. + + -- Eloy A. Paris <peloy@debian.org> Wed, 20 Feb 2002 18:39:03 -0500 + +samba (2.2.3-6) unstable; urgency=low + + * Make sure there are actual files in /var/state/samba before trying + to move them (Closes: #133534, #133510). + * Fix up the 2.2.3 makefile so that pam_smbpass builds correctly + again. + + -- Steve Langasek <vorlon@debian.org> Tue, 12 Feb 2002 09:19:29 -0600 + +samba (2.2.3-5) unstable; urgency=low + + * Whoops, missed a spot on the samba.postinst -- will fail badly if + /var/state/samba/ no longer exists. Better get this fix into the + next upload. ;) (Closes: #133088) + * Regenerate configure only if it is older than configure.in. + * Fix smbd handling of network neighborhood lists, which was missed + in the FHS conversion (Closes: #133091) + + -- Eloy A. Paris <peloy@debian.org> Sat, 9 Feb 2002 16:37:57 -0500 + +samba (2.2.3-4) unstable; urgency=low + + * FHS cleanup; files in /var are now properly sorted according to + their nature. (Closes: #102101) + * Remove patches to source/configure, since we now call autoconf to + regenerate this file cleanly. + * lintian fixes: + - Create winbind.conffiles and add /etc/logrotate.d/winbind and + /etc/init.d/winbind to it. + - Use a relative symlink for /usr/lib/cups/backend/smb. + - Removal of a .cvsignore file in the samba-doc package. + * winbind.init fixes: + - Corrected name of the pid file (Steve) + - Make start-stop-daemon create a pid file for winbindd since it + does not create one on his own. + * #DEBHELPER# is not needed in samba.postinst because we are adding + manually everything that debhelper adds automatically. In fact, + since we are calling update-rc.d without standard paramaters I + think we can't use #DEBHELPER#. + * Fix fatal syntax error in samba.prerm. + + -- Steve Langasek <vorlon@debian.org> Thu, 7 Feb 2002 13:12:08 -0500 + +samba (2.2.3-3) unstable; urgency=low + + * work on lintian-cleanness in the package (wrong permissions, + maintainer scripts in need of debhelpering) + * /lib/security/pam_smbpass.so is now being included in the + libpam-smbpass package only, and not in both the libpam-smbpass and + samba packages (which was the case prior to 2.2.3-3.) + * Instead of making our patch scripts executable in the rules file + we run them through /bin/sh. + * New 'winbind' package that has all the winbind stuff that was in the + samba package in 2.2.3-2 and before. + * Added replace.patch: patch from Jeremy Allison to fix problems when + replacing or overwriting files in a Samba share. Patch was sent to + the samba mailing list. + + -- Eloy A. Paris <peloy@debian.org> Tue, 5 Feb 2002 21:12:48 -0500 + +samba (2.2.3-2) unstable; urgency=low + + * add support to debian/scripts/{patch-source,unpatch-source} for + automatic updating and cleaning of <version.h>. This was a request + from the Samba Team: they wanted us to clearly mark our packages + so it is always known a user is running Samba with (possibly) + Debian-specific patches. + * Change init.d killscript link to K19samba, so we stop before autofs + (closes: 117327) + * Make our patch scripts executable in the rules file -- dpkg won't do + this for us (closes: #132415). + + -- Steve Langasek <vorlon@debian.org> Mon, 4 Feb 2002 09:51:00 -0600 + +samba (2.2.3-1) unstable; urgency=low + + * New upstream release (closes: #131228). + * Restructured build system that provides DBS-like separation of + patches + * Fix typo in smbfs description (closes: #116209). + * Use killall -q in logrotate.d script, to avoid spurious cron + emails (closes: #130100). + + -- Steve Langasek <vorlon@debian.org> Sat, 2 Feb 2002 19:56:18 -0500 samba (2.2.2-12) unstable; urgency=high diff --git a/packaging/Debian/debian/control b/packaging/Debian/debian/control index 2054da9f188..42a061652d9 100644 --- a/packaging/Debian/debian/control +++ b/packaging/Debian/debian/control @@ -3,12 +3,12 @@ Section: net Priority: optional Maintainer: Eloy A. Paris <peloy@debian.org> Uploaders: Steve Langasek <vorlon@debian.org> -Build-Depends: debhelper (>=2.0.103), libpam0g-dev, libreadline4-dev, libcupsys2-dev +Build-Depends: debhelper (>=2.0.103), libpam0g-dev, libreadline4-dev, libcupsys2-dev, autoconf Standards-Version: 3.1.1 Package: samba Architecture: any -Depends: samba-common (= ${Source-Version}), netbase, logrotate, ${shlibs:Depends} +Depends: debconf, samba-common (= ${Source-Version}), netbase, logrotate, ${shlibs:Depends} Replaces: samba-common (<= 2.0.5a-2) Suggests: samba-doc Description: A LanManager like file and printer server for Unix. @@ -20,7 +20,7 @@ Description: A LanManager like file and printer server for Unix. This package contains all the components necessary to turn your Debian GNU/Linux box into a powerful file and printer server. . - As of Samba 2.2.1a-3, the Samba Debian packages consist of the following: + Currently, the Samba Debian packages consist of the following: . samba - A LanManager like file and printer server for Unix. samba-common - Samba common files used by both the server and the client. @@ -31,10 +31,15 @@ Description: A LanManager like file and printer server for Unix. libpam-smbpass - pluggable authentication module for SMB password database libsmbclient - Shared library that allows applications to talk to SMB servers libsmbclient-dev - libsmbclient shared libraries + winbind: Service to resolve user and group information from Windows NT servers + . + It is possible to install a subset of these packages depending on + your particular needs. For example, to access other SMB servers you + should only need the smbclient and samba-common packages. Package: samba-common Architecture: any -Depends: libpam-modules, ${shlibs:Depends} +Depends: debconf, libpam-modules, ${shlibs:Depends} Replaces: samba (<= 2.0.5a-2) Description: Samba common files used by both the server and the client. The Samba software suite is a collection of programs that @@ -75,6 +80,9 @@ Description: Samba Web Administration Tool . This package contains the components of the Samba suite that are needed for Web administration of the Samba server. + . + Note: if you want to use the on-line documentation that is accesible + through the Swat front-end you must install the samba-doc package. Package: samba-doc Section: doc @@ -108,9 +116,9 @@ Description: mount and umount commands for the smbfs (for kernels >= than 2.2.x) . Starting with the Debian Samba packages version 2.2.0-1, the old smbfs utilities for 2.0.x have been removed. There are no wrapper scripts - that call a specific smbmount/smbmount depending on the kernel version. - If you are using a 2.0.x kernel please upgrade or use the latest Samba - 2.0.7 Debian package. + that call a specific smbmount/smbumount depending on the kernel + version. If you are using a 2.0.x kernel please upgrade or use the + latest Samba 2.0.7 Debian package. Package: libpam-smbpass Section: admin @@ -141,7 +149,7 @@ Package: libsmbclient-dev Section: devel Priority: extra Architecture: any -Depends: libsmbclient (= ${Source-Version}), ${shlibs:Depends} +Depends: libsmbclient (= ${Source-Version}) Description: libsmbclient static libraries and headers libsmbclient allows to write applications that use the SMB protocol. This gives applications the ability to talk to Microsoft Windows servers @@ -149,3 +157,19 @@ Description: libsmbclient static libraries and headers . This package contains the libsmbclient static libraries and headers needed to build applications that use SMB services. + +Package: winbind +Section: net +Priority: optional +Architecture: any +Depends: ${shlibs:Depends} +Replaces: samba (<= 2.2.3-2) +Description: Service to resolve user and group information from Windows NT servers + This package provides the winbindd daemon, which provides a + service for the Name Service Switch capability that is present + in most modern C libraries (like the GNU C Library - glibc.) + . + The service provided by winbindd is called `winbind' and + can be used to resolve user and group information from a + Windows NT server. The service can also provide authentication + services via an associated PAM module. diff --git a/packaging/Debian/debian/copyright b/packaging/Debian/debian/copyright index 95bac89a540..e74a64fa5b8 100644 --- a/packaging/Debian/debian/copyright +++ b/packaging/Debian/debian/copyright @@ -3,18 +3,10 @@ This is the Debian Linux prepackaged version of the Samba SMB <Andrew.Tridgell@anu.edu.au> and many others. This package was put together by Eloy Paris <peloy@debian.org> -based on previous work by Klee Dienes <klee@debian.org>, -Andrew Howell <andrew@it.com.au> and Bruce Perens <bruce@pixar.com> -from sources found at <URL:ftp://samba.anu.edu.au/pub/samba>. - -As of early in the samba-2.0.0alpha series, the Samba package for Debian -was split into the following packages: - -- samba (the Samba server) -- smbclient (a LAN Manager client - like the ftp program) -- swat (Samba Web Administration Tool) -- smbfs (smbfs userland utilities for kernels > 2.0.x) -- samba-doc (Samba documentation). +and Steve Langasek <vorlon@debian.org> based on previous work by +Klee Dienes <klee@debian.org>, Andrew Howell <andrew@it.com.au> +and Bruce Perens <bruce@pixar.com> from sources found at +<URL:ftp://ftp.samba.org/pub/samba>. Copyright: diff --git a/packaging/Debian/debian/libpam-smbpass.docs b/packaging/Debian/debian/libpam-smbpass.docs new file mode 100644 index 00000000000..d84796d551b --- /dev/null +++ b/packaging/Debian/debian/libpam-smbpass.docs @@ -0,0 +1,4 @@ +source/pam_smbpass/CHANGELOG +source/pam_smbpass/README +source/pam_smbpass/INSTALL +source/pam_smbpass/TODO diff --git a/packaging/Debian/debian/libsmbclient.postinst b/packaging/Debian/debian/libsmbclient.postinst index 76f61de067a..20daabc2d3a 100644 --- a/packaging/Debian/debian/libsmbclient.postinst +++ b/packaging/Debian/debian/libsmbclient.postinst @@ -2,6 +2,8 @@ # # postinst script for libsmbclient # +# $Id: libsmbclient.postinst,v 1.1.2.2 2002/05/02 20:02:04 jerry Exp $ +# if [ "$1" = "configure" ]; then ldconfig diff --git a/packaging/Debian/debian/patches/Makefile.in.patch b/packaging/Debian/debian/patches/Makefile.in.patch new file mode 100644 index 00000000000..d4e062c766e --- /dev/null +++ b/packaging/Debian/debian/patches/Makefile.in.patch @@ -0,0 +1,16 @@ +--- samba/source/Makefile.in.orig Thu May 2 14:03:45 2002 ++++ samba/source/Makefile.in Thu May 2 14:03:45 2002 +@@ -709,9 +709,10 @@ + @$(SHELL) $(srcdir)/script/installswat.sh $(SWATDIR) $(srcdir) + + installclientlib: +- -$(INSTALLCMD) bin/libsmbclient.so +- -$(INSTALLCMD) -d ${prefix}/include +- -$(INSTALLCMD) include/libsmbclient.h ${prefix}/include ++ -$(INSTALLCMD) bin/libsmbclient.so $(BASEDIR)/lib ++ -$(INSTALLCMD) bin/libsmbclient.a $(BASEDIR)/lib ++ -$(INSTALLCMD) -d $(INCLUDEDIR) ++ -$(INSTALLCMD) include/libsmbclient.h $(INCLUDEDIR) + + # revert to the previously installed version + revert: diff --git a/packaging/Debian/debian/patches/configure.patch b/packaging/Debian/debian/patches/configure.patch index 497455120d3..00d21360237 100644 --- a/packaging/Debian/debian/patches/configure.patch +++ b/packaging/Debian/debian/patches/configure.patch @@ -1,5997 +1,6 @@ ---- samba-2.2.2.cvs20020120.orig/source/configure -+++ samba-2.2.2.cvs20020120/source/configure -@@ -1077,7 +1077,7 @@ - - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - --for ac_prog in gawk mawk nawk awk -+for ac_prog in mawk gawk nawk awk - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 -@@ -1537,6 +1537,47 @@ - rm -fr conftest* - fi - -+ if test x$LINUX_LFS_SUPPORT = xyes ; then -+ if test "$cross_compiling" = yes; then -+ LINUX_LFS_SUPPORT=cross -+else -+ cat > conftest.$ac_ext <<EOF -+#line 1546 "configure" -+#include "confdefs.h" -+ -+#include <unistd.h> -+#include <sys/types.h> -+#include <fcntl.h> -+main() { -+ unsigned int *padding; -+ struct flock foo_lock = {F_WRLCK, SEEK_SET, 0, 1, 0}; -+ int fd = open("/dev/null", O_RDWR); -+ -+ /* Yes, we're depending on the internals of the Linux flock structure -+ here -- but this test is explicitly Linux-specific to begin with. */ -+ padding = (unsigned int *)&foo_lock; -+ padding[1] = 0xffffffff; -+ foo_lock.l_start = 0; -+ if (fcntl(fd, F_SETLK, &foo_lock) < 0) -+ exit(1); -+ -+ exit(0); -+} -+ -+EOF -+if { (eval echo configure:1569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ LINUX_LFS_SUPPORT=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ LINUX_LFS_SUPPORT=no -+fi -+rm -fr conftest* -+fi -+ -+ fi - CPPFLAGS="$old_CPPFLAGS" - if test x$LINUX_LFS_SUPPORT = xyes ; then - CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS" -@@ -1546,14 +1587,14 @@ - - *hurd*) - echo $ac_n "checking for LFS support""... $ac_c" 1>&6 --echo "configure:1550: checking for LFS support" >&5 -+echo "configure:1591: checking for LFS support" >&5 - old_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="-D_LARGEFILE64_SOURCE -D_GNU_SOURCE $CPPFLAGS" - if test "$cross_compiling" = yes; then - GLIBC_LFS_SUPPORT=cross - else - cat > conftest.$ac_ext <<EOF --#line 1557 "configure" -+#line 1598 "configure" - #include "confdefs.h" - - #include <unistd.h> -@@ -1565,7 +1606,7 @@ - #endif - } - EOF --if { (eval echo configure:1569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:1610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - GLIBC_LFS_SUPPORT=yes - else -@@ -1587,21 +1628,21 @@ - esac - - echo $ac_n "checking for inline""... $ac_c" 1>&6 --echo "configure:1591: checking for inline" >&5 -+echo "configure:1632: checking for inline" >&5 - if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_cv_c_inline=no - for ac_kw in inline __inline__ __inline; do - cat > conftest.$ac_ext <<EOF --#line 1598 "configure" -+#line 1639 "configure" - #include "confdefs.h" - - int main() { - } $ac_kw foo() { - ; return 0; } - EOF --if { (eval echo configure:1605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_inline=$ac_kw; break - else -@@ -1627,7 +1668,7 @@ - esac - - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:1631: checking how to run the C preprocessor" >&5 -+echo "configure:1672: checking how to run the C preprocessor" >&5 - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= -@@ -1642,13 +1683,13 @@ - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext <<EOF --#line 1646 "configure" -+#line 1687 "configure" - #include "confdefs.h" - #include <assert.h> - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1693: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -1659,13 +1700,13 @@ - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext <<EOF --#line 1663 "configure" -+#line 1704 "configure" - #include "confdefs.h" - #include <assert.h> - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1669: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -1676,13 +1717,13 @@ - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext <<EOF --#line 1680 "configure" -+#line 1721 "configure" - #include "confdefs.h" - #include <assert.h> - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1686: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1727: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -1707,12 +1748,12 @@ - echo "$ac_t""$CPP" 1>&6 - - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:1711: checking for ANSI C header files" >&5 -+echo "configure:1752: checking for ANSI C header files" >&5 - if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1716 "configure" -+#line 1757 "configure" - #include "confdefs.h" - #include <stdlib.h> - #include <stdarg.h> -@@ -1720,7 +1761,7 @@ - #include <float.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1724: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1765: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -1737,7 +1778,7 @@ - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat > conftest.$ac_ext <<EOF --#line 1741 "configure" -+#line 1782 "configure" - #include "confdefs.h" - #include <string.h> - EOF -@@ -1755,7 +1796,7 @@ - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat > conftest.$ac_ext <<EOF --#line 1759 "configure" -+#line 1800 "configure" - #include "confdefs.h" - #include <stdlib.h> - EOF -@@ -1776,7 +1817,7 @@ - : - else - cat > conftest.$ac_ext <<EOF --#line 1780 "configure" -+#line 1821 "configure" - #include "confdefs.h" - #include <ctype.h> - #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -1787,7 +1828,7 @@ - exit (0); } - - EOF --if { (eval echo configure:1791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:1832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -1815,12 +1856,12 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 --echo "configure:1819: checking for $ac_hdr that defines DIR" >&5 -+echo "configure:1860: checking for $ac_hdr that defines DIR" >&5 - if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1824 "configure" -+#line 1865 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <$ac_hdr> -@@ -1828,7 +1869,7 @@ - DIR *dirp = 0; - ; return 0; } - EOF --if { (eval echo configure:1832: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_dirent_$ac_safe=yes" - else -@@ -1853,7 +1894,7 @@ - # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. - if test $ac_header_dirent = dirent.h; then - echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 --echo "configure:1857: checking for opendir in -ldir" >&5 -+echo "configure:1898: checking for opendir in -ldir" >&5 - ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1861,7 +1902,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldir $LIBS" - cat > conftest.$ac_ext <<EOF --#line 1865 "configure" -+#line 1906 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -1872,7 +1913,7 @@ - opendir() - ; return 0; } - EOF --if { (eval echo configure:1876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -1894,7 +1935,7 @@ - - else - echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 --echo "configure:1898: checking for opendir in -lx" >&5 -+echo "configure:1939: checking for opendir in -lx" >&5 - ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1902,7 +1943,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lx $LIBS" - cat > conftest.$ac_ext <<EOF --#line 1906 "configure" -+#line 1947 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -1913,7 +1954,7 @@ - opendir() - ; return 0; } - EOF --if { (eval echo configure:1917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -1936,12 +1977,12 @@ - fi - - echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 --echo "configure:1940: checking whether time.h and sys/time.h may both be included" >&5 -+echo "configure:1981: checking whether time.h and sys/time.h may both be included" >&5 - if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1945 "configure" -+#line 1986 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/time.h> -@@ -1950,7 +1991,7 @@ - struct tm *tp; - ; return 0; } - EOF --if { (eval echo configure:1954: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1995: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_header_time=yes - else -@@ -1971,12 +2012,12 @@ - fi - - echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 --echo "configure:1975: checking for sys/wait.h that is POSIX.1 compatible" >&5 -+echo "configure:2016: checking for sys/wait.h that is POSIX.1 compatible" >&5 - if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1980 "configure" -+#line 2021 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/wait.h> -@@ -1992,7 +2033,7 @@ - s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; - ; return 0; } - EOF --if { (eval echo configure:1996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_header_sys_wait_h=yes - else -@@ -2016,17 +2057,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2020: checking for $ac_hdr" >&5 -+echo "configure:2061: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2025 "configure" -+#line 2066 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2071: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2056,17 +2097,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2060: checking for $ac_hdr" >&5 -+echo "configure:2101: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2065 "configure" -+#line 2106 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2111: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2096,17 +2137,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2100: checking for $ac_hdr" >&5 -+echo "configure:2141: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2105 "configure" -+#line 2146 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2110: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2151: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2136,17 +2177,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2140: checking for $ac_hdr" >&5 -+echo "configure:2181: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2145 "configure" -+#line 2186 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2150: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2191: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2176,17 +2217,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2180: checking for $ac_hdr" >&5 -+echo "configure:2221: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2185 "configure" -+#line 2226 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2190: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2231: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2216,17 +2257,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2220: checking for $ac_hdr" >&5 -+echo "configure:2261: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2225 "configure" -+#line 2266 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2271: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2256,17 +2297,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2260: checking for $ac_hdr" >&5 -+echo "configure:2301: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2265 "configure" -+#line 2306 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2270: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2296,17 +2337,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2300: checking for $ac_hdr" >&5 -+echo "configure:2341: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2305 "configure" -+#line 2346 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2310: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2351: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2340,14 +2381,14 @@ - case "$host_os" in - *hpux*) - cat > conftest.$ac_ext <<EOF --#line 2344 "configure" -+#line 2385 "configure" - #include "confdefs.h" - #include <shadow.h> - int main() { - struct spwd testme - ; return 0; } - EOF --if { (eval echo configure:2351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2392: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_header_shadow_h=yes - else -@@ -2369,17 +2410,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2373: checking for $ac_hdr" >&5 -+echo "configure:2414: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2378 "configure" -+#line 2419 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2424: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2409,17 +2450,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2413: checking for $ac_hdr" >&5 -+echo "configure:2454: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2418 "configure" -+#line 2459 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2464: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2449,17 +2490,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2453: checking for $ac_hdr" >&5 -+echo "configure:2494: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2458 "configure" -+#line 2499 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2463: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2504: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2489,17 +2530,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2493: checking for $ac_hdr" >&5 -+echo "configure:2534: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2498 "configure" -+#line 2539 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2503: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2544: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2529,17 +2570,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2533: checking for $ac_hdr" >&5 -+echo "configure:2574: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2538 "configure" -+#line 2579 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2543: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2584: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2571,17 +2612,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2575: checking for $ac_hdr" >&5 -+echo "configure:2616: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2580 "configure" -+#line 2621 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2585: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2626: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2613,17 +2654,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2617: checking for $ac_hdr" >&5 -+echo "configure:2658: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2622 "configure" -+#line 2663 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2627: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2655,17 +2696,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2659: checking for $ac_hdr" >&5 -+echo "configure:2700: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2664 "configure" -+#line 2705 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2669: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2693,7 +2734,7 @@ - - - echo $ac_n "checking size of int""... $ac_c" 1>&6 --echo "configure:2697: checking size of int" >&5 -+echo "configure:2738: checking size of int" >&5 - if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2701,18 +2742,19 @@ - ac_cv_sizeof_int=cross - else - cat > conftest.$ac_ext <<EOF --#line 2705 "configure" -+#line 2746 "configure" - #include "confdefs.h" - #include <stdio.h> --int main() -+#include <sys/types.h> -+main() - { - FILE *f=fopen("conftestval", "w"); -- if (!f) return(1); -+ if (!f) exit(1); - fprintf(f, "%d\n", sizeof(int)); -- return(0); -+ exit(0); - } - EOF --if { (eval echo configure:2716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:2758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_sizeof_int=`cat conftestval` - else -@@ -2732,7 +2774,7 @@ - - - echo $ac_n "checking size of long""... $ac_c" 1>&6 --echo "configure:2736: checking size of long" >&5 -+echo "configure:2778: checking size of long" >&5 - if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2740,18 +2782,19 @@ - ac_cv_sizeof_long=cross - else - cat > conftest.$ac_ext <<EOF --#line 2744 "configure" -+#line 2786 "configure" - #include "confdefs.h" - #include <stdio.h> --int main() -+#include <sys/types.h> -+main() - { - FILE *f=fopen("conftestval", "w"); -- if (!f) return(1); -+ if (!f) exit(1); - fprintf(f, "%d\n", sizeof(long)); -- return(0); -+ exit(0); - } - EOF --if { (eval echo configure:2755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:2798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_sizeof_long=`cat conftestval` - else -@@ -2771,7 +2814,7 @@ - - - echo $ac_n "checking size of short""... $ac_c" 1>&6 --echo "configure:2775: checking size of short" >&5 -+echo "configure:2818: checking size of short" >&5 - if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2779,18 +2822,19 @@ - ac_cv_sizeof_short=cross - else - cat > conftest.$ac_ext <<EOF --#line 2783 "configure" -+#line 2826 "configure" - #include "confdefs.h" - #include <stdio.h> --int main() -+#include <sys/types.h> -+main() - { - FILE *f=fopen("conftestval", "w"); -- if (!f) return(1); -+ if (!f) exit(1); - fprintf(f, "%d\n", sizeof(short)); -- return(0); -+ exit(0); - } - EOF --if { (eval echo configure:2794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:2838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_sizeof_short=`cat conftestval` - else -@@ -2811,12 +2855,12 @@ - - - echo $ac_n "checking for working const""... $ac_c" 1>&6 --echo "configure:2815: checking for working const" >&5 -+echo "configure:2859: checking for working const" >&5 - if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2820 "configure" -+#line 2864 "configure" - #include "confdefs.h" - - int main() { -@@ -2865,7 +2909,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:2869: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2913: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_const=yes - else -@@ -2886,21 +2930,21 @@ - fi - - echo $ac_n "checking for inline""... $ac_c" 1>&6 --echo "configure:2890: checking for inline" >&5 -+echo "configure:2934: checking for inline" >&5 - if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_cv_c_inline=no - for ac_kw in inline __inline__ __inline; do - cat > conftest.$ac_ext <<EOF --#line 2897 "configure" -+#line 2941 "configure" - #include "confdefs.h" - - int main() { - } $ac_kw foo() { - ; return 0; } - EOF --if { (eval echo configure:2904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_inline=$ac_kw; break - else -@@ -2926,14 +2970,14 @@ - esac - - echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 --echo "configure:2930: checking whether byte ordering is bigendian" >&5 -+echo "configure:2974: checking whether byte ordering is bigendian" >&5 - if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_cv_c_bigendian=unknown - # See if sys/param.h defines the BYTE_ORDER macro. - cat > conftest.$ac_ext <<EOF --#line 2937 "configure" -+#line 2981 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/param.h> -@@ -2944,11 +2988,11 @@ - #endif - ; return 0; } - EOF --if { (eval echo configure:2948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - # It does; now see whether it defined to BIG_ENDIAN or not. - cat > conftest.$ac_ext <<EOF --#line 2952 "configure" -+#line 2996 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/param.h> -@@ -2959,7 +3003,7 @@ - #endif - ; return 0; } - EOF --if { (eval echo configure:2963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3007: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_bigendian=yes - else -@@ -2979,7 +3023,7 @@ - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } - else - cat > conftest.$ac_ext <<EOF --#line 2983 "configure" -+#line 3027 "configure" - #include "confdefs.h" - main () { - /* Are we little or big endian? From Harbison&Steele. */ -@@ -2992,7 +3036,7 @@ - exit (u.c[sizeof (long) - 1] == 1); - } - EOF --if { (eval echo configure:2996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:3040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_c_bigendian=no - else -@@ -3016,14 +3060,14 @@ - fi - - echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 --echo "configure:3020: checking whether char is unsigned" >&5 -+echo "configure:3064: checking whether char is unsigned" >&5 - if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - if test "$GCC" = yes; then - # GCC predefines this symbol on systems where it applies. - cat > conftest.$ac_ext <<EOF --#line 3027 "configure" -+#line 3071 "configure" - #include "confdefs.h" - #ifdef __CHAR_UNSIGNED__ - yes -@@ -3045,7 +3089,7 @@ - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } - else - cat > conftest.$ac_ext <<EOF --#line 3049 "configure" -+#line 3093 "configure" - #include "confdefs.h" - /* volatile prevents gcc2 from optimizing the test away on sparcs. */ - #if !defined(__STDC__) || __STDC__ != 1 -@@ -3055,7 +3099,7 @@ - volatile char c = 255; exit(c < 0); - } - EOF --if { (eval echo configure:3059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:3103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_c_char_unsigned=yes - else -@@ -3080,12 +3124,12 @@ - - - echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 --echo "configure:3084: checking return type of signal handlers" >&5 -+echo "configure:3128: checking return type of signal handlers" >&5 - if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3089 "configure" -+#line 3133 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <signal.h> -@@ -3102,7 +3146,7 @@ - int i; - ; return 0; } - EOF --if { (eval echo configure:3106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_type_signal=void - else -@@ -3121,12 +3165,12 @@ - - - echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 --echo "configure:3125: checking for uid_t in sys/types.h" >&5 -+echo "configure:3169: checking for uid_t in sys/types.h" >&5 - if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3130 "configure" -+#line 3174 "configure" - #include "confdefs.h" - #include <sys/types.h> - EOF -@@ -3155,12 +3199,12 @@ - fi - - echo $ac_n "checking for mode_t""... $ac_c" 1>&6 --echo "configure:3159: checking for mode_t" >&5 -+echo "configure:3203: checking for mode_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3164 "configure" -+#line 3208 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -3188,12 +3232,12 @@ - fi - - echo $ac_n "checking for off_t""... $ac_c" 1>&6 --echo "configure:3192: checking for off_t" >&5 -+echo "configure:3236: checking for off_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3197 "configure" -+#line 3241 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -3221,12 +3265,12 @@ - fi - - echo $ac_n "checking for size_t""... $ac_c" 1>&6 --echo "configure:3225: checking for size_t" >&5 -+echo "configure:3269: checking for size_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3230 "configure" -+#line 3274 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -3254,12 +3298,12 @@ - fi - - echo $ac_n "checking for pid_t""... $ac_c" 1>&6 --echo "configure:3258: checking for pid_t" >&5 -+echo "configure:3302: checking for pid_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3263 "configure" -+#line 3307 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -3287,12 +3331,12 @@ - fi - - echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 --echo "configure:3291: checking for st_rdev in struct stat" >&5 -+echo "configure:3335: checking for st_rdev in struct stat" >&5 - if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3296 "configure" -+#line 3340 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/stat.h> -@@ -3300,7 +3344,7 @@ - struct stat s; s.st_rdev; - ; return 0; } - EOF --if { (eval echo configure:3304: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_struct_st_rdev=yes - else -@@ -3321,12 +3365,12 @@ - fi - - echo $ac_n "checking for d_off in dirent""... $ac_c" 1>&6 --echo "configure:3325: checking for d_off in dirent" >&5 -+echo "configure:3369: checking for d_off in dirent" >&5 - if eval "test \"`echo '$''{'ac_cv_dirent_d_off'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3330 "configure" -+#line 3374 "configure" - #include "confdefs.h" - - #include <unistd.h> -@@ -3336,7 +3380,7 @@ - struct dirent d; d.d_off; - ; return 0; } - EOF --if { (eval echo configure:3340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3384: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_dirent_d_off=yes - else -@@ -3357,12 +3401,12 @@ - fi - - echo $ac_n "checking for ino_t""... $ac_c" 1>&6 --echo "configure:3361: checking for ino_t" >&5 -+echo "configure:3405: checking for ino_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_ino_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3366 "configure" -+#line 3410 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -3390,12 +3434,12 @@ - fi - - echo $ac_n "checking for loff_t""... $ac_c" 1>&6 --echo "configure:3394: checking for loff_t" >&5 -+echo "configure:3438: checking for loff_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_loff_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3399 "configure" -+#line 3443 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -3423,12 +3467,12 @@ - fi - - echo $ac_n "checking for offset_t""... $ac_c" 1>&6 --echo "configure:3427: checking for offset_t" >&5 -+echo "configure:3471: checking for offset_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_offset_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3432 "configure" -+#line 3476 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -3456,12 +3500,12 @@ - fi - - echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 --echo "configure:3460: checking for ssize_t" >&5 -+echo "configure:3504: checking for ssize_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3465 "configure" -+#line 3509 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -3489,12 +3533,12 @@ - fi - - echo $ac_n "checking for wchar_t""... $ac_c" 1>&6 --echo "configure:3493: checking for wchar_t" >&5 -+echo "configure:3537: checking for wchar_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_wchar_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3498 "configure" -+#line 3542 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -3526,7 +3570,7 @@ - # for cups support we need libcups, and a handful of header files - - echo $ac_n "checking for httpConnect in -lcups""... $ac_c" 1>&6 --echo "configure:3530: checking for httpConnect in -lcups" >&5 -+echo "configure:3574: checking for httpConnect in -lcups" >&5 - ac_lib_var=`echo cups'_'httpConnect | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3534,7 +3578,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lcups $LIBS" - cat > conftest.$ac_ext <<EOF --#line 3538 "configure" -+#line 3582 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -3545,7 +3589,7 @@ - httpConnect() - ; return 0; } - EOF --if { (eval echo configure:3549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -3580,17 +3624,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:3584: checking for $ac_hdr" >&5 -+echo "configure:3628: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3589 "configure" -+#line 3633 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3594: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3638: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -3629,7 +3673,7 @@ - ############################################ - # we need libdl for PAM and the new VFS code - echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 --echo "configure:3633: checking for dlopen in -ldl" >&5 -+echo "configure:3677: checking for dlopen in -ldl" >&5 - ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3637,7 +3681,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldl $LIBS" - cat > conftest.$ac_ext <<EOF --#line 3641 "configure" -+#line 3685 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -3648,7 +3692,7 @@ - dlopen() - ; return 0; } - EOF --if { (eval echo configure:3652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -3676,13 +3720,13 @@ - ############################################ - # check if the compiler can do immediate structures - echo $ac_n "checking for immediate structures""... $ac_c" 1>&6 --echo "configure:3680: checking for immediate structures" >&5 -+echo "configure:3724: checking for immediate structures" >&5 - if eval "test \"`echo '$''{'samba_cv_immediate_structures'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 3686 "configure" -+#line 3730 "configure" - #include "confdefs.h" - - #include <stdio.h> -@@ -3694,7 +3738,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:3698: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3742: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_immediate_structures=yes - else -@@ -3717,13 +3761,13 @@ - ############################################ - # check for unix domain sockets - echo $ac_n "checking for unix domain sockets""... $ac_c" 1>&6 --echo "configure:3721: checking for unix domain sockets" >&5 -+echo "configure:3765: checking for unix domain sockets" >&5 - if eval "test \"`echo '$''{'samba_cv_unixsocket'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 3727 "configure" -+#line 3771 "configure" - #include "confdefs.h" - - #include <sys/types.h> -@@ -3738,7 +3782,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:3742: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_unixsocket=yes - else -@@ -3759,13 +3803,13 @@ - fi - - echo $ac_n "checking for socklen_t type""... $ac_c" 1>&6 --echo "configure:3763: checking for socklen_t type" >&5 -+echo "configure:3807: checking for socklen_t type" >&5 - if eval "test \"`echo '$''{'samba_cv_socklen_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 3769 "configure" -+#line 3813 "configure" - #include "confdefs.h" - - #include <sys/types.h> -@@ -3778,7 +3822,7 @@ - socklen_t i = 0 - ; return 0; } - EOF --if { (eval echo configure:3782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3826: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_socklen_t=yes - else -@@ -3799,13 +3843,13 @@ - fi - - echo $ac_n "checking for sig_atomic_t type""... $ac_c" 1>&6 --echo "configure:3803: checking for sig_atomic_t type" >&5 -+echo "configure:3847: checking for sig_atomic_t type" >&5 - if eval "test \"`echo '$''{'samba_cv_sig_atomic_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 3809 "configure" -+#line 3853 "configure" - #include "confdefs.h" - - #include <sys/types.h> -@@ -3818,7 +3862,7 @@ - sig_atomic_t i = 0 - ; return 0; } - EOF --if { (eval echo configure:3822: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3866: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_sig_atomic_t=yes - else -@@ -3841,20 +3885,20 @@ - # stupid headers have the functions but no declaration. grrrr. - - echo $ac_n "checking for errno declaration""... $ac_c" 1>&6 --echo "configure:3845: checking for errno declaration" >&5 -+echo "configure:3889: checking for errno declaration" >&5 - if eval "test \"`echo '$''{'ac_cv_have_errno_decl'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 3851 "configure" -+#line 3895 "configure" - #include "confdefs.h" - #include <errno.h> - int main() { - int i = (int)errno - ; return 0; } - EOF --if { (eval echo configure:3858: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_errno_decl=yes - else -@@ -3876,20 +3920,20 @@ - - - echo $ac_n "checking for setresuid declaration""... $ac_c" 1>&6 --echo "configure:3880: checking for setresuid declaration" >&5 -+echo "configure:3924: checking for setresuid declaration" >&5 - if eval "test \"`echo '$''{'ac_cv_have_setresuid_decl'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 3886 "configure" -+#line 3930 "configure" - #include "confdefs.h" - #include <unistd.h> - int main() { - int i = (int)setresuid - ; return 0; } - EOF --if { (eval echo configure:3893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_setresuid_decl=yes - else -@@ -3911,20 +3955,20 @@ - - - echo $ac_n "checking for setresgid declaration""... $ac_c" 1>&6 --echo "configure:3915: checking for setresgid declaration" >&5 -+echo "configure:3959: checking for setresgid declaration" >&5 - if eval "test \"`echo '$''{'ac_cv_have_setresgid_decl'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 3921 "configure" -+#line 3965 "configure" - #include "confdefs.h" - #include <unistd.h> - int main() { - int i = (int)setresgid - ; return 0; } - EOF --if { (eval echo configure:3928: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_setresgid_decl=yes - else -@@ -3946,20 +3990,20 @@ - - - echo $ac_n "checking for asprintf declaration""... $ac_c" 1>&6 --echo "configure:3950: checking for asprintf declaration" >&5 -+echo "configure:3994: checking for asprintf declaration" >&5 - if eval "test \"`echo '$''{'ac_cv_have_asprintf_decl'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 3956 "configure" -+#line 4000 "configure" - #include "confdefs.h" - #include <stdio.h> - int main() { - int i = (int)asprintf - ; return 0; } - EOF --if { (eval echo configure:3963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:4007: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_asprintf_decl=yes - else -@@ -3981,20 +4025,20 @@ - - - echo $ac_n "checking for vasprintf declaration""... $ac_c" 1>&6 --echo "configure:3985: checking for vasprintf declaration" >&5 -+echo "configure:4029: checking for vasprintf declaration" >&5 - if eval "test \"`echo '$''{'ac_cv_have_vasprintf_decl'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 3991 "configure" -+#line 4035 "configure" - #include "confdefs.h" - #include <stdio.h> - int main() { - int i = (int)vasprintf - ; return 0; } - EOF --if { (eval echo configure:3998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:4042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_vasprintf_decl=yes - else -@@ -4016,20 +4060,20 @@ - - - echo $ac_n "checking for vsnprintf declaration""... $ac_c" 1>&6 --echo "configure:4020: checking for vsnprintf declaration" >&5 -+echo "configure:4064: checking for vsnprintf declaration" >&5 - if eval "test \"`echo '$''{'ac_cv_have_vsnprintf_decl'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 4026 "configure" -+#line 4070 "configure" - #include "confdefs.h" - #include <stdio.h> - int main() { - int i = (int)vsnprintf - ; return 0; } - EOF --if { (eval echo configure:4033: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:4077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_vsnprintf_decl=yes - else -@@ -4051,20 +4095,20 @@ - - - echo $ac_n "checking for snprintf declaration""... $ac_c" 1>&6 --echo "configure:4055: checking for snprintf declaration" >&5 -+echo "configure:4099: checking for snprintf declaration" >&5 - if eval "test \"`echo '$''{'ac_cv_have_snprintf_decl'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 4061 "configure" -+#line 4105 "configure" - #include "confdefs.h" - #include <stdio.h> - int main() { - int i = (int)snprintf - ; return 0; } - EOF --if { (eval echo configure:4068: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:4112: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_snprintf_decl=yes - else -@@ -4088,7 +4132,7 @@ - # and glibc has setresuid under linux but the function does - # nothing until kernel 2.1.44! very dumb. - echo $ac_n "checking for real setresuid""... $ac_c" 1>&6 --echo "configure:4092: checking for real setresuid" >&5 -+echo "configure:4136: checking for real setresuid" >&5 - if eval "test \"`echo '$''{'samba_cv_have_setresuid'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4097,12 +4141,12 @@ - samba_cv_have_setresuid=cross - else - cat > conftest.$ac_ext <<EOF --#line 4101 "configure" -+#line 4145 "configure" - #include "confdefs.h" - #include <errno.h> - main() { setresuid(1,1,1); setresuid(2,2,2); exit(errno==EPERM?0:1);} - EOF --if { (eval echo configure:4106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:4150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_have_setresuid=yes - else -@@ -4127,7 +4171,7 @@ - # Do the same check for setresguid... - # - echo $ac_n "checking for real setresgid""... $ac_c" 1>&6 --echo "configure:4131: checking for real setresgid" >&5 -+echo "configure:4175: checking for real setresgid" >&5 - if eval "test \"`echo '$''{'samba_cv_have_setresgid'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4136,13 +4180,13 @@ - samba_cv_have_setresgid=cross - else - cat > conftest.$ac_ext <<EOF --#line 4140 "configure" -+#line 4184 "configure" - #include "confdefs.h" - #include <unistd.h> - #include <errno.h> - main() { errno = 0; setresgid(1,1,1); exit(errno != 0 ? (errno==EPERM ? 0 : 1) : 0);} - EOF --if { (eval echo configure:4146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:4190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_have_setresgid=yes - else -@@ -4165,7 +4209,7 @@ - fi - - echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 --echo "configure:4169: checking for 8-bit clean memcmp" >&5 -+echo "configure:4213: checking for 8-bit clean memcmp" >&5 - if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4173,7 +4217,7 @@ - ac_cv_func_memcmp_clean=no - else - cat > conftest.$ac_ext <<EOF --#line 4177 "configure" -+#line 4221 "configure" - #include "confdefs.h" - - main() -@@ -4183,7 +4227,7 @@ - } - - EOF --if { (eval echo configure:4187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:4231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_func_memcmp_clean=yes - else -@@ -4207,7 +4251,7 @@ - - # test for where we get readline() from - echo $ac_n "checking whether to use readline""... $ac_c" 1>&6 --echo "configure:4211: checking whether to use readline" >&5 -+echo "configure:4255: checking whether to use readline" >&5 - # Check whether --with-readline or --without-readline was given. - if test "${with_readline+set}" = set; then - withval="$with_readline" -@@ -4219,17 +4263,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:4223: checking for $ac_hdr" >&5 -+echo "configure:4267: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 4228 "configure" -+#line 4272 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4233: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4277: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -4259,17 +4303,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:4263: checking for $ac_hdr" >&5 -+echo "configure:4307: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 4268 "configure" -+#line 4312 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4273: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4317: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -4300,17 +4344,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:4304: checking for $ac_hdr" >&5 -+echo "configure:4348: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 4309 "configure" -+#line 4353 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4314: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4358: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -4333,7 +4377,7 @@ - - for termlib in ncurses curses termcap terminfo termlib; do - echo $ac_n "checking for tgetent in -l${termlib}""... $ac_c" 1>&6 --echo "configure:4337: checking for tgetent in -l${termlib}" >&5 -+echo "configure:4381: checking for tgetent in -l${termlib}" >&5 - ac_lib_var=`echo ${termlib}'_'tgetent | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4341,7 +4385,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-l${termlib} $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4345 "configure" -+#line 4389 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -4352,7 +4396,7 @@ - tgetent() - ; return 0; } - EOF --if { (eval echo configure:4356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4374,7 +4418,7 @@ - - done - echo $ac_n "checking for rl_callback_handler_install in -lreadline""... $ac_c" 1>&6 --echo "configure:4378: checking for rl_callback_handler_install in -lreadline" >&5 -+echo "configure:4422: checking for rl_callback_handler_install in -lreadline" >&5 - ac_lib_var=`echo readline'_'rl_callback_handler_install | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4382,7 +4426,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lreadline $TERMLIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4386 "configure" -+#line 4430 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -4393,7 +4437,7 @@ - rl_callback_handler_install() - ; return 0; } - EOF --if { (eval echo configure:4397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4444,17 +4488,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:4448: checking for $ac_hdr" >&5 -+echo "configure:4492: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 4453 "configure" -+#line 4497 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4458: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4502: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -4484,17 +4528,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:4488: checking for $ac_hdr" >&5 -+echo "configure:4532: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 4493 "configure" -+#line 4537 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4498: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4542: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -4525,17 +4569,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:4529: checking for $ac_hdr" >&5 -+echo "configure:4573: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 4534 "configure" -+#line 4578 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4539: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4583: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -4558,7 +4602,7 @@ - - for termlib in ncurses curses termcap terminfo termlib; do - echo $ac_n "checking for tgetent in -l${termlib}""... $ac_c" 1>&6 --echo "configure:4562: checking for tgetent in -l${termlib}" >&5 -+echo "configure:4606: checking for tgetent in -l${termlib}" >&5 - ac_lib_var=`echo ${termlib}'_'tgetent | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4566,7 +4610,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-l${termlib} $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4570 "configure" -+#line 4614 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -4577,7 +4621,7 @@ - tgetent() - ; return 0; } - EOF --if { (eval echo configure:4581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4599,7 +4643,7 @@ - - done - echo $ac_n "checking for rl_callback_handler_install in -lreadline""... $ac_c" 1>&6 --echo "configure:4603: checking for rl_callback_handler_install in -lreadline" >&5 -+echo "configure:4647: checking for rl_callback_handler_install in -lreadline" >&5 - ac_lib_var=`echo readline'_'rl_callback_handler_install | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4607,7 +4651,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lreadline $TERMLIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4611 "configure" -+#line 4655 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -4618,7 +4662,7 @@ - rl_callback_handler_install() - ; return 0; } - EOF --if { (eval echo configure:4622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4673,12 +4717,12 @@ - for ac_func in connect - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:4677: checking for $ac_func" >&5 -+echo "configure:4721: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 4682 "configure" -+#line 4726 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -4701,7 +4745,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:4705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -4729,7 +4773,7 @@ - case "$LIBS" in - *-lnsl*) ;; - *) echo $ac_n "checking for printf in -lnsl_s""... $ac_c" 1>&6 --echo "configure:4733: checking for printf in -lnsl_s" >&5 -+echo "configure:4777: checking for printf in -lnsl_s" >&5 - ac_lib_var=`echo nsl_s'_'printf | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4737,7 +4781,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lnsl_s $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4741 "configure" -+#line 4785 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -4748,7 +4792,7 @@ - printf() - ; return 0; } - EOF --if { (eval echo configure:4752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4779,7 +4823,7 @@ - case "$LIBS" in - *-lnsl*) ;; - *) echo $ac_n "checking for printf in -lnsl""... $ac_c" 1>&6 --echo "configure:4783: checking for printf in -lnsl" >&5 -+echo "configure:4827: checking for printf in -lnsl" >&5 - ac_lib_var=`echo nsl'_'printf | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4787,7 +4831,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lnsl $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4791 "configure" -+#line 4835 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -4798,7 +4842,7 @@ - printf() - ; return 0; } - EOF --if { (eval echo configure:4802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4829,7 +4873,7 @@ - case "$LIBS" in - *-lsocket*) ;; - *) echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 --echo "configure:4833: checking for connect in -lsocket" >&5 -+echo "configure:4877: checking for connect in -lsocket" >&5 - ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4837,7 +4881,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lsocket $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4841 "configure" -+#line 4885 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -4848,7 +4892,7 @@ - connect() - ; return 0; } - EOF --if { (eval echo configure:4852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4879,7 +4923,7 @@ - case "$LIBS" in - *-linet*) ;; - *) echo $ac_n "checking for connect in -linet""... $ac_c" 1>&6 --echo "configure:4883: checking for connect in -linet" >&5 -+echo "configure:4927: checking for connect in -linet" >&5 - ac_lib_var=`echo inet'_'connect | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4887,7 +4931,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-linet $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4891 "configure" -+#line 4935 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -4898,7 +4942,7 @@ - connect() - ; return 0; } - EOF --if { (eval echo configure:4902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4942,12 +4986,12 @@ - for ac_func in yp_get_default_domain - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:4946: checking for $ac_func" >&5 -+echo "configure:4990: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 4951 "configure" -+#line 4995 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -4970,7 +5014,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:4974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -4996,7 +5040,7 @@ - - if test x"$ac_cv_func_yp_get_default_domain" = x"no"; then - echo $ac_n "checking for yp_get_default_domain in -lnsl""... $ac_c" 1>&6 --echo "configure:5000: checking for yp_get_default_domain in -lnsl" >&5 -+echo "configure:5044: checking for yp_get_default_domain in -lnsl" >&5 - ac_lib_var=`echo nsl'_'yp_get_default_domain | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5004,7 +5048,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lnsl $LIBS" - cat > conftest.$ac_ext <<EOF --#line 5008 "configure" -+#line 5052 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -5015,7 +5059,7 @@ - yp_get_default_domain() - ; return 0; } - EOF --if { (eval echo configure:5019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -5045,12 +5089,12 @@ - for ac_func in execl - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5049: checking for $ac_func" >&5 -+echo "configure:5093: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 5054 "configure" -+#line 5098 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -5073,7 +5117,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:5077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -5106,12 +5150,12 @@ - for ac_func in waitpid getcwd strdup strtoul strerror chown fchown chmod fchmod chroot link - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5110: checking for $ac_func" >&5 -+echo "configure:5154: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 5115 "configure" -+#line 5159 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -5134,7 +5178,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:5138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -5161,12 +5205,12 @@ - for ac_func in fstat strchr utime utimes getrlimit fsync bzero memset setpgid mknod mknod64 - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5165: checking for $ac_func" >&5 -+echo "configure:5209: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 5170 "configure" -+#line 5214 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -5189,7 +5233,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:5193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -5216,12 +5260,12 @@ - for ac_func in memmove vsnprintf snprintf asprintf vasprintf setsid glob strpbrk pipe crypt16 getauthuid - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5220: checking for $ac_func" >&5 -+echo "configure:5264: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 5225 "configure" -+#line 5269 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -5244,7 +5288,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:5248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -5271,12 +5315,12 @@ - for ac_func in strftime sigprocmask sigblock sigaction sigset innetgr setnetgrent getnetgrent endnetgrent - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5275: checking for $ac_func" >&5 -+echo "configure:5319: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 5280 "configure" -+#line 5324 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -5299,7 +5343,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:5303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -5326,12 +5370,12 @@ - for ac_func in initgroups select poll rdchk getgrnam getgrent pathconf realpath - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5330: checking for $ac_func" >&5 -+echo "configure:5374: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 5335 "configure" -+#line 5379 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -5354,7 +5398,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:5358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -5381,12 +5425,12 @@ - for ac_func in setpriv setgidx setuidx setgroups sysconf mktime rename ftruncate stat64 fstat64 - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5385: checking for $ac_func" >&5 -+echo "configure:5429: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 5390 "configure" -+#line 5434 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -5409,7 +5453,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:5413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -5436,12 +5480,12 @@ - for ac_func in lstat64 fopen64 atexit grantpt dup2 lseek64 ftruncate64 readdir64 - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5440: checking for $ac_func" >&5 -+echo "configure:5484: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 5445 "configure" -+#line 5489 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -5464,7 +5508,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:5468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -5491,12 +5535,12 @@ - for ac_func in fseek64 fseeko64 ftell64 ftello64 setluid getpwanam setlinebuf - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5495: checking for $ac_func" >&5 -+echo "configure:5539: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 5500 "configure" -+#line 5544 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -5519,7 +5563,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:5523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -5546,12 +5590,12 @@ - for ac_func in srandom random srand rand setenv usleep strcasecmp fcvt fcvtl symlink readlink - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5550: checking for $ac_func" >&5 -+echo "configure:5594: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 5555 "configure" -+#line 5599 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -5574,7 +5618,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:5578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -5601,12 +5645,12 @@ - for ac_func in syslog vsyslog - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5605: checking for $ac_func" >&5 -+echo "configure:5649: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 5610 "configure" -+#line 5654 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -5629,7 +5673,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:5633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -5658,12 +5702,12 @@ - for ac_func in syscall - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5662: checking for $ac_func" >&5 -+echo "configure:5706: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 5667 "configure" -+#line 5711 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -5686,7 +5730,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:5690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -5714,12 +5758,12 @@ - for ac_func in _dup _dup2 _opendir _readdir _seekdir _telldir _closedir - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5718: checking for $ac_func" >&5 -+echo "configure:5762: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 5723 "configure" -+#line 5767 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -5742,7 +5786,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:5746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -5769,12 +5813,12 @@ - for ac_func in __dup __dup2 __opendir __readdir __seekdir __telldir __closedir - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5773: checking for $ac_func" >&5 -+echo "configure:5817: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 5778 "configure" -+#line 5822 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -5797,7 +5841,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:5801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -5824,12 +5868,12 @@ - for ac_func in __getcwd _getcwd - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5828: checking for $ac_func" >&5 -+echo "configure:5872: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 5833 "configure" -+#line 5877 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -5852,7 +5896,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:5856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -5879,12 +5923,12 @@ - for ac_func in __xstat __fxstat __lxstat - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5883: checking for $ac_func" >&5 -+echo "configure:5927: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 5888 "configure" -+#line 5932 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -5907,7 +5951,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:5911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -5934,12 +5978,12 @@ - for ac_func in _stat _lstat _fstat __stat __lstat __fstat - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5938: checking for $ac_func" >&5 -+echo "configure:5982: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 5943 "configure" -+#line 5987 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -5962,7 +6006,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:5966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -5989,12 +6033,12 @@ - for ac_func in _acl __acl _facl __facl _open __open _chdir __chdir - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5993: checking for $ac_func" >&5 -+echo "configure:6037: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 5998 "configure" -+#line 6042 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -6017,7 +6061,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:6021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -6044,12 +6088,12 @@ - for ac_func in _close __close _fchdir __fchdir _fcntl __fcntl - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:6048: checking for $ac_func" >&5 -+echo "configure:6092: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6053 "configure" -+#line 6097 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -6072,7 +6116,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:6076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -6099,12 +6143,12 @@ - for ac_func in getdents _getdents __getdents _lseek __lseek _read __read - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:6103: checking for $ac_func" >&5 -+echo "configure:6147: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6108 "configure" -+#line 6152 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -6127,7 +6171,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:6131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -6154,12 +6198,12 @@ - for ac_func in _write __write _fork __fork - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:6158: checking for $ac_func" >&5 -+echo "configure:6202: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6163 "configure" -+#line 6207 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -6182,7 +6226,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:6186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -6209,12 +6253,12 @@ - for ac_func in _stat64 __stat64 _fstat64 __fstat64 _lstat64 __lstat64 - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:6213: checking for $ac_func" >&5 -+echo "configure:6257: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6218 "configure" -+#line 6262 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -6237,7 +6281,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:6241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -6264,12 +6308,12 @@ - for ac_func in __sys_llseek llseek _llseek __llseek readdir64 _readdir64 __readdir64 - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:6268: checking for $ac_func" >&5 -+echo "configure:6312: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6273 "configure" -+#line 6317 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -6292,7 +6336,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:6296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -6319,12 +6363,12 @@ - for ac_func in pread _pread __pread pread64 _pread64 __pread64 - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:6323: checking for $ac_func" >&5 -+echo "configure:6367: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6328 "configure" -+#line 6372 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -6347,7 +6391,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:6351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -6374,12 +6418,12 @@ - for ac_func in pwrite _pwrite __pwrite pwrite64 _pwrite64 __pwrite64 - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:6378: checking for $ac_func" >&5 -+echo "configure:6422: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6383 "configure" -+#line 6427 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -6402,7 +6446,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:6406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -6429,12 +6473,12 @@ - for ac_func in open64 _open64 __open64 creat64 - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:6433: checking for $ac_func" >&5 -+echo "configure:6477: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6438 "configure" -+#line 6482 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -6457,7 +6501,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:6461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -6488,9 +6532,9 @@ - - if test x$ac_cv_func_stat64 = xno ; then - echo $ac_n "checking for stat64 in <sys/stat.h>""... $ac_c" 1>&6 --echo "configure:6492: checking for stat64 in <sys/stat.h>" >&5 -+echo "configure:6536: checking for stat64 in <sys/stat.h>" >&5 - cat > conftest.$ac_ext <<EOF --#line 6494 "configure" -+#line 6538 "configure" - #include "confdefs.h" - - #if defined(HAVE_UNISTD_H) -@@ -6502,7 +6546,7 @@ - struct stat64 st64; exit(stat64(".",&st64)); - ; return 0; } - EOF --if { (eval echo configure:6506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_func_stat64=yes - else -@@ -6521,9 +6565,9 @@ - - if test x$ac_cv_func_lstat64 = xno ; then - echo $ac_n "checking for lstat64 in <sys/stat.h>""... $ac_c" 1>&6 --echo "configure:6525: checking for lstat64 in <sys/stat.h>" >&5 -+echo "configure:6569: checking for lstat64 in <sys/stat.h>" >&5 - cat > conftest.$ac_ext <<EOF --#line 6527 "configure" -+#line 6571 "configure" - #include "confdefs.h" - - #if defined(HAVE_UNISTD_H) -@@ -6535,7 +6579,7 @@ - struct stat64 st64; exit(lstat64(".",&st64)); - ; return 0; } - EOF --if { (eval echo configure:6539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_func_lstat64=yes - else -@@ -6554,9 +6598,9 @@ - - if test x$ac_cv_func_fstat64 = xno ; then - echo $ac_n "checking for fstat64 in <sys/stat.h>""... $ac_c" 1>&6 --echo "configure:6558: checking for fstat64 in <sys/stat.h>" >&5 -+echo "configure:6602: checking for fstat64 in <sys/stat.h>" >&5 - cat > conftest.$ac_ext <<EOF --#line 6560 "configure" -+#line 6604 "configure" - #include "confdefs.h" - - #if defined(HAVE_UNISTD_H) -@@ -6568,7 +6612,7 @@ - struct stat64 st64; exit(fstat64(0,&st64)); - ; return 0; } - EOF --if { (eval echo configure:6572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_func_fstat64=yes - else -@@ -6593,7 +6637,7 @@ - - if test x$ac_cv_func_strcasecmp = xno ; then - echo $ac_n "checking for strcasecmp in -lresolv""... $ac_c" 1>&6 --echo "configure:6597: checking for strcasecmp in -lresolv" >&5 -+echo "configure:6641: checking for strcasecmp in -lresolv" >&5 - ac_lib_var=`echo resolv'_'strcasecmp | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -6601,7 +6645,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lresolv $LIBS" - cat > conftest.$ac_ext <<EOF --#line 6605 "configure" -+#line 6649 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -6612,7 +6656,7 @@ - strcasecmp() - ; return 0; } - EOF --if { (eval echo configure:6616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -6648,12 +6692,12 @@ - *-lsecurity*) for ac_func in putprpwnam - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:6652: checking for $ac_func" >&5 -+echo "configure:6696: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6657 "configure" -+#line 6701 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -6676,7 +6720,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:6680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -6701,7 +6745,7 @@ - done - ;; - *) echo $ac_n "checking for putprpwnam in -lsecurity""... $ac_c" 1>&6 --echo "configure:6705: checking for putprpwnam in -lsecurity" >&5 -+echo "configure:6749: checking for putprpwnam in -lsecurity" >&5 - ac_lib_var=`echo security'_'putprpwnam | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -6709,7 +6753,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lsecurity $LIBS" - cat > conftest.$ac_ext <<EOF --#line 6713 "configure" -+#line 6757 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -6720,7 +6764,7 @@ - putprpwnam() - ; return 0; } - EOF --if { (eval echo configure:6724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -6750,12 +6794,12 @@ - for ac_func in putprpwnam - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:6754: checking for $ac_func" >&5 -+echo "configure:6798: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6759 "configure" -+#line 6803 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -6778,7 +6822,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:6782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -6809,12 +6853,12 @@ - *-lsec*) for ac_func in putprpwnam - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:6813: checking for $ac_func" >&5 -+echo "configure:6857: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6818 "configure" -+#line 6862 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -6837,7 +6881,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:6841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -6862,7 +6906,7 @@ - done - ;; - *) echo $ac_n "checking for putprpwnam in -lsec""... $ac_c" 1>&6 --echo "configure:6866: checking for putprpwnam in -lsec" >&5 -+echo "configure:6910: checking for putprpwnam in -lsec" >&5 - ac_lib_var=`echo sec'_'putprpwnam | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -6870,7 +6914,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lsec $LIBS" - cat > conftest.$ac_ext <<EOF --#line 6874 "configure" -+#line 6918 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -6881,7 +6925,7 @@ - putprpwnam() - ; return 0; } - EOF --if { (eval echo configure:6885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -6911,12 +6955,12 @@ - for ac_func in putprpwnam - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:6915: checking for $ac_func" >&5 -+echo "configure:6959: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6920 "configure" -+#line 6964 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -6939,7 +6983,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:6943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -6971,12 +7015,12 @@ - *-lsecurity*) for ac_func in set_auth_parameters - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:6975: checking for $ac_func" >&5 -+echo "configure:7019: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6980 "configure" -+#line 7024 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -6999,7 +7043,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:7003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -7024,7 +7068,7 @@ - done - ;; - *) echo $ac_n "checking for set_auth_parameters in -lsecurity""... $ac_c" 1>&6 --echo "configure:7028: checking for set_auth_parameters in -lsecurity" >&5 -+echo "configure:7072: checking for set_auth_parameters in -lsecurity" >&5 - ac_lib_var=`echo security'_'set_auth_parameters | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -7032,7 +7076,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lsecurity $LIBS" - cat > conftest.$ac_ext <<EOF --#line 7036 "configure" -+#line 7080 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -7043,7 +7087,7 @@ - set_auth_parameters() - ; return 0; } - EOF --if { (eval echo configure:7047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -7073,12 +7117,12 @@ - for ac_func in set_auth_parameters - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:7077: checking for $ac_func" >&5 -+echo "configure:7121: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7082 "configure" -+#line 7126 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -7101,7 +7145,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:7105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -7132,12 +7176,12 @@ - *-lsec*) for ac_func in set_auth_parameters - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:7136: checking for $ac_func" >&5 -+echo "configure:7180: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7141 "configure" -+#line 7185 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -7160,7 +7204,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:7164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -7185,7 +7229,7 @@ - done - ;; - *) echo $ac_n "checking for set_auth_parameters in -lsec""... $ac_c" 1>&6 --echo "configure:7189: checking for set_auth_parameters in -lsec" >&5 -+echo "configure:7233: checking for set_auth_parameters in -lsec" >&5 - ac_lib_var=`echo sec'_'set_auth_parameters | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -7193,7 +7237,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lsec $LIBS" - cat > conftest.$ac_ext <<EOF --#line 7197 "configure" -+#line 7241 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -7204,7 +7248,7 @@ - set_auth_parameters() - ; return 0; } - EOF --if { (eval echo configure:7208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -7234,12 +7278,12 @@ - for ac_func in set_auth_parameters - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:7238: checking for $ac_func" >&5 -+echo "configure:7282: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7243 "configure" -+#line 7287 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -7262,7 +7306,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:7266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -7295,12 +7339,12 @@ - *-lgen*) for ac_func in getspnam - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:7299: checking for $ac_func" >&5 -+echo "configure:7343: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7304 "configure" -+#line 7348 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -7323,7 +7367,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:7327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -7348,7 +7392,7 @@ - done - ;; - *) echo $ac_n "checking for getspnam in -lgen""... $ac_c" 1>&6 --echo "configure:7352: checking for getspnam in -lgen" >&5 -+echo "configure:7396: checking for getspnam in -lgen" >&5 - ac_lib_var=`echo gen'_'getspnam | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -7356,7 +7400,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lgen $LIBS" - cat > conftest.$ac_ext <<EOF --#line 7360 "configure" -+#line 7404 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -7367,7 +7411,7 @@ - getspnam() - ; return 0; } - EOF --if { (eval echo configure:7371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -7397,12 +7441,12 @@ - for ac_func in getspnam - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:7401: checking for $ac_func" >&5 -+echo "configure:7445: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7406 "configure" -+#line 7450 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -7425,7 +7469,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:7429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -7457,12 +7501,12 @@ - *-lsecurity*) for ac_func in getspnam - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:7461: checking for $ac_func" >&5 -+echo "configure:7505: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7466 "configure" -+#line 7510 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -7485,7 +7529,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:7489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -7510,7 +7554,7 @@ - done - ;; - *) echo $ac_n "checking for getspnam in -lsecurity""... $ac_c" 1>&6 --echo "configure:7514: checking for getspnam in -lsecurity" >&5 -+echo "configure:7558: checking for getspnam in -lsecurity" >&5 - ac_lib_var=`echo security'_'getspnam | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -7518,7 +7562,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lsecurity $LIBS" - cat > conftest.$ac_ext <<EOF --#line 7522 "configure" -+#line 7566 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -7529,7 +7573,7 @@ - getspnam() - ; return 0; } - EOF --if { (eval echo configure:7533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -7559,12 +7603,12 @@ - for ac_func in getspnam - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:7563: checking for $ac_func" >&5 -+echo "configure:7607: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7568 "configure" -+#line 7612 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -7587,7 +7631,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:7591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -7618,12 +7662,12 @@ - *-lsec*) for ac_func in getspnam - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:7622: checking for $ac_func" >&5 -+echo "configure:7666: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7627 "configure" -+#line 7671 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -7646,7 +7690,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:7650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -7671,7 +7715,7 @@ - done - ;; - *) echo $ac_n "checking for getspnam in -lsec""... $ac_c" 1>&6 --echo "configure:7675: checking for getspnam in -lsec" >&5 -+echo "configure:7719: checking for getspnam in -lsec" >&5 - ac_lib_var=`echo sec'_'getspnam | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -7679,7 +7723,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lsec $LIBS" - cat > conftest.$ac_ext <<EOF --#line 7683 "configure" -+#line 7727 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -7690,7 +7734,7 @@ - getspnam() - ; return 0; } - EOF --if { (eval echo configure:7694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -7720,12 +7764,12 @@ - for ac_func in getspnam - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:7724: checking for $ac_func" >&5 -+echo "configure:7768: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7729 "configure" -+#line 7773 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -7748,7 +7792,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:7752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -7780,12 +7824,12 @@ - *-lsecurity*) for ac_func in bigcrypt - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:7784: checking for $ac_func" >&5 -+echo "configure:7828: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7789 "configure" -+#line 7833 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -7808,7 +7852,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:7812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -7833,7 +7877,7 @@ - done - ;; - *) echo $ac_n "checking for bigcrypt in -lsecurity""... $ac_c" 1>&6 --echo "configure:7837: checking for bigcrypt in -lsecurity" >&5 -+echo "configure:7881: checking for bigcrypt in -lsecurity" >&5 - ac_lib_var=`echo security'_'bigcrypt | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -7841,7 +7885,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lsecurity $LIBS" - cat > conftest.$ac_ext <<EOF --#line 7845 "configure" -+#line 7889 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -7852,7 +7896,7 @@ - bigcrypt() - ; return 0; } - EOF --if { (eval echo configure:7856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -7882,12 +7926,12 @@ - for ac_func in bigcrypt - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:7886: checking for $ac_func" >&5 -+echo "configure:7930: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7891 "configure" -+#line 7935 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -7910,7 +7954,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:7914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -7941,12 +7985,12 @@ - *-lsec*) for ac_func in bigcrypt - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:7945: checking for $ac_func" >&5 -+echo "configure:7989: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7950 "configure" -+#line 7994 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -7969,7 +8013,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:7973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -7994,7 +8038,7 @@ - done - ;; - *) echo $ac_n "checking for bigcrypt in -lsec""... $ac_c" 1>&6 --echo "configure:7998: checking for bigcrypt in -lsec" >&5 -+echo "configure:8042: checking for bigcrypt in -lsec" >&5 - ac_lib_var=`echo sec'_'bigcrypt | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -8002,7 +8046,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lsec $LIBS" - cat > conftest.$ac_ext <<EOF --#line 8006 "configure" -+#line 8050 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -8013,7 +8057,7 @@ - bigcrypt() - ; return 0; } - EOF --if { (eval echo configure:8017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -8043,12 +8087,12 @@ - for ac_func in bigcrypt - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:8047: checking for $ac_func" >&5 -+echo "configure:8091: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8052 "configure" -+#line 8096 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -8071,7 +8115,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:8075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -8103,12 +8147,12 @@ - *-lsecurity*) for ac_func in getprpwnam - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:8107: checking for $ac_func" >&5 -+echo "configure:8151: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8112 "configure" -+#line 8156 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -8131,7 +8175,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:8135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -8156,7 +8200,7 @@ - done - ;; - *) echo $ac_n "checking for getprpwnam in -lsecurity""... $ac_c" 1>&6 --echo "configure:8160: checking for getprpwnam in -lsecurity" >&5 -+echo "configure:8204: checking for getprpwnam in -lsecurity" >&5 - ac_lib_var=`echo security'_'getprpwnam | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -8164,7 +8208,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lsecurity $LIBS" - cat > conftest.$ac_ext <<EOF --#line 8168 "configure" -+#line 8212 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -8175,7 +8219,7 @@ - getprpwnam() - ; return 0; } - EOF --if { (eval echo configure:8179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -8205,12 +8249,12 @@ - for ac_func in getprpwnam - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:8209: checking for $ac_func" >&5 -+echo "configure:8253: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8214 "configure" -+#line 8258 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -8233,7 +8277,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:8237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -8264,12 +8308,12 @@ - *-lsec*) for ac_func in getprpwnam - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:8268: checking for $ac_func" >&5 -+echo "configure:8312: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8273 "configure" -+#line 8317 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -8292,7 +8336,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:8296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -8317,7 +8361,7 @@ - done - ;; - *) echo $ac_n "checking for getprpwnam in -lsec""... $ac_c" 1>&6 --echo "configure:8321: checking for getprpwnam in -lsec" >&5 -+echo "configure:8365: checking for getprpwnam in -lsec" >&5 - ac_lib_var=`echo sec'_'getprpwnam | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -8325,7 +8369,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lsec $LIBS" - cat > conftest.$ac_ext <<EOF --#line 8329 "configure" -+#line 8373 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -8336,7 +8380,7 @@ - getprpwnam() - ; return 0; } - EOF --if { (eval echo configure:8340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -8366,12 +8410,12 @@ - for ac_func in getprpwnam - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:8370: checking for $ac_func" >&5 -+echo "configure:8414: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8375 "configure" -+#line 8419 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -8394,7 +8438,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:8398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -8437,7 +8481,7 @@ - # Assume non-shared by default and override below - BLDSHARED="false" - echo $ac_n "checking ability to build shared libraries""... $ac_c" 1>&6 --echo "configure:8441: checking ability to build shared libraries" >&5 -+echo "configure:8485: checking ability to build shared libraries" >&5 - - # and these are for particular systems - case "$host_os" in -@@ -8572,7 +8616,7 @@ - *dgux*) # Extract the first word of "groff", so it can be a program name with args. - set dummy groff; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:8576: checking for $ac_word" >&5 -+echo "configure:8620: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_ROFF'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -8626,15 +8670,15 @@ - esac - echo "$ac_t""$BLDSHARED" 1>&6 - echo $ac_n "checking linker flags for shared libraries""... $ac_c" 1>&6 --echo "configure:8630: checking linker flags for shared libraries" >&5 -+echo "configure:8674: checking linker flags for shared libraries" >&5 - echo "$ac_t""$LDSHFLAGS" 1>&6 - echo $ac_n "checking compiler flags for position-independent code""... $ac_c" 1>&6 --echo "configure:8633: checking compiler flags for position-independent code" >&5 -+echo "configure:8677: checking compiler flags for position-independent code" >&5 - echo "$ac_t""$PICFLAGS" 1>&6 - - # try to work out how to produce pic code with this compiler - echo $ac_n "checking whether ${CC-cc} accepts -fpic""... $ac_c" 1>&6 --echo "configure:8638: checking whether ${CC-cc} accepts -fpic" >&5 -+echo "configure:8682: checking whether ${CC-cc} accepts -fpic" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_cc_fpic'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -8654,7 +8698,7 @@ - fi - if test x$PICFLAG = x; then - echo $ac_n "checking whether ${CC-cc} accepts -KPIC""... $ac_c" 1>&6 --echo "configure:8658: checking whether ${CC-cc} accepts -KPIC" >&5 -+echo "configure:8702: checking whether ${CC-cc} accepts -KPIC" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_cc_KPIC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -8675,7 +8719,7 @@ - fi - if test x$PICFLAG = x; then - echo $ac_n "checking whether ${CC-cc} accepts -Kpic""... $ac_c" 1>&6 --echo "configure:8679: checking whether ${CC-cc} accepts -Kpic" >&5 -+echo "configure:8723: checking whether ${CC-cc} accepts -Kpic" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_cc_Kpic'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -8698,7 +8742,7 @@ - ################ - - echo $ac_n "checking for long long""... $ac_c" 1>&6 --echo "configure:8702: checking for long long" >&5 -+echo "configure:8746: checking for long long" >&5 - if eval "test \"`echo '$''{'samba_cv_have_longlong'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -8707,12 +8751,12 @@ - samba_cv_have_longlong=cross - else - cat > conftest.$ac_ext <<EOF --#line 8711 "configure" -+#line 8755 "configure" - #include "confdefs.h" - #include <stdio.h> - main() { long long x = 1000000; x *= x; exit(((x/1000000) == 1000000)? 0: 1); } - EOF --if { (eval echo configure:8716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:8760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_have_longlong=yes - else -@@ -8739,20 +8783,20 @@ - # AIX needs this. - - echo $ac_n "checking for LL suffix on long long integers""... $ac_c" 1>&6 --echo "configure:8743: checking for LL suffix on long long integers" >&5 -+echo "configure:8787: checking for LL suffix on long long integers" >&5 - if eval "test \"`echo '$''{'samba_cv_compiler_supports_ll'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 8749 "configure" -+#line 8793 "configure" - #include "confdefs.h" - #include <stdio.h> - int main() { - long long i = 0x8000000000LL - ; return 0; } - EOF --if { (eval echo configure:8756: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8800: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_compiler_supports_ll=yes - else -@@ -8774,7 +8818,7 @@ - - - echo $ac_n "checking for 64 bit off_t""... $ac_c" 1>&6 --echo "configure:8778: checking for 64 bit off_t" >&5 -+echo "configure:8822: checking for 64 bit off_t" >&5 - if eval "test \"`echo '$''{'samba_cv_SIZEOF_OFF_T'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -8783,13 +8827,13 @@ - samba_cv_SIZEOF_OFF_T=cross - else - cat > conftest.$ac_ext <<EOF --#line 8787 "configure" -+#line 8831 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <sys/stat.h> - main() { exit((sizeof(off_t) == 8) ? 0 : 1); } - EOF --if { (eval echo configure:8793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:8837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_SIZEOF_OFF_T=yes - else -@@ -8812,7 +8856,7 @@ - fi - - echo $ac_n "checking for off64_t""... $ac_c" 1>&6 --echo "configure:8816: checking for off64_t" >&5 -+echo "configure:8860: checking for off64_t" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_OFF64_T'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -8821,7 +8865,7 @@ - samba_cv_HAVE_OFF64_T=cross - else - cat > conftest.$ac_ext <<EOF --#line 8825 "configure" -+#line 8869 "configure" - #include "confdefs.h" - - #if defined(HAVE_UNISTD_H) -@@ -8831,7 +8875,7 @@ - #include <sys/stat.h> - main() { struct stat64 st; off64_t s; if (sizeof(off_t) == sizeof(off64_t)) exit(1); exit((lstat64("/dev/null", &st)==0)?0:1); } - EOF --if { (eval echo configure:8835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:8879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_HAVE_OFF64_T=yes - else -@@ -8854,7 +8898,7 @@ - fi - - echo $ac_n "checking for 64 bit ino_t""... $ac_c" 1>&6 --echo "configure:8858: checking for 64 bit ino_t" >&5 -+echo "configure:8902: checking for 64 bit ino_t" >&5 - if eval "test \"`echo '$''{'samba_cv_SIZEOF_INO_T'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -8863,13 +8907,13 @@ - samba_cv_SIZEOF_INO_T=cross - else - cat > conftest.$ac_ext <<EOF --#line 8867 "configure" -+#line 8911 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <sys/stat.h> - main() { exit((sizeof(ino_t) == 8) ? 0 : 1); } - EOF --if { (eval echo configure:8873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:8917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_SIZEOF_INO_T=yes - else -@@ -8892,7 +8936,7 @@ - fi - - echo $ac_n "checking for ino64_t""... $ac_c" 1>&6 --echo "configure:8896: checking for ino64_t" >&5 -+echo "configure:8940: checking for ino64_t" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_INO64_T'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -8901,7 +8945,7 @@ - samba_cv_HAVE_INO64_T=cross - else - cat > conftest.$ac_ext <<EOF --#line 8905 "configure" -+#line 8949 "configure" - #include "confdefs.h" - - #if defined(HAVE_UNISTD_H) -@@ -8911,7 +8955,7 @@ - #include <sys/stat.h> - main() { struct stat64 st; ino64_t s; if (sizeof(ino_t) == sizeof(ino64_t)) exit(1); exit((lstat64("/dev/null", &st)==0)?0:1); } - EOF --if { (eval echo configure:8915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:8959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_HAVE_INO64_T=yes - else -@@ -8934,7 +8978,7 @@ - fi - - echo $ac_n "checking for dev64_t""... $ac_c" 1>&6 --echo "configure:8938: checking for dev64_t" >&5 -+echo "configure:8982: checking for dev64_t" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_DEV64_T'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -8943,7 +8987,7 @@ - samba_cv_HAVE_DEV64_T=cross - else - cat > conftest.$ac_ext <<EOF --#line 8947 "configure" -+#line 8991 "configure" - #include "confdefs.h" - - #if defined(HAVE_UNISTD_H) -@@ -8953,7 +8997,7 @@ - #include <sys/stat.h> - main() { struct stat64 st; dev64_t s; if (sizeof(dev_t) == sizeof(dev64_t)) exit(1); exit((lstat64("/dev/null", &st)==0)?0:1); } - EOF --if { (eval echo configure:8957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:9001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_HAVE_DEV64_T=yes - else -@@ -8976,13 +9020,13 @@ - fi - - echo $ac_n "checking for struct dirent64""... $ac_c" 1>&6 --echo "configure:8980: checking for struct dirent64" >&5 -+echo "configure:9024: checking for struct dirent64" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_STRUCT_DIRENT64'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 8986 "configure" -+#line 9030 "configure" - #include "confdefs.h" - - #if defined(HAVE_UNISTD_H) -@@ -8994,7 +9038,7 @@ - struct dirent64 de; - ; return 0; } - EOF --if { (eval echo configure:8998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_HAVE_STRUCT_DIRENT64=yes - else -@@ -9015,7 +9059,7 @@ - fi - - echo $ac_n "checking for major macro""... $ac_c" 1>&6 --echo "configure:9019: checking for major macro" >&5 -+echo "configure:9063: checking for major macro" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_DEVICE_MAJOR_FN'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9024,7 +9068,7 @@ - samba_cv_HAVE_DEVICE_MAJOR_FN=cross - else - cat > conftest.$ac_ext <<EOF --#line 9028 "configure" -+#line 9072 "configure" - #include "confdefs.h" - - #if defined(HAVE_UNISTD_H) -@@ -9033,7 +9077,7 @@ - #include <sys/types.h> - main() { dev_t dev; int i = major(dev); return 0; } - EOF --if { (eval echo configure:9037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:9081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_HAVE_DEVICE_MAJOR_FN=yes - else -@@ -9056,7 +9100,7 @@ - fi - - echo $ac_n "checking for minor macro""... $ac_c" 1>&6 --echo "configure:9060: checking for minor macro" >&5 -+echo "configure:9104: checking for minor macro" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_DEVICE_MINOR_FN'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9065,7 +9109,7 @@ - samba_cv_HAVE_DEVICE_MINOR_FN=cross - else - cat > conftest.$ac_ext <<EOF --#line 9069 "configure" -+#line 9113 "configure" - #include "confdefs.h" - - #if defined(HAVE_UNISTD_H) -@@ -9074,7 +9118,7 @@ - #include <sys/types.h> - main() { dev_t dev; int i = minor(dev); return 0; } - EOF --if { (eval echo configure:9078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:9122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_HAVE_DEVICE_MINOR_FN=yes - else -@@ -9097,7 +9141,7 @@ - fi - - echo $ac_n "checking for makedev macro""... $ac_c" 1>&6 --echo "configure:9101: checking for makedev macro" >&5 -+echo "configure:9145: checking for makedev macro" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_MAKEDEV_FN'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9106,7 +9150,7 @@ - samba_cv_HAVE_MAKEDEV_FN=cross - else - cat > conftest.$ac_ext <<EOF --#line 9110 "configure" -+#line 9154 "configure" - #include "confdefs.h" - - #if defined(HAVE_UNISTD_H) -@@ -9115,7 +9159,7 @@ - #include <sys/types.h> - main() { dev_t dev = makedev(1,2); return 0; } - EOF --if { (eval echo configure:9119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:9163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_HAVE_MAKEDEV_FN=yes - else -@@ -9138,7 +9182,7 @@ - fi - - echo $ac_n "checking for unsigned char""... $ac_c" 1>&6 --echo "configure:9142: checking for unsigned char" >&5 -+echo "configure:9186: checking for unsigned char" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_UNSIGNED_CHAR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9147,12 +9191,12 @@ - samba_cv_HAVE_UNSIGNED_CHAR=cross - else - cat > conftest.$ac_ext <<EOF --#line 9151 "configure" -+#line 9195 "configure" - #include "confdefs.h" - #include <stdio.h> - main() { char c; c=250; exit((c > 0)?0:1); } - EOF --if { (eval echo configure:9156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:9200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_HAVE_UNSIGNED_CHAR=yes - else -@@ -9175,13 +9219,13 @@ - fi - - echo $ac_n "checking for sin_len in sock""... $ac_c" 1>&6 --echo "configure:9179: checking for sin_len in sock" >&5 -+echo "configure:9223: checking for sin_len in sock" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_SOCK_SIN_LEN'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 9185 "configure" -+#line 9229 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/socket.h> -@@ -9190,7 +9234,7 @@ - struct sockaddr_in sock; sock.sin_len = sizeof(sock); - ; return 0; } - EOF --if { (eval echo configure:9194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9238: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_HAVE_SOCK_SIN_LEN=yes - else -@@ -9211,13 +9255,13 @@ - fi - - echo $ac_n "checking whether seekdir returns void""... $ac_c" 1>&6 --echo "configure:9215: checking whether seekdir returns void" >&5 -+echo "configure:9259: checking whether seekdir returns void" >&5 - if eval "test \"`echo '$''{'samba_cv_SEEKDIR_RETURNS_VOID'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 9221 "configure" -+#line 9265 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <dirent.h> -@@ -9226,7 +9270,7 @@ - return 0; - ; return 0; } - EOF --if { (eval echo configure:9230: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9274: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_SEEKDIR_RETURNS_VOID=yes - else -@@ -9247,20 +9291,20 @@ - fi - - echo $ac_n "checking for __FILE__ macro""... $ac_c" 1>&6 --echo "configure:9251: checking for __FILE__ macro" >&5 -+echo "configure:9295: checking for __FILE__ macro" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_FILE_MACRO'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 9257 "configure" -+#line 9301 "configure" - #include "confdefs.h" - #include <stdio.h> - int main() { - printf("%s\n", __FILE__); - ; return 0; } - EOF --if { (eval echo configure:9264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9308: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_HAVE_FILE_MACRO=yes - else -@@ -9281,20 +9325,20 @@ - fi - - echo $ac_n "checking for __FUNCTION__ macro""... $ac_c" 1>&6 --echo "configure:9285: checking for __FUNCTION__ macro" >&5 -+echo "configure:9329: checking for __FUNCTION__ macro" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_FUNCTION_MACRO'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 9291 "configure" -+#line 9335 "configure" - #include "confdefs.h" - #include <stdio.h> - int main() { - printf("%s\n", __FUNCTION__); - ; return 0; } - EOF --if { (eval echo configure:9298: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_HAVE_FUNCTION_MACRO=yes - else -@@ -9315,7 +9359,7 @@ - fi - - echo $ac_n "checking if gettimeofday takes tz argument""... $ac_c" 1>&6 --echo "configure:9319: checking if gettimeofday takes tz argument" >&5 -+echo "configure:9363: checking if gettimeofday takes tz argument" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_GETTIMEOFDAY_TZ'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9324,14 +9368,14 @@ - samba_cv_HAVE_GETTIMEOFDAY_TZ=cross - else - cat > conftest.$ac_ext <<EOF --#line 9328 "configure" -+#line 9372 "configure" - #include "confdefs.h" - - #include <sys/time.h> - #include <unistd.h> - main() { struct timeval tv; exit(gettimeofday(&tv, NULL));} - EOF --if { (eval echo configure:9335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:9379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_HAVE_GETTIMEOFDAY_TZ=yes - else -@@ -9354,7 +9398,7 @@ - fi - - echo $ac_n "checking for C99 vsnprintf""... $ac_c" 1>&6 --echo "configure:9358: checking for C99 vsnprintf" >&5 -+echo "configure:9402: checking for C99 vsnprintf" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_C99_VSNPRINTF'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9363,7 +9407,7 @@ - samba_cv_HAVE_C99_VSNPRINTF=cross - else - cat > conftest.$ac_ext <<EOF --#line 9367 "configure" -+#line 9411 "configure" - #include "confdefs.h" - - #include <sys/types.h> -@@ -9385,7 +9429,7 @@ - main() { foo("hello"); } - - EOF --if { (eval echo configure:9389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:9433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_HAVE_C99_VSNPRINTF=yes - else -@@ -9408,7 +9452,7 @@ - fi - - echo $ac_n "checking for broken readdir""... $ac_c" 1>&6 --echo "configure:9412: checking for broken readdir" >&5 -+echo "configure:9456: checking for broken readdir" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_BROKEN_READDIR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9417,7 +9461,7 @@ - samba_cv_HAVE_BROKEN_READDIR=cross - else - cat > conftest.$ac_ext <<EOF --#line 9421 "configure" -+#line 9465 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <dirent.h> -@@ -9425,7 +9469,7 @@ - if (di && di->d_name[-2] == '.' && di->d_name[-1] == 0 && - di->d_name[0] == 0) exit(0); exit(1);} - EOF --if { (eval echo configure:9429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:9473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_HAVE_BROKEN_READDIR=yes - else -@@ -9448,13 +9492,13 @@ - fi - - echo $ac_n "checking for utimbuf""... $ac_c" 1>&6 --echo "configure:9452: checking for utimbuf" >&5 -+echo "configure:9496: checking for utimbuf" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_UTIMBUF'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 9458 "configure" -+#line 9502 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <utime.h> -@@ -9462,7 +9506,7 @@ - struct utimbuf tbuf; tbuf.actime = 0; tbuf.modtime = 1; exit(utime("foo.c",&tbuf)); - ; return 0; } - EOF --if { (eval echo configure:9466: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_HAVE_UTIMBUF=yes - else -@@ -9486,12 +9530,12 @@ - for ac_func in pututline pututxline updwtmp updwtmpx getutmpx - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:9490: checking for $ac_func" >&5 -+echo "configure:9534: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 9495 "configure" -+#line 9539 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -9514,7 +9558,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:9518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -9540,13 +9584,13 @@ - - - echo $ac_n "checking for ut_name in utmp""... $ac_c" 1>&6 --echo "configure:9544: checking for ut_name in utmp" >&5 -+echo "configure:9588: checking for ut_name in utmp" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_UT_UT_NAME'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 9550 "configure" -+#line 9594 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <utmp.h> -@@ -9554,7 +9598,7 @@ - struct utmp ut; ut.ut_name[0] = 'a'; - ; return 0; } - EOF --if { (eval echo configure:9558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_HAVE_UT_UT_NAME=yes - else -@@ -9575,13 +9619,13 @@ - fi - - echo $ac_n "checking for ut_user in utmp""... $ac_c" 1>&6 --echo "configure:9579: checking for ut_user in utmp" >&5 -+echo "configure:9623: checking for ut_user in utmp" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_UT_UT_USER'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 9585 "configure" -+#line 9629 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <utmp.h> -@@ -9589,7 +9633,7 @@ - struct utmp ut; ut.ut_user[0] = 'a'; - ; return 0; } - EOF --if { (eval echo configure:9593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9637: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_HAVE_UT_UT_USER=yes - else -@@ -9610,13 +9654,13 @@ - fi - - echo $ac_n "checking for ut_id in utmp""... $ac_c" 1>&6 --echo "configure:9614: checking for ut_id in utmp" >&5 -+echo "configure:9658: checking for ut_id in utmp" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_UT_UT_ID'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 9620 "configure" -+#line 9664 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <utmp.h> -@@ -9624,7 +9668,7 @@ - struct utmp ut; ut.ut_id[0] = 'a'; - ; return 0; } - EOF --if { (eval echo configure:9628: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_HAVE_UT_UT_ID=yes - else -@@ -9645,13 +9689,13 @@ - fi - - echo $ac_n "checking for ut_host in utmp""... $ac_c" 1>&6 --echo "configure:9649: checking for ut_host in utmp" >&5 -+echo "configure:9693: checking for ut_host in utmp" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_UT_UT_HOST'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 9655 "configure" -+#line 9699 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <utmp.h> -@@ -9659,7 +9703,7 @@ - struct utmp ut; ut.ut_host[0] = 'a'; - ; return 0; } - EOF --if { (eval echo configure:9663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_HAVE_UT_UT_HOST=yes - else -@@ -9680,13 +9724,13 @@ - fi - - echo $ac_n "checking for ut_time in utmp""... $ac_c" 1>&6 --echo "configure:9684: checking for ut_time in utmp" >&5 -+echo "configure:9728: checking for ut_time in utmp" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_UT_UT_TIME'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 9690 "configure" -+#line 9734 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <utmp.h> -@@ -9694,7 +9738,7 @@ - struct utmp ut; time_t t; ut.ut_time = t; - ; return 0; } - EOF --if { (eval echo configure:9698: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9742: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_HAVE_UT_UT_TIME=yes - else -@@ -9715,13 +9759,13 @@ - fi - - echo $ac_n "checking for ut_tv in utmp""... $ac_c" 1>&6 --echo "configure:9719: checking for ut_tv in utmp" >&5 -+echo "configure:9763: checking for ut_tv in utmp" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_UT_UT_TV'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 9725 "configure" -+#line 9769 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <utmp.h> -@@ -9729,7 +9773,7 @@ - struct utmp ut; struct timeval tv; ut.ut_tv = tv; - ; return 0; } - EOF --if { (eval echo configure:9733: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_HAVE_UT_UT_TV=yes - else -@@ -9750,13 +9794,13 @@ - fi - - echo $ac_n "checking for ut_type in utmp""... $ac_c" 1>&6 --echo "configure:9754: checking for ut_type in utmp" >&5 -+echo "configure:9798: checking for ut_type in utmp" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_UT_UT_TYPE'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 9760 "configure" -+#line 9804 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <utmp.h> -@@ -9764,7 +9808,7 @@ - struct utmp ut; ut.ut_type = 0; - ; return 0; } - EOF --if { (eval echo configure:9768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9812: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_HAVE_UT_UT_TYPE=yes - else -@@ -9785,13 +9829,13 @@ - fi - - echo $ac_n "checking for ut_pid in utmp""... $ac_c" 1>&6 --echo "configure:9789: checking for ut_pid in utmp" >&5 -+echo "configure:9833: checking for ut_pid in utmp" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_UT_UT_PID'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 9795 "configure" -+#line 9839 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <utmp.h> -@@ -9799,7 +9843,7 @@ - struct utmp ut; ut.ut_pid = 0; - ; return 0; } - EOF --if { (eval echo configure:9803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_HAVE_UT_UT_PID=yes - else -@@ -9820,13 +9864,13 @@ - fi - - echo $ac_n "checking for ut_exit in utmp""... $ac_c" 1>&6 --echo "configure:9824: checking for ut_exit in utmp" >&5 -+echo "configure:9868: checking for ut_exit in utmp" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_UT_UT_EXIT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 9830 "configure" -+#line 9874 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <utmp.h> -@@ -9834,7 +9878,7 @@ - struct utmp ut; ut.ut_exit.e_exit = 0; - ; return 0; } - EOF --if { (eval echo configure:9838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9882: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_HAVE_UT_UT_EXIT=yes - else -@@ -9855,13 +9899,13 @@ - fi - - echo $ac_n "checking for ut_addr in utmp""... $ac_c" 1>&6 --echo "configure:9859: checking for ut_addr in utmp" >&5 -+echo "configure:9903: checking for ut_addr in utmp" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_UT_UT_ADDR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 9865 "configure" -+#line 9909 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <utmp.h> -@@ -9869,7 +9913,7 @@ - struct utmp ut; ut.ut_addr = 0; - ; return 0; } - EOF --if { (eval echo configure:9873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_HAVE_UT_UT_ADDR=yes - else -@@ -9891,13 +9935,13 @@ - - if test x$ac_cv_func_pututline = xyes ; then - echo $ac_n "checking whether pututline returns pointer""... $ac_c" 1>&6 --echo "configure:9895: checking whether pututline returns pointer" >&5 -+echo "configure:9939: checking whether pututline returns pointer" >&5 - if eval "test \"`echo '$''{'samba_cv_PUTUTLINE_RETURNS_UTMP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 9901 "configure" -+#line 9945 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <utmp.h> -@@ -9905,7 +9949,7 @@ - struct utmp utarg; struct utmp *utreturn; utreturn = pututline(&utarg); - ; return 0; } - EOF --if { (eval echo configure:9909: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9953: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_PUTUTLINE_RETURNS_UTMP=yes - else -@@ -9927,13 +9971,13 @@ - fi - - echo $ac_n "checking for ut_syslen in utmpx""... $ac_c" 1>&6 --echo "configure:9931: checking for ut_syslen in utmpx" >&5 -+echo "configure:9975: checking for ut_syslen in utmpx" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_UX_UT_SYSLEN'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 9937 "configure" -+#line 9981 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <utmpx.h> -@@ -9941,7 +9985,7 @@ - struct utmpx ux; ux.ut_syslen = 0; - ; return 0; } - EOF --if { (eval echo configure:9945: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_HAVE_UX_UT_SYSLEN=yes - else -@@ -9962,7 +10006,7 @@ - fi - - echo $ac_n "checking for Linux kernel oplocks""... $ac_c" 1>&6 --echo "configure:9966: checking for Linux kernel oplocks" >&5 -+echo "configure:10010: checking for Linux kernel oplocks" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_KERNEL_OPLOCKS_LINUX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9971,7 +10015,7 @@ - samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=cross - else - cat > conftest.$ac_ext <<EOF --#line 9975 "configure" -+#line 10019 "configure" - #include "confdefs.h" - - #include <sys/types.h> -@@ -9985,7 +10029,7 @@ - } - - EOF --if { (eval echo configure:9989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes - else -@@ -10008,7 +10052,7 @@ - fi - - echo $ac_n "checking for kernel change notify support""... $ac_c" 1>&6 --echo "configure:10012: checking for kernel change notify support" >&5 -+echo "configure:10056: checking for kernel change notify support" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_KERNEL_CHANGE_NOTIFY'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -10017,7 +10061,7 @@ - samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=cross - else - cat > conftest.$ac_ext <<EOF --#line 10021 "configure" -+#line 10065 "configure" - #include "confdefs.h" - - #include <sys/types.h> -@@ -10031,7 +10075,7 @@ - } - - EOF --if { (eval echo configure:10035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=yes - else -@@ -10054,7 +10098,7 @@ - fi - - echo $ac_n "checking for kernel share modes""... $ac_c" 1>&6 --echo "configure:10058: checking for kernel share modes" >&5 -+echo "configure:10102: checking for kernel share modes" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_KERNEL_SHARE_MODES'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -10063,7 +10107,7 @@ - samba_cv_HAVE_KERNEL_SHARE_MODES=cross - else - cat > conftest.$ac_ext <<EOF --#line 10067 "configure" -+#line 10111 "configure" - #include "confdefs.h" - - #include <sys/types.h> -@@ -10079,7 +10123,7 @@ - } - - EOF --if { (eval echo configure:10083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_HAVE_KERNEL_SHARE_MODES=yes - else -@@ -10105,13 +10149,13 @@ - - - echo $ac_n "checking for IRIX kernel oplock type definitions""... $ac_c" 1>&6 --echo "configure:10109: checking for IRIX kernel oplock type definitions" >&5 -+echo "configure:10153: checking for IRIX kernel oplock type definitions" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_KERNEL_OPLOCKS_IRIX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 10115 "configure" -+#line 10159 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <fcntl.h> -@@ -10119,7 +10163,7 @@ - oplock_stat_t t; t.os_state = OP_REVOKE; t.os_dev = 1; t.os_ino = 1; - ; return 0; } - EOF --if { (eval echo configure:10123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10167: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_HAVE_KERNEL_OPLOCKS_IRIX=yes - else -@@ -10140,7 +10184,7 @@ - fi - - echo $ac_n "checking for irix specific capabilities""... $ac_c" 1>&6 --echo "configure:10144: checking for irix specific capabilities" >&5 -+echo "configure:10188: checking for irix specific capabilities" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -10149,7 +10193,7 @@ - samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=cross - else - cat > conftest.$ac_ext <<EOF --#line 10153 "configure" -+#line 10197 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/capability.h> -@@ -10164,7 +10208,7 @@ - } - - EOF --if { (eval echo configure:10168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=yes - else -@@ -10192,13 +10236,13 @@ - # - - echo $ac_n "checking for int16 typedef included by rpc/rpc.h""... $ac_c" 1>&6 --echo "configure:10196: checking for int16 typedef included by rpc/rpc.h" >&5 -+echo "configure:10240: checking for int16 typedef included by rpc/rpc.h" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_INT16_FROM_RPC_RPC_H'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 10202 "configure" -+#line 10246 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if defined(HAVE_RPC_RPC_H) -@@ -10208,7 +10252,7 @@ - int16 testvar; - ; return 0; } - EOF --if { (eval echo configure:10212: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_HAVE_INT16_FROM_RPC_RPC_H=yes - else -@@ -10229,13 +10273,13 @@ - fi - - echo $ac_n "checking for uint16 typedef included by rpc/rpc.h""... $ac_c" 1>&6 --echo "configure:10233: checking for uint16 typedef included by rpc/rpc.h" >&5 -+echo "configure:10277: checking for uint16 typedef included by rpc/rpc.h" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_UINT16_FROM_RPC_RPC_H'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 10239 "configure" -+#line 10283 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if defined(HAVE_RPC_RPC_H) -@@ -10245,7 +10289,7 @@ - uint16 testvar; - ; return 0; } - EOF --if { (eval echo configure:10249: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_HAVE_UINT16_FROM_RPC_RPC_H=yes - else -@@ -10266,13 +10310,13 @@ - fi - - echo $ac_n "checking for int32 typedef included by rpc/rpc.h""... $ac_c" 1>&6 --echo "configure:10270: checking for int32 typedef included by rpc/rpc.h" >&5 -+echo "configure:10314: checking for int32 typedef included by rpc/rpc.h" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_INT32_FROM_RPC_RPC_H'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 10276 "configure" -+#line 10320 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if defined(HAVE_RPC_RPC_H) -@@ -10282,7 +10326,7 @@ - int32 testvar; - ; return 0; } - EOF --if { (eval echo configure:10286: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10330: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_HAVE_INT32_FROM_RPC_RPC_H=yes - else -@@ -10303,13 +10347,13 @@ - fi - - echo $ac_n "checking for uint32 typedef included by rpc/rpc.h""... $ac_c" 1>&6 --echo "configure:10307: checking for uint32 typedef included by rpc/rpc.h" >&5 -+echo "configure:10351: checking for uint32 typedef included by rpc/rpc.h" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_UINT32_FROM_RPC_RPC_H'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 10313 "configure" -+#line 10357 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if defined(HAVE_RPC_RPC_H) -@@ -10319,7 +10363,7 @@ - uint32 testvar; - ; return 0; } - EOF --if { (eval echo configure:10323: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_HAVE_UINT32_FROM_RPC_RPC_H=yes - else -@@ -10341,13 +10385,13 @@ - - - echo $ac_n "checking for conflicting AUTH_ERROR define in rpc/rpc.h""... $ac_c" 1>&6 --echo "configure:10345: checking for conflicting AUTH_ERROR define in rpc/rpc.h" >&5 -+echo "configure:10389: checking for conflicting AUTH_ERROR define in rpc/rpc.h" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 10351 "configure" -+#line 10395 "configure" - #include "confdefs.h" - #include <sys/types.h> - #ifdef HAVE_SYS_SECURITY_H -@@ -10361,7 +10405,7 @@ - int testvar; - ; return 0; } - EOF --if { (eval echo configure:10365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT=no - else -@@ -10382,16 +10426,16 @@ - fi - - echo $ac_n "checking for test routines""... $ac_c" 1>&6 --echo "configure:10386: checking for test routines" >&5 -+echo "configure:10430: checking for test routines" >&5 - if test "$cross_compiling" = yes; then - echo "configure: warning: cannot run when cross-compiling" 1>&2 - else - cat > conftest.$ac_ext <<EOF --#line 10391 "configure" -+#line 10435 "configure" - #include "confdefs.h" - #include "${srcdir-.}/tests/trivial.c" - EOF --if { (eval echo configure:10395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - echo "$ac_t""yes" 1>&6 - else -@@ -10405,7 +10449,7 @@ - - - echo $ac_n "checking for ftruncate extend""... $ac_c" 1>&6 --echo "configure:10409: checking for ftruncate extend" >&5 -+echo "configure:10453: checking for ftruncate extend" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_FTRUNCATE_EXTEND'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -10414,11 +10458,11 @@ - samba_cv_HAVE_FTRUNCATE_EXTEND=cross - else - cat > conftest.$ac_ext <<EOF --#line 10418 "configure" -+#line 10462 "configure" - #include "confdefs.h" - #include "${srcdir-.}/tests/ftruncate.c" - EOF --if { (eval echo configure:10422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_HAVE_FTRUNCATE_EXTEND=yes - else -@@ -10441,7 +10485,7 @@ - fi - - echo $ac_n "checking for broken getgroups""... $ac_c" 1>&6 --echo "configure:10445: checking for broken getgroups" >&5 -+echo "configure:10489: checking for broken getgroups" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_BROKEN_GETGROUPS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -10450,11 +10494,11 @@ - samba_cv_HAVE_BROKEN_GETGROUPS=cross - else - cat > conftest.$ac_ext <<EOF --#line 10454 "configure" -+#line 10498 "configure" - #include "confdefs.h" - #include "${srcdir-.}/tests/getgroups.c" - EOF --if { (eval echo configure:10458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_HAVE_BROKEN_GETGROUPS=yes - else -@@ -10477,7 +10521,7 @@ - fi - - echo $ac_n "checking whether getpass should be replaced""... $ac_c" 1>&6 --echo "configure:10481: checking whether getpass should be replaced" >&5 -+echo "configure:10525: checking whether getpass should be replaced" >&5 - if eval "test \"`echo '$''{'samba_cv_REPLACE_GETPASS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -10485,7 +10529,7 @@ - SAVE_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I${srcdir-.}/ -I${srcdir-.}/include -I${srcdir-.}/ubiqx -I${srcdir-.}/smbwrapper" - cat > conftest.$ac_ext <<EOF --#line 10489 "configure" -+#line 10533 "configure" - #include "confdefs.h" - - #define REPLACE_GETPASS 1 -@@ -10498,7 +10542,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:10502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_REPLACE_GETPASS=yes - else -@@ -10521,7 +10565,7 @@ - fi - - echo $ac_n "checking for broken inet_ntoa""... $ac_c" 1>&6 --echo "configure:10525: checking for broken inet_ntoa" >&5 -+echo "configure:10569: checking for broken inet_ntoa" >&5 - if eval "test \"`echo '$''{'samba_cv_REPLACE_INET_NTOA'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -10530,7 +10574,7 @@ - samba_cv_REPLACE_INET_NTOA=cross - else - cat > conftest.$ac_ext <<EOF --#line 10534 "configure" -+#line 10578 "configure" - #include "confdefs.h" - - #include <stdio.h> -@@ -10544,7 +10588,7 @@ - strcmp(inet_ntoa(ip),"120.86.52.18")) { exit(0); } - exit(1);} - EOF --if { (eval echo configure:10548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_REPLACE_INET_NTOA=yes - else -@@ -10567,7 +10611,7 @@ - fi - - echo $ac_n "checking for secure mkstemp""... $ac_c" 1>&6 --echo "configure:10571: checking for secure mkstemp" >&5 -+echo "configure:10615: checking for secure mkstemp" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_SECURE_MKSTEMP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -10576,7 +10620,7 @@ - samba_cv_HAVE_SECURE_MKSTEMP=cross - else - cat > conftest.$ac_ext <<EOF --#line 10580 "configure" -+#line 10624 "configure" - #include "confdefs.h" - #include <stdlib.h> - #include <sys/types.h> -@@ -10593,7 +10637,7 @@ - exit(0); - } - EOF --if { (eval echo configure:10597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_HAVE_SECURE_MKSTEMP=yes - else -@@ -10616,7 +10660,7 @@ - fi - - echo $ac_n "checking for sysconf(_SC_NGROUPS_MAX)""... $ac_c" 1>&6 --echo "configure:10620: checking for sysconf(_SC_NGROUPS_MAX)" >&5 -+echo "configure:10664: checking for sysconf(_SC_NGROUPS_MAX)" >&5 - if eval "test \"`echo '$''{'samba_cv_SYSCONF_SC_NGROUPS_MAX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -10625,12 +10669,12 @@ - samba_cv_SYSCONF_SC_NGROUPS_MAX=cross - else - cat > conftest.$ac_ext <<EOF --#line 10629 "configure" -+#line 10673 "configure" - #include "confdefs.h" - #include <unistd.h> - main() { exit(sysconf(_SC_NGROUPS_MAX) == -1 ? 1 : 0); } - EOF --if { (eval echo configure:10634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_SYSCONF_SC_NGROUPS_MAX=yes - else -@@ -10653,7 +10697,7 @@ - fi - - echo $ac_n "checking for root""... $ac_c" 1>&6 --echo "configure:10657: checking for root" >&5 -+echo "configure:10701: checking for root" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_ROOT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -10662,11 +10706,11 @@ - samba_cv_HAVE_ROOT=cross - else - cat > conftest.$ac_ext <<EOF --#line 10666 "configure" -+#line 10710 "configure" - #include "confdefs.h" - main() { exit(getuid() != 0); } - EOF --if { (eval echo configure:10670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_HAVE_ROOT=yes - else -@@ -10694,7 +10738,7 @@ - # look for a method of finding the list of network interfaces - iface=no; - echo $ac_n "checking for iface AIX""... $ac_c" 1>&6 --echo "configure:10698: checking for iface AIX" >&5 -+echo "configure:10742: checking for iface AIX" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_IFACE_AIX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -10703,7 +10747,7 @@ - samba_cv_HAVE_IFACE_AIX=cross - else - cat > conftest.$ac_ext <<EOF --#line 10707 "configure" -+#line 10751 "configure" - #include "confdefs.h" - - #define HAVE_IFACE_AIX 1 -@@ -10711,7 +10755,7 @@ - #include "confdefs.h" - #include "${srcdir-.}/lib/interfaces.c" - EOF --if { (eval echo configure:10715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_HAVE_IFACE_AIX=yes - else -@@ -10735,7 +10779,7 @@ - - if test $iface = no; then - echo $ac_n "checking for iface ifconf""... $ac_c" 1>&6 --echo "configure:10739: checking for iface ifconf" >&5 -+echo "configure:10783: checking for iface ifconf" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_IFACE_IFCONF'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -10744,7 +10788,7 @@ - samba_cv_HAVE_IFACE_IFCONF=cross - else - cat > conftest.$ac_ext <<EOF --#line 10748 "configure" -+#line 10792 "configure" - #include "confdefs.h" - - #define HAVE_IFACE_IFCONF 1 -@@ -10752,7 +10796,7 @@ - #include "confdefs.h" - #include "${srcdir-.}/lib/interfaces.c" - EOF --if { (eval echo configure:10756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_HAVE_IFACE_IFCONF=yes - else -@@ -10777,7 +10821,7 @@ - - if test $iface = no; then - echo $ac_n "checking for iface ifreq""... $ac_c" 1>&6 --echo "configure:10781: checking for iface ifreq" >&5 -+echo "configure:10825: checking for iface ifreq" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_IFACE_IFREQ'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -10786,7 +10830,7 @@ - samba_cv_HAVE_IFACE_IFREQ=cross - else - cat > conftest.$ac_ext <<EOF --#line 10790 "configure" -+#line 10834 "configure" - #include "confdefs.h" - - #define HAVE_IFACE_IFREQ 1 -@@ -10794,7 +10838,7 @@ - #include "confdefs.h" - #include "${srcdir-.}/lib/interfaces.c" - EOF --if { (eval echo configure:10798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_HAVE_IFACE_IFREQ=yes - else -@@ -10823,7 +10867,7 @@ - seteuid=no; - if test $seteuid = no; then - echo $ac_n "checking for setresuid""... $ac_c" 1>&6 --echo "configure:10827: checking for setresuid" >&5 -+echo "configure:10871: checking for setresuid" >&5 - if eval "test \"`echo '$''{'samba_cv_USE_SETRESUID'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -10832,7 +10876,7 @@ - samba_cv_USE_SETRESUID=cross - else - cat > conftest.$ac_ext <<EOF --#line 10836 "configure" -+#line 10880 "configure" - #include "confdefs.h" - - #define AUTOCONF_TEST 1 -@@ -10840,7 +10884,7 @@ - #include "confdefs.h" - #include "${srcdir-.}/lib/util_sec.c" - EOF --if { (eval echo configure:10844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_USE_SETRESUID=yes - else -@@ -10866,7 +10910,7 @@ - - if test $seteuid = no; then - echo $ac_n "checking for setreuid""... $ac_c" 1>&6 --echo "configure:10870: checking for setreuid" >&5 -+echo "configure:10914: checking for setreuid" >&5 - if eval "test \"`echo '$''{'samba_cv_USE_SETREUID'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -10875,7 +10919,7 @@ - samba_cv_USE_SETREUID=cross - else - cat > conftest.$ac_ext <<EOF --#line 10879 "configure" -+#line 10923 "configure" - #include "confdefs.h" - - #define AUTOCONF_TEST 1 -@@ -10883,7 +10927,7 @@ - #include "confdefs.h" - #include "${srcdir-.}/lib/util_sec.c" - EOF --if { (eval echo configure:10887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_USE_SETREUID=yes - else -@@ -10908,7 +10952,7 @@ - - if test $seteuid = no; then - echo $ac_n "checking for seteuid""... $ac_c" 1>&6 --echo "configure:10912: checking for seteuid" >&5 -+echo "configure:10956: checking for seteuid" >&5 - if eval "test \"`echo '$''{'samba_cv_USE_SETEUID'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -10917,7 +10961,7 @@ - samba_cv_USE_SETEUID=cross - else - cat > conftest.$ac_ext <<EOF --#line 10921 "configure" -+#line 10965 "configure" - #include "confdefs.h" - - #define AUTOCONF_TEST 1 -@@ -10925,7 +10969,7 @@ - #include "confdefs.h" - #include "${srcdir-.}/lib/util_sec.c" - EOF --if { (eval echo configure:10929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_USE_SETEUID=yes - else -@@ -10950,7 +10994,7 @@ - - if test $seteuid = no; then - echo $ac_n "checking for setuidx""... $ac_c" 1>&6 --echo "configure:10954: checking for setuidx" >&5 -+echo "configure:10998: checking for setuidx" >&5 - if eval "test \"`echo '$''{'samba_cv_USE_SETUIDX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -10959,7 +11003,7 @@ - samba_cv_USE_SETUIDX=cross - else - cat > conftest.$ac_ext <<EOF --#line 10963 "configure" -+#line 11007 "configure" - #include "confdefs.h" - - #define AUTOCONF_TEST 1 -@@ -10967,7 +11011,7 @@ - #include "confdefs.h" - #include "${srcdir-.}/lib/util_sec.c" - EOF --if { (eval echo configure:10971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_USE_SETUIDX=yes - else -@@ -10992,7 +11036,7 @@ - - - echo $ac_n "checking for working mmap""... $ac_c" 1>&6 --echo "configure:10996: checking for working mmap" >&5 -+echo "configure:11040: checking for working mmap" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_MMAP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -11001,11 +11045,11 @@ - samba_cv_HAVE_MMAP=cross - else - cat > conftest.$ac_ext <<EOF --#line 11005 "configure" -+#line 11049 "configure" - #include "confdefs.h" - #include "${srcdir-.}/tests/shared_mmap.c" - EOF --if { (eval echo configure:11009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_HAVE_MMAP=yes - else -@@ -11028,7 +11072,7 @@ - fi - - echo $ac_n "checking for ftruncate needs root""... $ac_c" 1>&6 --echo "configure:11032: checking for ftruncate needs root" >&5 -+echo "configure:11076: checking for ftruncate needs root" >&5 - if eval "test \"`echo '$''{'samba_cv_FTRUNCATE_NEEDS_ROOT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -11037,11 +11081,11 @@ - samba_cv_FTRUNCATE_NEEDS_ROOT=cross - else - cat > conftest.$ac_ext <<EOF --#line 11041 "configure" -+#line 11085 "configure" - #include "confdefs.h" - #include "${srcdir-.}/tests/ftruncroot.c" - EOF --if { (eval echo configure:11045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_FTRUNCATE_NEEDS_ROOT=yes - else -@@ -11064,7 +11108,7 @@ - fi - - echo $ac_n "checking for fcntl locking""... $ac_c" 1>&6 --echo "configure:11068: checking for fcntl locking" >&5 -+echo "configure:11112: checking for fcntl locking" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_FCNTL_LOCK'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -11073,11 +11117,11 @@ - samba_cv_HAVE_FCNTL_LOCK=cross - else - cat > conftest.$ac_ext <<EOF --#line 11077 "configure" -+#line 11121 "configure" - #include "confdefs.h" - #include "${srcdir-.}/tests/fcntl_lock.c" - EOF --if { (eval echo configure:11081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_HAVE_FCNTL_LOCK=yes - else -@@ -11100,7 +11144,7 @@ - fi - - echo $ac_n "checking for broken (glibc2.1/x86) 64 bit fcntl locking""... $ac_c" 1>&6 --echo "configure:11104: checking for broken (glibc2.1/x86) 64 bit fcntl locking" >&5 -+echo "configure:11148: checking for broken (glibc2.1/x86) 64 bit fcntl locking" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_BROKEN_FCNTL64_LOCKS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -11109,11 +11153,11 @@ - samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=cross - else - cat > conftest.$ac_ext <<EOF --#line 11113 "configure" -+#line 11157 "configure" - #include "confdefs.h" - #include "${srcdir-.}/tests/fcntl_lock64.c" - EOF --if { (eval echo configure:11117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=yes - else -@@ -11138,7 +11182,7 @@ - - - echo $ac_n "checking for 64 bit fcntl locking""... $ac_c" 1>&6 --echo "configure:11142: checking for 64 bit fcntl locking" >&5 -+echo "configure:11186: checking for 64 bit fcntl locking" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_STRUCT_FLOCK64'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -11147,7 +11191,7 @@ - samba_cv_HAVE_STRUCT_FLOCK64=cross - else - cat > conftest.$ac_ext <<EOF --#line 11151 "configure" -+#line 11195 "configure" - #include "confdefs.h" - - #if defined(HAVE_UNISTD_H) -@@ -11171,7 +11215,7 @@ - #endif - } - EOF --if { (eval echo configure:11175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_HAVE_STRUCT_FLOCK64=yes - else -@@ -11196,13 +11240,13 @@ - fi - - echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 --echo "configure:11200: checking for st_blocks in struct stat" >&5 -+echo "configure:11244: checking for st_blocks in struct stat" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_STAT_ST_BLOCKS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 11206 "configure" -+#line 11250 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/stat.h> -@@ -11211,7 +11255,7 @@ - struct stat st; st.st_blocks = 0; - ; return 0; } - EOF --if { (eval echo configure:11215: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_HAVE_STAT_ST_BLOCKS=yes - else -@@ -11234,13 +11278,13 @@ - case "$host_os" in - *linux*) - echo $ac_n "checking for broken RedHat 7.2 system header files""... $ac_c" 1>&6 --echo "configure:11238: checking for broken RedHat 7.2 system header files" >&5 -+echo "configure:11282: checking for broken RedHat 7.2 system header files" >&5 - if eval "test \"`echo '$''{'samba_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 11244 "configure" -+#line 11288 "configure" - #include "confdefs.h" - - #ifdef HAVE_SYS_VFS_H -@@ -11254,7 +11298,7 @@ - int i; - ; return 0; } - EOF --if { (eval echo configure:11258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS=no - else -@@ -11277,13 +11321,13 @@ - esac - - echo $ac_n "checking for broken nisplus include files""... $ac_c" 1>&6 --echo "configure:11281: checking for broken nisplus include files" >&5 -+echo "configure:11325: checking for broken nisplus include files" >&5 - if eval "test \"`echo '$''{'samba_cv_BROKEN_NISPLUS_INCLUDE_FILES'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 11287 "configure" -+#line 11331 "configure" - #include "confdefs.h" - #include <sys/acl.h> - #if defined(HAVE_RPCSVC_NIS_H) -@@ -11293,7 +11337,7 @@ - int i; - ; return 0; } - EOF --if { (eval echo configure:11297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11341: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_BROKEN_NISPLUS_INCLUDE_FILES=no - else -@@ -11317,7 +11361,7 @@ - ################################################# - # check for smbwrapper support - echo $ac_n "checking whether to use smbwrapper""... $ac_c" 1>&6 --echo "configure:11321: checking whether to use smbwrapper" >&5 -+echo "configure:11365: checking whether to use smbwrapper" >&5 - # Check whether --with-smbwrapper or --without-smbwrapper was given. - if test "${with_smbwrapper+set}" = set; then - withval="$with_smbwrapper" -@@ -11361,7 +11405,7 @@ - ################################################# - # check for the AFS filesystem - echo $ac_n "checking whether to use AFS""... $ac_c" 1>&6 --echo "configure:11365: checking whether to use AFS" >&5 -+echo "configure:11409: checking whether to use AFS" >&5 - # Check whether --with-afs or --without-afs was given. - if test "${with_afs+set}" = set; then - withval="$with_afs" -@@ -11387,7 +11431,7 @@ - ################################################# - # check for the DFS auth system - echo $ac_n "checking whether to use DCE/DFS auth""... $ac_c" 1>&6 --echo "configure:11391: checking whether to use DCE/DFS auth" >&5 -+echo "configure:11435: checking whether to use DCE/DFS auth" >&5 - # Check whether --with-dfs or --without-dfs was given. - if test "${with_dfs+set}" = set; then - withval="$with_dfs" -@@ -11412,7 +11456,7 @@ - ################################################# - # check for Kerberos IV auth system - echo $ac_n "checking whether to use Kerberos IV""... $ac_c" 1>&6 --echo "configure:11416: checking whether to use Kerberos IV" >&5 -+echo "configure:11460: checking whether to use Kerberos IV" >&5 - # Check whether --with-krb4 or --without-krb4 was given. - if test "${with_krb4+set}" = set; then - withval="$with_krb4" -@@ -11424,7 +11468,7 @@ - EOF - - echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6 --echo "configure:11428: checking for dn_expand in -lresolv" >&5 -+echo "configure:11472: checking for dn_expand in -lresolv" >&5 - ac_lib_var=`echo resolv'_'dn_expand | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -11432,7 +11476,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lresolv $LIBS" - cat > conftest.$ac_ext <<EOF --#line 11436 "configure" -+#line 11480 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -11443,7 +11487,7 @@ - dn_expand() - ; return 0; } - EOF --if { (eval echo configure:11447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -11487,7 +11531,7 @@ - ################################################# - # check for Kerberos 5 auth system - echo $ac_n "checking whether to use Kerberos 5""... $ac_c" 1>&6 --echo "configure:11491: checking whether to use Kerberos 5" >&5 -+echo "configure:11535: checking whether to use Kerberos 5" >&5 - # Check whether --with-krb5 or --without-krb5 was given. - if test "${with_krb5+set}" = set; then - withval="$with_krb5" -@@ -11515,7 +11559,7 @@ - ################################################# - # check for automount support - echo $ac_n "checking whether to use AUTOMOUNT""... $ac_c" 1>&6 --echo "configure:11519: checking whether to use AUTOMOUNT" >&5 -+echo "configure:11563: checking whether to use AUTOMOUNT" >&5 - # Check whether --with-automount or --without-automount was given. - if test "${with_automount+set}" = set; then - withval="$with_automount" -@@ -11540,7 +11584,7 @@ - ################################################# - # check for smbmount support - echo $ac_n "checking whether to use SMBMOUNT""... $ac_c" 1>&6 --echo "configure:11544: checking whether to use SMBMOUNT" >&5 -+echo "configure:11588: checking whether to use SMBMOUNT" >&5 - # Check whether --with-smbmount or --without-smbmount was given. - if test "${with_smbmount+set}" = set; then - withval="$with_smbmount" -@@ -11577,7 +11621,7 @@ - # check for a PAM password database - with_pam_for_crypt=no - echo $ac_n "checking whether to use PAM password database""... $ac_c" 1>&6 --echo "configure:11581: checking whether to use PAM password database" >&5 -+echo "configure:11625: checking whether to use PAM password database" >&5 - # Check whether --with-pam or --without-pam was given. - if test "${with_pam+set}" = set; then - withval="$with_pam" -@@ -11603,7 +11647,7 @@ - - # we can't build a pam module if we don't have pam. - echo $ac_n "checking for pam_get_data in -lpam""... $ac_c" 1>&6 --echo "configure:11607: checking for pam_get_data in -lpam" >&5 -+echo "configure:11651: checking for pam_get_data in -lpam" >&5 - ac_lib_var=`echo pam'_'pam_get_data | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -11611,7 +11655,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lpam $LIBS" - cat > conftest.$ac_ext <<EOF --#line 11615 "configure" -+#line 11659 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -11622,7 +11666,7 @@ - pam_get_data() - ; return 0; } - EOF --if { (eval echo configure:11626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -11649,7 +11693,7 @@ - ################################################# - # check for pam_smbpass support - echo $ac_n "checking whether to use pam_smbpass""... $ac_c" 1>&6 --echo "configure:11653: checking whether to use pam_smbpass" >&5 -+echo "configure:11697: checking whether to use pam_smbpass" >&5 - # Check whether --with-pam_smbpass or --without-pam_smbpass was given. - if test "${with_pam_smbpass+set}" = set; then - withval="$with_pam_smbpass" -@@ -11691,12 +11735,12 @@ - for ac_func in crypt - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:11695: checking for $ac_func" >&5 -+echo "configure:11739: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11700 "configure" -+#line 11744 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -11719,7 +11763,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:11723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -11745,7 +11789,7 @@ - - if test x"$ac_cv_func_crypt" = x"no"; then - echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 --echo "configure:11749: checking for crypt in -lcrypt" >&5 -+echo "configure:11793: checking for crypt in -lcrypt" >&5 - ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -11753,7 +11797,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lcrypt $LIBS" - cat > conftest.$ac_ext <<EOF --#line 11757 "configure" -+#line 11801 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -11764,7 +11808,7 @@ - crypt() - ; return 0; } - EOF --if { (eval echo configure:11768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -11799,7 +11843,7 @@ - ## - if test $with_pam_for_crypt = no; then - echo $ac_n "checking for a crypt that needs truncated salt""... $ac_c" 1>&6 --echo "configure:11803: checking for a crypt that needs truncated salt" >&5 -+echo "configure:11847: checking for a crypt that needs truncated salt" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_TRUNCATED_SALT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -11808,11 +11852,11 @@ - samba_cv_HAVE_TRUNCATED_SALT=cross - else - cat > conftest.$ac_ext <<EOF --#line 11812 "configure" -+#line 11856 "configure" - #include "confdefs.h" - #include "${srcdir-.}/tests/crypttest.c" - EOF --if { (eval echo configure:11816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - samba_cv_HAVE_TRUNCATED_SALT=no - else -@@ -11850,7 +11894,7 @@ - ################################################# - # check for a TDB password database - echo $ac_n "checking whether to use TDB SAM database""... $ac_c" 1>&6 --echo "configure:11854: checking whether to use TDB SAM database" >&5 -+echo "configure:11898: checking whether to use TDB SAM database" >&5 - # Check whether --with-tdbsam or --without-tdbsam was given. - if test "${with_tdbsam+set}" = set; then - withval="$with_tdbsam" -@@ -11876,7 +11920,7 @@ - ################################################# - # check for a LDAP password database - echo $ac_n "checking whether to use LDAP SAM database""... $ac_c" 1>&6 --echo "configure:11880: checking whether to use LDAP SAM database" >&5 -+echo "configure:11924: checking whether to use LDAP SAM database" >&5 - # Check whether --with-ldapsam or --without-ldapsam was given. - if test "${with_ldapsam+set}" = set; then - withval="$with_ldapsam" -@@ -11903,7 +11947,7 @@ - ################################################# - # check for a NISPLUS password database - echo $ac_n "checking whether to use NISPLUS SAM database""... $ac_c" 1>&6 --echo "configure:11907: checking whether to use NISPLUS SAM database" >&5 -+echo "configure:11951: checking whether to use NISPLUS SAM database" >&5 - # Check whether --with-nisplussam or --without-nisplussam was given. - if test "${with_nisplussam+set}" = set; then - withval="$with_nisplussam" -@@ -11931,7 +11975,7 @@ - # smbpasswd SAM is only used if another format - # has not been defined - echo $ac_n "checking whether to use traditional smbpasswd file""... $ac_c" 1>&6 --echo "configure:11935: checking whether to use traditional smbpasswd file" >&5 -+echo "configure:11979: checking whether to use traditional smbpasswd file" >&5 - if test $with_smbpasswd_sam = yes; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -@@ -11953,7 +11997,7 @@ - ################################################# - # check for a NISPLUS_HOME support - echo $ac_n "checking whether to use NISPLUS_HOME""... $ac_c" 1>&6 --echo "configure:11957: checking whether to use NISPLUS_HOME" >&5 -+echo "configure:12001: checking whether to use NISPLUS_HOME" >&5 - # Check whether --with-nisplus-home or --without-nisplus-home was given. - if test "${with_nisplus_home+set}" = set; then - withval="$with_nisplus_home" -@@ -11978,7 +12022,7 @@ - ################################################# - # check for the secure socket layer - echo $ac_n "checking whether to use SSL""... $ac_c" 1>&6 --echo "configure:11982: checking whether to use SSL" >&5 -+echo "configure:12026: checking whether to use SSL" >&5 - # Check whether --with-ssl or --without-ssl was given. - if test "${with_ssl+set}" = set; then - withval="$with_ssl" -@@ -12052,7 +12096,7 @@ - ################################################# - # check for syslog logging - echo $ac_n "checking whether to use syslog logging""... $ac_c" 1>&6 --echo "configure:12056: checking whether to use syslog logging" >&5 -+echo "configure:12100: checking whether to use syslog logging" >&5 - # Check whether --with-syslog or --without-syslog was given. - if test "${with_syslog+set}" = set; then - withval="$with_syslog" -@@ -12077,7 +12121,7 @@ - ################################################# - # check for a shared memory profiling support - echo $ac_n "checking whether to use profiling""... $ac_c" 1>&6 --echo "configure:12081: checking whether to use profiling" >&5 -+echo "configure:12125: checking whether to use profiling" >&5 - # Check whether --with-profiling-data or --without-profiling-data was given. - if test "${with_profiling_data+set}" = set; then - withval="$with_profiling_data" -@@ -12105,7 +12149,7 @@ - QUOTAOBJS=smbd/noquotas.o - - echo $ac_n "checking whether to support disk-quotas""... $ac_c" 1>&6 --echo "configure:12109: checking whether to support disk-quotas" >&5 -+echo "configure:12153: checking whether to support disk-quotas" >&5 - # Check whether --with-quotas or --without-quotas was given. - if test "${with_quotas+set}" = set; then - withval="$with_quotas" -@@ -12117,13 +12161,13 @@ - *linux*) - # Check for kernel 2.4.x quota braindamage... - echo $ac_n "checking for linux 2.4.x quota braindamage..""... $ac_c" 1>&6 --echo "configure:12121: checking for linux 2.4.x quota braindamage.." >&5 -+echo "configure:12165: checking for linux 2.4.x quota braindamage.." >&5 - if eval "test \"`echo '$''{'samba_cv_linux_2_4_quota_braindamage'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 12127 "configure" -+#line 12171 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <sys/types.h> -@@ -12135,7 +12179,7 @@ - struct mem_dqblk D; - ; return 0; } - EOF --if { (eval echo configure:12139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12183: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_linux_2_4_quota_braindamage=yes - else -@@ -12179,7 +12223,7 @@ - # check for experimental utmp accounting - - echo $ac_n "checking whether to support utmp accounting""... $ac_c" 1>&6 --echo "configure:12183: checking whether to support utmp accounting" >&5 -+echo "configure:12227: checking whether to support utmp accounting" >&5 - # Check whether --with-utmp or --without-utmp was given. - if test "${with_utmp+set}" = set; then - withval="$with_utmp" -@@ -12205,7 +12249,7 @@ - # check for MS Dfs support - - echo $ac_n "checking whether to support Microsoft Dfs""... $ac_c" 1>&6 --echo "configure:12209: checking whether to support Microsoft Dfs" >&5 -+echo "configure:12253: checking whether to support Microsoft Dfs" >&5 - # Check whether --with-msdfs or --without-msdfs was given. - if test "${with_msdfs+set}" = set; then - withval="$with_msdfs" -@@ -12231,7 +12275,7 @@ - # check for Samba VFS support - - echo $ac_n "checking whether to support the experimental Samba vfs""... $ac_c" 1>&6 --echo "configure:12235: checking whether to support the experimental Samba vfs" >&5 -+echo "configure:12279: checking whether to support the experimental Samba vfs" >&5 - # Check whether --with-vfs or --without-vfs was given. - if test "${with_vfs+set}" = set; then - withval="$with_vfs" -@@ -12258,9 +12302,9 @@ - # should we build libsmbclient? - - LIBSMBCLIENT_SHARED= --LIBSMBCLIENT= -+LIBSMBCLIENT_STATIC= - echo $ac_n "checking whether to build the libsmbclient shared library""... $ac_c" 1>&6 --echo "configure:12264: checking whether to build the libsmbclient shared library" >&5 -+echo "configure:12308: checking whether to build the libsmbclient shared library" >&5 - # Check whether --with-libsmbclient or --without-libsmbclient was given. - if test "${with_libsmbclient+set}" = set; then - withval="$with_libsmbclient" -@@ -12268,10 +12312,10 @@ - yes) - if test $BLDSHARED = true; then - LIBSMBCLIENT_SHARED=bin/libsmbclient.$SHLIBEXT -- LIBSMBCLIENT=libsmbclient -+ LIBSMBCLIENT_STATIC=bin/libsmbclient.a - echo "$ac_t""yes" 1>&6 - else -- echo "$ac_t""no shared library support" 1>&6 -+ echo "$ac_t""no static or shared libsmbclient support" 1>&6 - fi - ;; - *) -@@ -12287,14 +12331,14 @@ - ################################################# - # these tests are taken from the GNU fileutils package - echo "checking how to get filesystem space usage" 1>&6 --echo "configure:12291: checking how to get filesystem space usage" >&5 -+echo "configure:12335: checking how to get filesystem space usage" >&5 - space=no - - # Test for statvfs64. - if test $space = no; then - # SVR4 - echo $ac_n "checking statvfs64 function (SVR4)""... $ac_c" 1>&6 --echo "configure:12298: checking statvfs64 function (SVR4)" >&5 -+echo "configure:12342: checking statvfs64 function (SVR4)" >&5 - if eval "test \"`echo '$''{'fu_cv_sys_stat_statvfs64'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -12302,7 +12346,7 @@ - fu_cv_sys_stat_statvfs64=cross - else - cat > conftest.$ac_ext <<EOF --#line 12306 "configure" -+#line 12350 "configure" - #include "confdefs.h" - - #if defined(HAVE_UNISTD_H) -@@ -12316,7 +12360,7 @@ - exit (statvfs64 (".", &fsd)); - } - EOF --if { (eval echo configure:12320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:12364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - fu_cv_sys_stat_statvfs64=yes - else -@@ -12349,12 +12393,12 @@ - if test $space = no; then - # SVR4 - echo $ac_n "checking statvfs function (SVR4)""... $ac_c" 1>&6 --echo "configure:12353: checking statvfs function (SVR4)" >&5 -+echo "configure:12397: checking statvfs function (SVR4)" >&5 - if eval "test \"`echo '$''{'fu_cv_sys_stat_statvfs'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 12358 "configure" -+#line 12402 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/statvfs.h> -@@ -12362,7 +12406,7 @@ - struct statvfs fsd; statvfs (0, &fsd); - ; return 0; } - EOF --if { (eval echo configure:12366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:12410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - fu_cv_sys_stat_statvfs=yes - else -@@ -12387,7 +12431,7 @@ - if test $space = no; then - # DEC Alpha running OSF/1 - echo $ac_n "checking for 3-argument statfs function (DEC OSF/1)""... $ac_c" 1>&6 --echo "configure:12391: checking for 3-argument statfs function (DEC OSF/1)" >&5 -+echo "configure:12435: checking for 3-argument statfs function (DEC OSF/1)" >&5 - if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs3_osf1'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -12395,7 +12439,7 @@ - fu_cv_sys_stat_statfs3_osf1=no - else - cat > conftest.$ac_ext <<EOF --#line 12399 "configure" -+#line 12443 "configure" - #include "confdefs.h" - - #include <sys/param.h> -@@ -12408,7 +12452,7 @@ - exit (statfs (".", &fsd, sizeof (struct statfs))); - } - EOF --if { (eval echo configure:12412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:12456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - fu_cv_sys_stat_statfs3_osf1=yes - else -@@ -12435,7 +12479,7 @@ - if test $space = no; then - # AIX - echo $ac_n "checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)""... $ac_c" 1>&6 --echo "configure:12439: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5 -+echo "configure:12483: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5 - if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs2_bsize'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -12443,7 +12487,7 @@ - fu_cv_sys_stat_statfs2_bsize=no - else - cat > conftest.$ac_ext <<EOF --#line 12447 "configure" -+#line 12491 "configure" - #include "confdefs.h" - - #ifdef HAVE_SYS_PARAM_H -@@ -12462,7 +12506,7 @@ - exit (statfs (".", &fsd)); - } - EOF --if { (eval echo configure:12466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:12510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - fu_cv_sys_stat_statfs2_bsize=yes - else -@@ -12489,7 +12533,7 @@ - if test $space = no; then - # SVR3 - echo $ac_n "checking for four-argument statfs (AIX-3.2.5, SVR3)""... $ac_c" 1>&6 --echo "configure:12493: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5 -+echo "configure:12537: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5 - if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs4'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -12497,7 +12541,7 @@ - fu_cv_sys_stat_statfs4=no - else - cat > conftest.$ac_ext <<EOF --#line 12501 "configure" -+#line 12545 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/statfs.h> -@@ -12507,7 +12551,7 @@ - exit (statfs (".", &fsd, sizeof fsd, 0)); - } - EOF --if { (eval echo configure:12511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:12555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - fu_cv_sys_stat_statfs4=yes - else -@@ -12534,7 +12578,7 @@ - if test $space = no; then - # 4.4BSD and NetBSD - echo $ac_n "checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)""... $ac_c" 1>&6 --echo "configure:12538: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5 -+echo "configure:12582: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5 - if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs2_fsize'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -12542,7 +12586,7 @@ - fu_cv_sys_stat_statfs2_fsize=no - else - cat > conftest.$ac_ext <<EOF --#line 12546 "configure" -+#line 12590 "configure" - #include "confdefs.h" - #include <sys/types.h> - #ifdef HAVE_SYS_PARAM_H -@@ -12558,7 +12602,7 @@ - exit (statfs (".", &fsd)); - } - EOF --if { (eval echo configure:12562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:12606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - fu_cv_sys_stat_statfs2_fsize=yes - else -@@ -12585,7 +12629,7 @@ - if test $space = no; then - # Ultrix - echo $ac_n "checking for two-argument statfs with struct fs_data (Ultrix)""... $ac_c" 1>&6 --echo "configure:12589: checking for two-argument statfs with struct fs_data (Ultrix)" >&5 -+echo "configure:12633: checking for two-argument statfs with struct fs_data (Ultrix)" >&5 - if eval "test \"`echo '$''{'fu_cv_sys_stat_fs_data'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -12593,7 +12637,7 @@ - fu_cv_sys_stat_fs_data=no - else - cat > conftest.$ac_ext <<EOF --#line 12597 "configure" -+#line 12641 "configure" - #include "confdefs.h" - #include <sys/types.h> - #ifdef HAVE_SYS_PARAM_H -@@ -12613,7 +12657,7 @@ - exit (statfs (".", &fsd) != 1); - } - EOF --if { (eval echo configure:12617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:12661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - fu_cv_sys_stat_fs_data=yes - else -@@ -12646,9 +12690,9 @@ - # file support. - # - echo $ac_n "checking if large file support can be enabled""... $ac_c" 1>&6 --echo "configure:12650: checking if large file support can be enabled" >&5 -+echo "configure:12694: checking if large file support can be enabled" >&5 - cat > conftest.$ac_ext <<EOF --#line 12652 "configure" -+#line 12696 "configure" - #include "confdefs.h" - - #if defined(HAVE_LONGLONG) && (defined(HAVE_OFF64_T) || (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8))) -@@ -12661,7 +12705,7 @@ - int i - ; return 0; } - EOF --if { (eval echo configure:12665: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT=yes - else -@@ -12728,7 +12772,7 @@ - # check for ACL support - - echo $ac_n "checking whether to support ACLs""... $ac_c" 1>&6 --echo "configure:12732: checking whether to support ACLs" >&5 -+echo "configure:12776: checking whether to support ACLs" >&5 - # Check whether --with-acl-support or --without-acl-support was given. - if test "${with_acl_support+set}" = set; then - withval="$with_acl_support" -@@ -12781,7 +12825,7 @@ - ;; - *) - echo $ac_n "checking for acl_get_file in -lacl""... $ac_c" 1>&6 --echo "configure:12785: checking for acl_get_file in -lacl" >&5 -+echo "configure:12829: checking for acl_get_file in -lacl" >&5 - ac_lib_var=`echo acl'_'acl_get_file | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -12789,7 +12833,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lacl $LIBS" - cat > conftest.$ac_ext <<EOF --#line 12793 "configure" -+#line 12837 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -12800,7 +12844,7 @@ - acl_get_file() - ; return 0; } - EOF --if { (eval echo configure:12804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:12848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -12828,13 +12872,13 @@ - fi - - echo $ac_n "checking for ACL support""... $ac_c" 1>&6 --echo "configure:12832: checking for ACL support" >&5 -+echo "configure:12876: checking for ACL support" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_POSIX_ACLS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 12838 "configure" -+#line 12882 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/acl.h> -@@ -12842,7 +12886,7 @@ - acl_t acl; int entry_id; acl_entry_t *entry_p; return acl_get_entry( acl, entry_id, entry_p); - ; return 0; } - EOF --if { (eval echo configure:12846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:12890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - samba_cv_HAVE_POSIX_ACLS=yes - else -@@ -12862,13 +12906,13 @@ - EOF - - echo $ac_n "checking for acl_get_perm_np""... $ac_c" 1>&6 --echo "configure:12866: checking for acl_get_perm_np" >&5 -+echo "configure:12910: checking for acl_get_perm_np" >&5 - if eval "test \"`echo '$''{'samba_cv_HAVE_ACL_GET_PERM_NP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 12872 "configure" -+#line 12916 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/acl.h> -@@ -12876,7 +12920,7 @@ - acl_permset_t permset_d; acl_perm_t perm; return acl_get_perm_np( permset_d, perm); - ; return 0; } - EOF --if { (eval echo configure:12880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:12924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - samba_cv_HAVE_ACL_GET_PERM_NP=yes - else -@@ -12931,7 +12975,7 @@ - # (WINBIND_STARGETS) and shared libraries (WINBIND_LTARGETS). - - echo $ac_n "checking whether to build winbind""... $ac_c" 1>&6 --echo "configure:12935: checking whether to build winbind" >&5 -+echo "configure:12979: checking whether to build winbind" >&5 - - # Initially, the value of $host_os decides whether winbind is supported - -@@ -13010,11 +13054,11 @@ - : - else - cat > conftest.$ac_ext <<EOF --#line 13014 "configure" -+#line 13058 "configure" - #include "confdefs.h" - #include "${srcdir-.}/tests/summary.c" - EOF --if { (eval echo configure:13018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:13062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - echo "configure OK"; - else -@@ -13184,7 +13228,7 @@ - s%@SHLIBEXT@%$SHLIBEXT%g - s%@BLDSHARED@%$BLDSHARED%g - s%@LIBSMBCLIENT_SHARED@%$LIBSMBCLIENT_SHARED%g --s%@LIBSMBCLIENT@%$LIBSMBCLIENT%g -+s%@LIBSMBCLIENT_STATIC@%$LIBSMBCLIENT_STATIC%g - s%@CC@%$CC%g - s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g - s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g ---- samba-2.2.2.cvs20020120.orig/source/configure.in -+++ samba-2.2.2.cvs20020120/source/configure.in -@@ -145,7 +145,7 @@ - AC_SUBST(SHLIBEXT) - AC_SUBST(BLDSHARED) - AC_SUBST(LIBSMBCLIENT_SHARED) --AC_SUBST(LIBSMBCLIENT) -+AC_SUBST(LIBSMBCLIENT_STATIC) - - # compile with optimization and without debugging by default - CFLAGS="-O ${CFLAGS}" -@@ -340,6 +340,28 @@ +--- samba-2.2.4/source/configure.in.orig Thu May 2 00:10:02 2002 ++++ samba-2.2.4/source/configure.in Thu May 2 00:10:17 2002 +@@ -380,6 +380,28 @@ #endif } ], [LINUX_LFS_SUPPORT=yes], [LINUX_LFS_SUPPORT=no], [LINUX_LFS_SUPPORT=cross]) @@ -6020,25 +29,3 @@ CPPFLAGS="$old_CPPFLAGS" if test x$LINUX_LFS_SUPPORT = xyes ; then CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS" -@@ -2232,7 +2254,7 @@ - # should we build libsmbclient? - - LIBSMBCLIENT_SHARED= --LIBSMBCLIENT= -+LIBSMBCLIENT_STATIC= - AC_MSG_CHECKING(whether to build the libsmbclient shared library) - AC_ARG_WITH(libsmbclient, - [ --with-libsmbclient Build the libsmbclient shared library (default=no)], -@@ -2240,10 +2262,10 @@ - yes) - if test $BLDSHARED = true; then - LIBSMBCLIENT_SHARED=bin/libsmbclient.$SHLIBEXT -- LIBSMBCLIENT=libsmbclient -+ LIBSMBCLIENT_STATIC=bin/libsmbclient.a - AC_MSG_RESULT(yes) - else -- AC_MSG_RESULT(no shared library support) -+ AC_MSG_RESULT(no static or shared libsmbclient support) - fi - ;; - *) diff --git a/packaging/Debian/debian/patches/fhs.patch b/packaging/Debian/debian/patches/fhs.patch new file mode 100644 index 00000000000..f335474a7fc --- /dev/null +++ b/packaging/Debian/debian/patches/fhs.patch @@ -0,0 +1,2466 @@ +diff -uNr --exclude=debian samba/source/Makefile.in samba-2.2.4/source/Makefile.in +--- samba/source/Makefile.in Wed May 1 23:13:15 2002 ++++ samba-2.2.4/source/Makefile.in Thu May 2 01:00:13 2002 +@@ -83,7 +83,7 @@ + FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DLOGFILEBASE=\"$(LOGFILEBASE)\" + FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" + FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\" +-FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\" -DPIDDIR=\"$(PIDDIR)\" -DLIBDIR=\"$(LIBDIR)\" ++FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\" -DPIDDIR=\"$(PIDDIR)\" -DLIBDIR=\"$(LIBDIR)\" -DVARDIR=\"$(VARDIR)\" + FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H + FLAGS = $(ISA) $(FLAGS5) $(PASSWD_FLAGS) + FLAGS32 = $(ISA32) $(FLAGS5) $(PASSWD_FLAGS) +diff -uNr --exclude=debian samba/source/acconfig.h samba-2.2.4/source/acconfig.h +--- samba/source/acconfig.h Wed May 1 23:13:15 2002 ++++ samba-2.2.4/source/acconfig.h Thu May 2 01:00:33 2002 +@@ -176,6 +176,7 @@ + #undef HAVE_DEVICE_MAJOR_FN + #undef HAVE_DEVICE_MINOR_FN + #undef HAVE_MAKEDEV_FN ++#undef FHS_COMPATIBLE + #undef HAVE_GETGROUPS_TOO_MANY_EGIDS + /* + * Add these definitions to allow VFS modules to +diff -uNr --exclude=debian samba/source/configure.in samba-2.2.4/source/configure.in +--- samba/source/configure.in Wed May 1 23:13:57 2002 ++++ samba-2.2.4/source/configure.in Thu May 2 01:01:58 2002 +@@ -12,11 +12,12 @@ + [ --with-fhs Use FHS-compliant paths (default=no)], + codepagedir="\$(DATADIR)/samba/codepages" + configdir="${sysconfdir}/samba" +- lockdir="\${VARDIR}/cache/samba" ++ lockdir="\${VARDIR}/run/samba" + piddir="\$(VARDIR)/run/samba" + logfilebase="\${VARDIR}/log/samba" + privatedir="\${CONFIGDIR}/private" +- swatdir="\${DATADIR}/samba/swat", ++ swatdir="\${DATADIR}/samba/swat" ++ AC_DEFINE(FHS_COMPATIBLE), + codepagedir="\$(LIBDIR)/codepages" + configdir="\$(LIBDIR)" + logfilebase="\$(VARDIR)" +diff -uNr --exclude=debian samba/source/include/config.h.in samba-2.2.4/source/include/config.h.in +--- samba/source/include/config.h.in Wed May 1 23:14:00 2002 ++++ samba-2.2.4/source/include/config.h.in Thu May 2 01:02:36 2002 +@@ -242,6 +242,7 @@ + #undef HAVE_DEVICE_MAJOR_FN + #undef HAVE_DEVICE_MINOR_FN + #undef HAVE_MAKEDEV_FN ++#undef FHS_COMPATIBLE + #undef HAVE_GETGROUPS_TOO_MANY_EGIDS + /* + * Add these definitions to allow VFS modules to +diff -uNr --exclude=debian samba/source/include/local.h samba-2.2.4/source/include/local.h +--- samba/source/include/local.h Sat Feb 2 16:02:43 2002 ++++ samba-2.2.4/source/include/local.h Thu May 2 01:03:45 2002 +@@ -189,4 +189,20 @@ + /* Allocation roundup. */ + #define SMB_ROUNDUP_ALLOCATION_SIZE 0x100000 + ++/* FHS-compatible directory defines */ ++#ifdef FHS_COMPATIBLE ++#ifndef CACHEDIR ++#define CACHEDIR VARDIR "/cache/samba" ++#endif ++#ifndef STATEDIR ++#define STATEDIR VARDIR "/lib/samba" ++#endif ++ ++#else ++ ++#define CACHEDIR lp_lockdir() ++#define STATEDIR lp_lockdir() ++ ++#endif ++ + #endif +diff -uNr --exclude=debian samba/source/lib/util.c samba-2.2.4/source/lib/util.c +--- samba/source/lib/util.c Wed May 1 23:14:23 2002 ++++ samba-2.2.4/source/lib/util.c Thu May 2 01:08:20 2002 +@@ -1856,6 +1856,46 @@ + return fname; + } + ++/***************************************************************** ++a useful function for returning a path in the Samba state directory ++ *****************************************************************/ ++char *state_path(char *name) ++{ ++ static pstring fname; ++ ++ pstrcpy(fname,STATEDIR); ++ trim_string(fname,"","/"); ++ ++ if (!directory_exist(fname,NULL)) { ++ mkdir(fname,0755); ++ } ++ ++ pstrcat(fname,"/"); ++ pstrcat(fname,name); ++ ++ return fname; ++} ++ ++/***************************************************************** ++a useful function for returning a path in the Samba cache directory ++ *****************************************************************/ ++char *cache_path(char *name) ++{ ++ static pstring fname; ++ ++ pstrcpy(fname,CACHEDIR); ++ trim_string(fname,"","/"); ++ ++ if (!directory_exist(fname,NULL)) { ++ mkdir(fname,0755); ++ } ++ ++ pstrcat(fname,"/"); ++ pstrcat(fname,name); ++ ++ return fname; ++} ++ + /******************************************************************* + Given a filename - get its directory name + NB: Returned in static storage. Caveats: +diff -uNr --exclude=debian samba/source/nmbd/nmbd_serverlistdb.c samba-2.2.4/source/nmbd/nmbd_serverlistdb.c +--- samba/source/nmbd/nmbd_serverlistdb.c Sat Feb 2 16:02:55 2002 ++++ samba-2.2.4/source/nmbd/nmbd_serverlistdb.c Thu May 2 01:09:23 2002 +@@ -348,7 +348,7 @@ + + updatecount++; + +- pstrcpy(fname,lp_lockdir()); ++ pstrcpy(fname,CACHEDIR); + trim_string(fname,NULL,"/"); + pstrcat(fname,"/"); + pstrcat(fname,SERVER_LIST); +diff -uNr --exclude=debian samba/source/nmbd/nmbd_winsserver.c samba-2.2.4/source/nmbd/nmbd_winsserver.c +--- samba/source/nmbd/nmbd_winsserver.c Wed May 1 23:14:38 2002 ++++ samba-2.2.4/source/nmbd/nmbd_winsserver.c Thu May 2 01:10:42 2002 +@@ -178,7 +178,7 @@ + + add_samba_names_to_subnet(wins_server_subnet); + +- if((fp = sys_fopen(lock_path(WINS_LIST),"r")) == NULL) ++ if((fp = sys_fopen(state_path(WINS_LIST),"r")) == NULL) + { + DEBUG(2,("initialise_wins: Can't open wins database file %s. Error was %s\n", + WINS_LIST, strerror(errno) )); +diff -uNr --exclude=debian samba/source/nsswitch/winbindd_cache.c samba-2.2.4/source/nsswitch/winbindd_cache.c +--- samba/source/nsswitch/winbindd_cache.c Wed May 1 23:14:43 2002 ++++ samba-2.2.4/source/nsswitch/winbindd_cache.c Thu May 2 01:11:45 2002 +@@ -50,7 +50,7 @@ + } + if (opt_nocache) return; + +- wcache->tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), 5000, ++ wcache->tdb = tdb_open_log(cache_path("winbindd_cache.tdb"), 5000, + TDB_DEFAULT, O_RDWR | O_CREAT | O_TRUNC, 0600); + + if (!wcache->tdb) { +diff -uNr --exclude=debian samba/source/nsswitch/winbindd_idmap.c samba-2.2.4/source/nsswitch/winbindd_idmap.c +--- samba/source/nsswitch/winbindd_idmap.c Wed May 1 23:14:44 2002 ++++ samba-2.2.4/source/nsswitch/winbindd_idmap.c Thu May 2 01:12:51 2002 +@@ -427,14 +427,14 @@ + { + /* Open tdb cache */ + +- if (!(idmap_tdb = tdb_open_log(lock_path("winbindd_idmap.tdb"), 0, ++ if (!(idmap_tdb = tdb_open_log(state_path("winbindd_idmap.tdb"), 0, + TDB_DEFAULT, O_RDWR | O_CREAT, 0600))) { + DEBUG(0, ("winbindd_idmap_init: Unable to open idmap database\n")); + return False; + } + + /* possibly convert from an earlier version */ +- if (!idmap_convert(lock_path("winbindd_idmap.tdb"))) { ++ if (!idmap_convert(state_path("winbindd_idmap.tdb"))) { + DEBUG(0, ("winbindd_idmap_init: Unable to open idmap database\n")); + return False; + } +diff -uNr --exclude=debian samba/source/param/loadparm.c samba-2.2.4/source/param/loadparm.c +--- samba/source/param/loadparm.c Wed May 1 23:14:47 2002 ++++ samba-2.2.4/source/param/loadparm.c Thu May 2 01:20:33 2002 +@@ -107,6 +107,9 @@ + char *szAddPrinterCommand; + char *szDeletePrinterCommand; + char *szOs2DriverMap; ++#ifdef FHS_COMPATIBLE ++ char *szLockDirStub; ++#endif + char *szLockDir; + char *szPidDir; + char *szRootdir; +@@ -1023,8 +1026,13 @@ + {"config file", P_STRING, P_GLOBAL, &Globals.szConfigFile, NULL, NULL, FLAG_HIDE}, + {"preload", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_DOS_STRING}, + {"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_DOS_STRING}, ++#ifdef FHS_COMPATIBLE ++ {"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDirStub, NULL, NULL, 0}, ++ {"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDirStub, NULL, NULL, 0}, ++#else + {"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0}, + {"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0}, ++#endif + {"pid directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0}, + #ifdef WITH_UTMP + {"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, 0}, +diff -uNr --exclude=debian samba/source/printing/nt_printing.c samba-2.2.4/source/printing/nt_printing.c +--- samba/source/printing/nt_printing.c Wed May 1 23:14:51 2002 ++++ samba-2.2.4/source/printing/nt_printing.c Thu May 2 01:14:04 2002 +@@ -263,24 +263,24 @@ + if (tdb_drivers && tdb_printers && tdb_forms && local_pid == sys_getpid()) + return True; + +- tdb_drivers = tdb_open_log(lock_path("ntdrivers.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); ++ tdb_drivers = tdb_open_log(state_path("ntdrivers.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); + if (!tdb_drivers) { + DEBUG(0,("nt_printing_init: Failed to open nt drivers database %s (%s)\n", +- lock_path("ntdrivers.tdb"), strerror(errno) )); ++ state_path("ntdrivers.tdb"), strerror(errno) )); + return False; + } + +- tdb_printers = tdb_open_log(lock_path("ntprinters.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); ++ tdb_printers = tdb_open_log(state_path("ntprinters.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); + if (!tdb_printers) { + DEBUG(0,("nt_printing_init: Failed to open nt printers database %s (%s)\n", +- lock_path("ntprinters.tdb"), strerror(errno) )); ++ state_path("ntprinters.tdb"), strerror(errno) )); + return False; + } + +- tdb_forms = tdb_open_log(lock_path("ntforms.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); ++ tdb_forms = tdb_open_log(state_path("ntforms.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); + if (!tdb_forms) { + DEBUG(0,("nt_printing_init: Failed to open nt forms database %s (%s)\n", +- lock_path("ntforms.tdb"), strerror(errno) )); ++ state_path("ntforms.tdb"), strerror(errno) )); + return False; + } + +diff -uNr --exclude=debian samba/source/printing/printing.c samba-2.2.4/source/printing/printing.c +--- samba/source/printing/printing.c Wed May 1 23:14:52 2002 ++++ samba-2.2.4/source/printing/printing.c Thu May 2 01:15:27 2002 +@@ -55,10 +55,10 @@ + + if (tdb && local_pid == sys_getpid()) + return True; +- tdb = tdb_open_log(lock_path("printing.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); ++ tdb = tdb_open_log(cache_path("printing.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); + if (!tdb) { + DEBUG(0,("print_backend_init: Failed to open printing backend database %s.\n", +- lock_path("printing.tdb") )); ++ cache_path("printing.tdb") )); + return False; + } + local_pid = sys_getpid(); +diff -uNr --exclude=debian samba/source/rpc_server/srv_srvsvc_nt.c samba-2.2.4/source/rpc_server/srv_srvsvc_nt.c +--- samba/source/rpc_server/srv_srvsvc_nt.c Wed May 1 23:15:06 2002 ++++ samba-2.2.4/source/rpc_server/srv_srvsvc_nt.c Thu May 2 01:16:15 2002 +@@ -127,10 +127,10 @@ + + if (share_tdb && local_pid == sys_getpid()) + return True; +- share_tdb = tdb_open_log(lock_path("share_info.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); ++ share_tdb = tdb_open_log(state_path("share_info.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); + if (!share_tdb) { + DEBUG(0,("Failed to open share info database %s (%s)\n", +- lock_path("share_info.tdb"), strerror(errno) )); ++ state_path("share_info.tdb"), strerror(errno) )); + return False; + } + +diff -uNr --exclude=debian samba/source/smbd/lanman.c samba-2.2.4/source/smbd/lanman.c +--- samba/source/smbd/lanman.c Wed May 1 23:15:08 2002 ++++ samba-2.2.4/source/smbd/lanman.c Thu May 2 01:16:55 2002 +@@ -1109,9 +1109,9 @@ + BOOL local_list_only; + int i; + +- lines = file_lines_load(lock_path(SERVER_LIST), NULL, False); ++ lines = file_lines_load(cache_path(SERVER_LIST), NULL, False); + if (!lines) { +- DEBUG(4,("Can't open %s - %s\n",lock_path(SERVER_LIST),strerror(errno))); ++ DEBUG(4,("Can't open %s - %s\n",cache_path(SERVER_LIST),strerror(errno))); + return(0); + } + +diff -uNr --exclude=debian samba/source/include/proto.h samba-2.2.4/source/include/proto.h +--- samba/source/include/proto.h Wed May 1 23:14:14 2002 ++++ samba-2.2.4/source/include/proto.h Thu May 2 01:28:16 2002 +@@ -181,134 +181,650 @@ + void CatchChild(void); + void CatchChildLeaveStatus(void); + +-/* The following definitions come from libsmb/cliconnect.c */ ++/* The following definitions come from lib/smbrun.c */ + +-BOOL cli_session_setup(struct cli_state *cli, +- char *user, +- char *pass, int passlen, +- char *ntpass, int ntpasslen, +- char *workgroup); +-BOOL cli_ulogoff(struct cli_state *cli); +-BOOL cli_send_tconX(struct cli_state *cli, +- const char *share, const char *dev, const char *pass, int passlen); +-BOOL cli_tdis(struct cli_state *cli); +-void cli_negprot_send(struct cli_state *cli); +-BOOL cli_negprot(struct cli_state *cli); +-BOOL cli_session_request(struct cli_state *cli, +- struct nmb_name *calling, struct nmb_name *called); +-BOOL cli_connect(struct cli_state *cli, const char *host, struct in_addr *ip); +-BOOL cli_establish_connection(struct cli_state *cli, +- char *dest_host, struct in_addr *dest_ip, +- struct nmb_name *calling, struct nmb_name *called, +- char *service, char *service_type, +- BOOL do_shutdown, BOOL do_tcon); +-NTSTATUS cli_full_connection(struct cli_state **output_cli, +- const char *my_name, const char *dest_host, +- struct in_addr *dest_ip, int port, +- char *service, char *service_type, +- char *user, char *domain, +- char *password, int pass_len) ; +-BOOL attempt_netbios_session_request(struct cli_state *cli, char *srchost, char *desthost, +- struct in_addr *pdest_ip); ++int smbrun(char *cmd, int *outfd); + +-/* The following definitions come from libsmb/cli_dfs.c */ ++/* The following definitions come from lib/snprintf.c */ + +-struct cli_state *cli_dfs_initialise(struct cli_state *cli, char *system_name, +- struct ntuser_creds *creds); +-NTSTATUS cli_dfs_exist(struct cli_state *cli, TALLOC_CTX *mem_ctx, +- BOOL *dfs_exists); +-NTSTATUS cli_dfs_add(struct cli_state *cli, TALLOC_CTX *mem_ctx, +- char *entrypath, char *servername, char *sharename, +- char *comment, uint32 flags); +-NTSTATUS cli_dfs_remove(struct cli_state *cli, TALLOC_CTX *mem_ctx, +- char *entrypath, char *servername, char *sharename); +-NTSTATUS cli_dfs_get_info(struct cli_state *cli, TALLOC_CTX *mem_ctx, +- char *entrypath, char *servername, char *sharename, +- uint32 info_level, DFS_INFO_CTR *ctr); +-NTSTATUS cli_dfs_enum(struct cli_state *cli, TALLOC_CTX *mem_ctx, +- uint32 info_level, DFS_INFO_CTR *ctr); + +-/* The following definitions come from libsmb/clidgram.c */ ++/* The following definitions come from lib/substitute.c */ ++ ++void standard_sub_basic(char *str); ++void standard_sub_advanced(int snum, char *user, char *connectpath, gid_t gid, char *str); ++void standard_sub_conn(connection_struct *conn, char *str); ++void standard_sub_home(int snum, char *user, char *str); ++void standard_sub_snum(int snum, char *str); ++void standard_sub_vuser(char *str, user_struct *vuser); ++void standard_sub_vsnum(char *str, user_struct *vuser, int snum); ++ ++/* The following definitions come from lib/sysacls.c */ ++ ++int sys_acl_get_entry( SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p); ++int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p); ++int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p); ++void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d); ++SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type); ++SMB_ACL_T sys_acl_get_fd(int fd); ++int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset); ++int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); ++int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); ++char *sys_acl_to_text( SMB_ACL_T the_acl, ssize_t *plen); ++SMB_ACL_T sys_acl_init( int count); ++int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry); ++int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype); ++int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual); ++int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset); ++int sys_acl_valid( SMB_ACL_T theacl ); ++int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl); ++int sys_acl_set_fd( int fd, SMB_ACL_T theacl); ++int sys_acl_delete_def_file(const char *name); ++int sys_acl_free_text(char *text); ++int sys_acl_free_acl(SMB_ACL_T the_acl) ; ++int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype); ++int sys_acl_get_entry( SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p); ++int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p); ++int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p); ++void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d); ++SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type); ++SMB_ACL_T sys_acl_get_fd(int fd); ++int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset); ++int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); ++int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); ++char *sys_acl_to_text( SMB_ACL_T the_acl, ssize_t *plen); ++SMB_ACL_T sys_acl_init( int count); ++int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry); ++int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype); ++int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual); ++int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset); ++int sys_acl_valid( SMB_ACL_T theacl ); ++int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl); ++int sys_acl_set_fd( int fd, SMB_ACL_T theacl); ++int sys_acl_delete_def_file(const char *name); ++int sys_acl_free_text(char *text); ++int sys_acl_free_acl(SMB_ACL_T the_acl) ; ++int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype); ++int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p); ++int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p); ++int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p); ++void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d); ++SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type); ++SMB_ACL_T sys_acl_get_fd(int fd); ++int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d); ++int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm); ++int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm); ++char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p); ++SMB_ACL_T sys_acl_init(int count); ++int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p); ++int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type); ++int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p); ++int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d); ++int sys_acl_valid(SMB_ACL_T acl_d); ++int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d); ++int sys_acl_set_fd(int fd, SMB_ACL_T acl_d); ++int sys_acl_delete_def_file(const char *path); ++int sys_acl_free_text(char *text); ++int sys_acl_free_acl(SMB_ACL_T acl_d) ; ++int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype); ++int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p); ++int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p); ++int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p); ++void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d); ++SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type); ++SMB_ACL_T sys_acl_get_fd(int fd); ++int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d); ++int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm); ++int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm); ++char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p); ++SMB_ACL_T sys_acl_init(int count); ++int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p); ++int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type); ++int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p); ++int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d); ++int sys_acl_valid(SMB_ACL_T acl_d); ++int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d); ++int sys_acl_set_fd(int fd, SMB_ACL_T acl_d); ++int sys_acl_delete_def_file(const char *path); ++int sys_acl_free_text(char *text); ++int sys_acl_free_acl(SMB_ACL_T acl_d) ; ++int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype); ++int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p); ++int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p); ++int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p); ++void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d); ++SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type); ++SMB_ACL_T sys_acl_get_fd(int fd); ++int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d); ++int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm); ++int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm); ++char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p); ++SMB_ACL_T sys_acl_init(int count); ++int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p); ++int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type); ++int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p); ++int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d); ++int sys_acl_valid(SMB_ACL_T acl_d); ++int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d); ++int sys_acl_set_fd(int fd, SMB_ACL_T acl_d); ++int sys_acl_delete_def_file(const char *name); ++int sys_acl_free_text(char *text); ++int sys_acl_free_acl(SMB_ACL_T acl_d) ; ++int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype); ++int sys_acl_get_entry( SMB_ACL_T theacl, int entry_id, SMB_ACL_ENTRY_T *entry_p); ++int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p); ++int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p); ++void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d); ++SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type); ++SMB_ACL_T sys_acl_get_fd(int fd); ++int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset); ++int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); ++char *sys_acl_to_text( SMB_ACL_T theacl, ssize_t *plen); ++SMB_ACL_T sys_acl_init( int count); ++int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry); ++int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype); ++int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual); ++int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset); ++int sys_acl_valid( SMB_ACL_T theacl ); ++int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl); ++int sys_acl_set_fd( int fd, SMB_ACL_T theacl); ++int sys_acl_delete_def_file(const char *name); ++int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); ++int sys_acl_free_text(char *text); ++int sys_acl_free_acl(SMB_ACL_T posix_acl); ++int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype); ++int sys_acl_get_entry( SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p); ++int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p); ++int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p); ++void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d); ++SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type); ++SMB_ACL_T sys_acl_get_fd(int fd); ++int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset); ++int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); ++int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); ++char *sys_acl_to_text( SMB_ACL_T the_acl, ssize_t *plen); ++int sys_acl_free_text(char *text); ++SMB_ACL_T sys_acl_init( int count); ++int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry); ++int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype); ++int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual); ++int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset); ++int sys_acl_valid( SMB_ACL_T theacl ); ++int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl); ++int sys_acl_set_fd( int fd, SMB_ACL_T theacl); ++int sys_acl_delete_def_file(const char *name); ++int sys_acl_free_acl(SMB_ACL_T the_acl) ; ++int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype); ++ ++/* The following definitions come from lib/system.c */ ++ ++int sys_usleep(long usecs); ++ssize_t sys_read(int fd, void *buf, size_t count); ++ssize_t sys_write(int fd, const void *buf, size_t count); ++ssize_t sys_send(int s, const void *msg, size_t len, int flags); ++ssize_t sys_sendto(int s, const void *msg, size_t len, int flags, const struct sockaddr *to, socklen_t tolen); ++ssize_t sys_recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlen); ++int sys_fcntl_ptr(int fd, int cmd, void *arg); ++int sys_fcntl_long(int fd, int cmd, long arg); ++int sys_stat(const char *fname,SMB_STRUCT_STAT *sbuf); ++int sys_fstat(int fd,SMB_STRUCT_STAT *sbuf); ++int sys_lstat(const char *fname,SMB_STRUCT_STAT *sbuf); ++int sys_ftruncate(int fd, SMB_OFF_T offset); ++SMB_OFF_T sys_lseek(int fd, SMB_OFF_T offset, int whence); ++int sys_fseek(FILE *fp, SMB_OFF_T offset, int whence); ++SMB_OFF_T sys_ftell(FILE *fp); ++int sys_creat(const char *path, mode_t mode); ++int sys_open(const char *path, int oflag, mode_t mode); ++FILE *sys_fopen(const char *path, const char *type); ++SMB_STRUCT_DIRENT *sys_readdir(DIR *dirp); ++int sys_mknod(const char *path, mode_t mode, SMB_DEV_T dev); ++char *sys_realpath(const char *path, char *resolved_path); ++int sys_waitpid(pid_t pid,int *status,int options); ++char *sys_getwd(char *s); ++int sys_symlink(const char *oldpath, const char *newpath); ++int sys_readlink(const char *path, char *buf, size_t bufsiz); ++int sys_link(const char *oldpath, const char *newpath); ++int sys_chown(const char *fname,uid_t uid,gid_t gid); ++int sys_chroot(const char *dname); ++struct hostent *sys_gethostbyname(const char *name); ++void oplock_set_capability(BOOL this_process, BOOL inherit); ++long sys_random(void); ++void sys_srandom(unsigned int seed); ++int groups_max(void); ++int sys_getgroups(int setlen, gid_t *gidset); ++int sys_setgroups(int setlen, gid_t *gidset); ++void sys_setpwent(void); ++struct passwd *sys_getpwent(void); ++void sys_endpwent(void); ++struct passwd *sys_getpwnam(const char *name); ++struct passwd *sys_getpwuid(uid_t uid); ++int wsys_stat(const smb_ucs2_t *wfname,SMB_STRUCT_STAT *sbuf); ++int wsys_lstat(const smb_ucs2_t *wfname,SMB_STRUCT_STAT *sbuf); ++int wsys_creat(const smb_ucs2_t *wfname, mode_t mode); ++int wsys_open(const smb_ucs2_t *wfname, int oflag, mode_t mode); ++FILE *wsys_fopen(const smb_ucs2_t *wfname, const char *type); ++DIR *wsys_opendir(const smb_ucs2_t *wfname); ++smb_ucs2_t *wsys_getwd(smb_ucs2_t *s); ++int wsys_chown(const smb_ucs2_t *wfname, uid_t uid, gid_t gid); ++int wsys_chroot(const smb_ucs2_t *wfname); ++pid_t sys_fork(void); ++pid_t sys_getpid(void); ++int sys_popen(const char *command); ++int sys_pclose(int fd); ++void *sys_dlopen(const char *name, int flags); ++void *sys_dlsym(void *handle, char *symbol); ++int sys_dlclose (void *handle); ++const char *sys_dlerror(void); ++void sys_adminlog(int priority, const char *format_str, ...); ++ ++/* The following definitions come from lib/talloc.c */ ++ ++TALLOC_CTX *talloc_init(void); ++void *talloc(TALLOC_CTX *t, size_t size); ++void *talloc_realloc(TALLOC_CTX *t, void *ptr, size_t size); ++void talloc_destroy_pool(TALLOC_CTX *t); ++void talloc_destroy(TALLOC_CTX *t); ++size_t talloc_pool_size(TALLOC_CTX *t); ++const char * talloc_pool_name(TALLOC_CTX const *t); ++void *talloc_zero(TALLOC_CTX *t, size_t size); ++void *talloc_memdup(TALLOC_CTX *t, const void *p, size_t size); ++char *talloc_strdup(TALLOC_CTX *t, const char *p); ++char *talloc_describe_all(TALLOC_CTX *rt); ++void talloc_get_allocation(TALLOC_CTX *t, ++ size_t *total_bytes, ++ int *n_chunks); ++ ++/* The following definitions come from lib/time.c */ ++ ++time_t get_time_t_min(void); ++time_t get_time_t_max(void); ++void GetTimeOfDay(struct timeval *tval); ++void TimeInit(void); ++void get_process_uptime(struct timeval *ret_time); ++int TimeDiff(time_t t); ++struct tm *LocalTime(time_t *t); ++time_t nt_time_to_unix(NTTIME *nt); ++time_t nt_time_to_unix_abs(NTTIME *nt); ++time_t interpret_long_date(char *p); ++void unix_to_nt_time(NTTIME *nt, time_t t); ++void unix_to_nt_time_abs(NTTIME *nt, time_t t); ++void put_long_date(char *p,time_t t); ++BOOL null_mtime(time_t mtime); ++void put_dos_date(char *buf,int offset,time_t unixdate); ++void put_dos_date2(char *buf,int offset,time_t unixdate); ++void put_dos_date3(char *buf,int offset,time_t unixdate); ++time_t make_unix_date(void *date_ptr); ++time_t make_unix_date2(void *date_ptr); ++time_t make_unix_date3(void *date_ptr); ++char *http_timestring(time_t t); ++char *timestring(BOOL hires); ++time_t get_create_time(SMB_STRUCT_STAT *st,BOOL fake_dirs); ++void init_nt_time(NTTIME *nt); ++ ++/* The following definitions come from lib/ufc.c */ ++ ++char *ufc_crypt(const char *key,const char *salt); ++ ++/* The following definitions come from lib/username.c */ ++ ++BOOL name_is_local(const char *name); ++char *get_user_home_dir(char *user); ++char *get_user_service_home_dir(char *user); ++BOOL map_username(char *user); ++struct passwd *Get_Pwnam(char *user,BOOL allow_change); ++BOOL user_in_group_list(char *user,char *gname); ++BOOL user_in_list(char *user,char *list); ++struct passwd *smb_getpwnam(char *user, BOOL allow_change); ++ ++/* The following definitions come from lib/util.c */ ++ ++char *tmpdir(void); ++BOOL in_group(gid_t group, gid_t current_gid, int ngroups, gid_t *groups); ++char *Atoic(char *p, int *n, char *c); ++char *get_numlist(char *p, uint32 **num, int *count); ++BOOL file_exist(char *fname,SMB_STRUCT_STAT *sbuf); ++time_t file_modtime(char *fname); ++BOOL directory_exist(char *dname,SMB_STRUCT_STAT *st); ++SMB_OFF_T get_file_size(char *file_name); ++char *attrib_string(uint16 mode); ++void show_msg(char *buf); ++void smb_setlen(char *buf,int len); ++int set_message(char *buf,int num_words,int num_bytes,BOOL zero); ++int set_message_bcc(char *buf,int num_bytes); ++int set_message_end(void *outbuf,void *end_ptr); ++void dos_clean_name(char *s); ++void unix_clean_name(char *s); ++void make_dir_struct(char *buf,char *mask,char *fname,SMB_OFF_T size,int mode,time_t date); ++void close_low_fds(void); ++int set_blocking(int fd, BOOL set); ++ssize_t transfer_file_internal(int infd, int outfd, size_t n, ssize_t (*read_fn)(int, void *, size_t), ++ ssize_t (*write_fn)(int, const void *, size_t)); ++SMB_OFF_T transfer_file(int infd,int outfd,SMB_OFF_T n); ++void msleep(unsigned int t); ++void become_daemon(void); ++BOOL yesno(char *p); ++void *Realloc(void *p,size_t size); ++void safe_free(void *p); ++BOOL get_myname(char *my_name); ++int interpret_protocol(char *str,int def); ++BOOL is_ipaddress(const char *str); ++uint32 interpret_addr(const char *str); ++struct in_addr *interpret_addr2(const char *str); ++BOOL is_zero_ip(struct in_addr ip); ++void zero_ip(struct in_addr *ip); ++char *automount_lookup(char *user_name); ++char *automount_lookup(char *user_name); ++BOOL same_net(struct in_addr ip1,struct in_addr ip2,struct in_addr mask); ++BOOL process_exists(pid_t pid); ++char *uidtoname(uid_t uid); ++char *gidtoname(gid_t gid); ++uid_t nametouid(char *name); ++gid_t nametogid(char *name); ++void smb_panic(char *why); ++char *readdirname(DIR *p); ++BOOL is_in_path(char *name, name_compare_entry *namelist); ++void set_namearray(name_compare_entry **ppname_array, char *namelist); ++void free_namearray(name_compare_entry *name_array); ++BOOL fcntl_lock(int fd, int op, SMB_OFF_T offset, SMB_OFF_T count, int type); ++BOOL is_myname(char *s); ++const char* get_my_primary_ip (void); ++BOOL is_myname_or_ipaddr(char *s); ++void set_remote_arch(enum remote_arch_types type); ++enum remote_arch_types get_remote_arch(void); ++void out_ascii(FILE *f, unsigned char *buf,int len); ++void out_data(FILE *f,char *buf1,int len, int per_line); ++void print_asc(int level, unsigned char *buf,int len); ++void dump_data(int level,char *buf1,int len); ++char *tab_depth(int depth); ++int str_checksum(const char *s); ++void zero_free(void *p, size_t size); ++int set_maxfiles(int requested_max); ++BOOL reg_split_key(char *full_keyname, uint32 *reg_type, char *key_name); ++int smb_mkstemp(char *template); ++void *smb_xmalloc(size_t size); ++void *smb_xmemdup(const void *p, size_t size); ++char *smb_xstrdup(const char *s); ++int smb_xvasprintf(char **ptr, const char *format, va_list ap); ++void *memdup(void *p, size_t size); ++char *myhostname(void); ++char *lock_path(char *name); ++char *pid_path(char *name); ++char *state_path(char *name); ++char *cache_path(char *name); ++char *parent_dirname(const char *path); ++BOOL ms_has_wild(char *s); ++BOOL mask_match(char *string, char *pattern, BOOL is_case_sensitive); ++BOOL unix_wild_match(char *pattern, char *string); ++DATA_BLOB data_blob(const void *p, size_t length); ++DATA_BLOB data_blob_talloc(TALLOC_CTX *mem_ctx, const void *p, size_t length); ++void data_blob_free(DATA_BLOB *d); ++void data_blob_clear(DATA_BLOB *d); ++int _Insure_trap_error(int a1, int a2, int a3, int a4, int a5, int a6); ++ ++/* The following definitions come from lib/util_file.c */ ++ ++BOOL do_file_lock(int fd, int waitsecs, int type); ++BOOL file_lock(int fd, int type, int secs, int *plock_depth); ++BOOL file_unlock(int fd, int *plock_depth); ++void *startfilepwent(char *pfile, char *s_readbuf, int bufsize, ++ int *file_lock_depth, BOOL update); ++void endfilepwent(void *vp, int *file_lock_depth); ++SMB_BIG_UINT getfilepwpos(void *vp); ++BOOL setfilepwpos(void *vp, SMB_BIG_UINT tok); ++int getfileline(void *vp, char *linebuf, int linebuf_size); ++char *fgets_slash(char *s2,int maxlen,FILE *f); ++char *file_pload(char *syscmd, size_t *size); ++char *fd_load(int fd, size_t *size); ++char *file_load(char *fname, size_t *size); ++char **file_lines_load(char *fname, int *numlines, BOOL convert); ++char **fd_lines_load(int fd, int *numlines, BOOL convert); ++char **file_lines_pload(char *syscmd, int *numlines, BOOL convert); ++void file_lines_free(char **lines); ++void file_lines_slashcont(char **lines); ++ ++/* The following definitions come from lib/util_getent.c */ ++ ++struct sys_grent * getgrent_list(void); ++void grent_free (struct sys_grent *glist); ++struct sys_pwent * getpwent_list(void); ++void pwent_free (struct sys_pwent *plist); ++struct sys_userlist *get_users_in_group(const char *gname); ++void free_userlist(struct sys_userlist *list_head); ++ ++/* The following definitions come from lib/util_seaccess.c */ ++ ++void se_map_generic(uint32 *access_mask, struct generic_mapping *mapping); ++void se_map_standard(uint32 *access_mask, struct standard_mapping *mapping); ++BOOL se_access_check(SEC_DESC *sd, NT_USER_TOKEN *token, ++ uint32 acc_desired, uint32 *acc_granted, ++ NTSTATUS *status); ++SEC_DESC_BUF *se_create_child_secdesc(TALLOC_CTX *ctx, SEC_DESC *parent_ctr, ++ BOOL child_container); ++ ++/* The following definitions come from lib/util_sec.c */ ++ ++void sec_init(void); ++uid_t sec_initial_uid(void); ++gid_t sec_initial_gid(void); ++BOOL non_root_mode(void); ++void gain_root_privilege(void); ++void gain_root_group_privilege(void); ++void set_effective_uid(uid_t uid); ++void set_effective_gid(gid_t gid); ++void save_re_uid(void); ++void restore_re_uid(void); ++int set_re_uid(void); ++void become_user_permanently(uid_t uid, gid_t gid); ++BOOL is_setuid_root(void) ; ++ ++/* The following definitions come from lib/util_sid.c */ ++ ++void generate_wellknown_sids(void); ++BOOL map_domain_sid_to_name(DOM_SID *sid, char *nt_domain); ++BOOL lookup_known_rid(DOM_SID *sid, uint32 rid, char *name, enum SID_NAME_USE *psid_name_use); ++BOOL map_domain_name_to_sid(DOM_SID *sid, char *nt_domain); ++void split_domain_name(const char *fullname, char *domain, char *name); ++char *sid_to_string(fstring sidstr_out, DOM_SID *sid); ++const char *sid_string_static(DOM_SID *sid); ++BOOL string_to_sid(DOM_SID *sidout, const char *sidstr); ++BOOL sid_append_rid(DOM_SID *sid, uint32 rid); ++BOOL sid_split_rid(DOM_SID *sid, uint32 *rid); ++BOOL sid_peek_rid(DOM_SID *sid, uint32 *rid); ++void sid_copy(DOM_SID *dst, const DOM_SID *src); ++DOM_SID *sid_dup(DOM_SID *src); ++BOOL sid_linearize(char *outbuf, size_t len, DOM_SID *sid); ++BOOL sid_parse(char *inbuf, size_t len, DOM_SID *sid); ++int sid_compare_auth(const DOM_SID *sid1, const DOM_SID *sid2); ++int sid_compare(const DOM_SID *sid1, const DOM_SID *sid2); ++int sid_compare_domain(const DOM_SID *sid1, const DOM_SID *sid2); ++BOOL sid_equal(const DOM_SID *sid1, const DOM_SID *sid2); ++BOOL sid_check_is_domain(const DOM_SID *sid); ++BOOL sid_check_is_builtin(const DOM_SID *sid); ++BOOL sid_check_is_in_our_domain(const DOM_SID *sid); ++BOOL sid_check_is_in_builtin(const DOM_SID *sid); ++size_t sid_size(DOM_SID *sid); ++BOOL non_mappable_sid(DOM_SID *sid); ++char *sid_binstring(DOM_SID *sid); ++ ++/* The following definitions come from lib/util_sock.c */ + +-int cli_send_mailslot(int dgram_sock, BOOL unique, char *mailslot, +- char *buf, int len, +- const char *srcname, int src_type, +- const char *dstname, int dest_type, +- struct in_addr dest_ip, struct in_addr src_ip, +- int dest_port, int src_port); +-int cli_get_response(int dgram_sock, BOOL unique, char *mailslot, char *buf, int bufsiz); +-int cli_get_backup_list(const char *myname, const char *send_to_name); +-int cli_get_backup_server(char *my_name, char *target, char *servername, int namesize); ++BOOL is_a_socket(int fd); ++void set_socket_options(int fd, char *options); ++ssize_t read_udp_socket(int fd,char *buf,size_t len); ++ssize_t read_with_timeout(int fd,char *buf,size_t mincnt,size_t maxcnt,unsigned int time_out); ++BOOL send_keepalive(int client); ++ssize_t read_data(int fd,char *buffer,size_t N); ++ssize_t write_data(int fd,char *buffer,size_t N); ++ssize_t write_socket_data(int fd,char *buffer,size_t N); ++ssize_t write_socket(int fd,char *buf,size_t len); ++ssize_t read_smb_length(int fd,char *inbuf,unsigned int timeout); ++BOOL receive_smb(int fd,char *buffer, unsigned int timeout); ++BOOL client_receive_smb(int fd,char *buffer, unsigned int timeout); ++BOOL send_smb(int fd,char *buffer); ++BOOL send_one_packet(char *buf,int len,struct in_addr ip,int port,int type); ++int open_socket_in( int type, int port, int dlevel, uint32 socket_addr, BOOL rebind ); ++int open_socket_out(int type, struct in_addr *addr, int port ,int timeout); ++void client_setfd(int fd); ++char *client_name(void); ++char *client_addr(void); ++char *get_socket_name(int fd); ++char *get_socket_addr(int fd); ++int create_pipe_sock(const char *socket_dir, ++ const char *socket_name, ++ mode_t dir_perms); ++int sock_exec(const char *prog); + +-/* The following definitions come from libsmb/clientgen.c */ ++/* The following definitions come from lib/util_str.c */ + +-int cli_set_port(struct cli_state *cli, int port); +-BOOL cli_receive_smb(struct cli_state *cli); +-BOOL cli_send_smb(struct cli_state *cli); +-void cli_setup_packet(struct cli_state *cli); +-void cli_setup_bcc(struct cli_state *cli, void *p); +-void cli_init_creds(struct cli_state *cli, const struct ntuser_creds *usr); +-struct cli_state *cli_initialise(struct cli_state *cli); +-void cli_shutdown(struct cli_state *cli); +-void cli_sockopt(struct cli_state *cli, char *options); +-uint16 cli_setpid(struct cli_state *cli, uint16 pid); ++void set_first_token(char *ptr); ++BOOL next_token(char **ptr,char *buff,char *sep, size_t bufsize); ++char **toktocliplist(int *ctok, char *sep); ++int StrCaseCmp(const char *s, const char *t); ++int StrnCaseCmp(const char *s, const char *t, size_t n); ++BOOL strequal(const char *s1, const char *s2); ++BOOL strnequal(const char *s1,const char *s2,size_t n); ++BOOL strcsequal(const char *s1,const char *s2); ++int strwicmp(char *psz1, char *psz2); ++void strlower(char *s); ++void strupper(char *s); ++void strnorm(char *s); ++BOOL strisnormal(char *s); ++void string_replace(char *s,char oldc,char newc); ++char *skip_string(char *buf,size_t n); ++size_t str_charnum(const char *s); ++BOOL trim_string(char *s,const char *front,const char *back); ++BOOL strhasupper(const char *s); ++BOOL strhaslower(const char *s); ++size_t count_chars(const char *s,char c); ++BOOL str_is_all(const char *s,char c); ++char *safe_strcpy(char *dest,const char *src, size_t maxlength); ++char *safe_strcat(char *dest, const char *src, size_t maxlength); ++char *alpha_strcpy(char *dest, const char *src, const char *other_safe_chars, size_t maxlength); ++char *StrnCpy(char *dest,const char *src,size_t n); ++char *strncpyn(char *dest, const char *src,size_t n, char c); ++size_t strhex_to_str(char *p, size_t len, const char *strhex); ++BOOL in_list(char *s,char *list,BOOL casesensitive); ++void string_free(char **s); ++BOOL string_set(char **dest,const char *src); ++void string_sub(char *s,const char *pattern,const char *insert, size_t len); ++void fstring_sub(char *s,const char *pattern,const char *insert); ++void pstring_sub(char *s,const char *pattern,const char *insert); ++void all_string_sub(char *s,const char *pattern,const char *insert, size_t len); ++void split_at_last_component(char *path, char *front, char sep, char *back); ++char *octal_string(int i); ++char *string_truncate(char *s, int length); ++char *binary_string(char *buf, int len); + +-/* The following definitions come from libsmb/clierror.c */ ++/* The following definitions come from lib/util_unistr.c */ + +-char *cli_errstr(struct cli_state *cli); +-NTSTATUS cli_nt_error(struct cli_state *cli); +-void cli_dos_error(struct cli_state *cli, uint8 *eclass, uint32 *ecode); +-int cli_errno_from_dos(uint8 eclass, uint32 num); +-int cli_errno_from_nt(NTSTATUS status); +-int cli_errno(struct cli_state *cli); +-BOOL cli_is_error(struct cli_state *cli); +-BOOL cli_is_nt_error(struct cli_state *cli); +-BOOL cli_is_dos_error(struct cli_state *cli); ++size_t unix_PutUniCode(char *dst,const char *src, ssize_t len, BOOL null_terminate); ++size_t dos_PutUniCode(char *dst,const char *src, ssize_t len, BOOL null_terminate); ++void unistr_to_dos(char *dest, const char *src, size_t len); ++char *skip_unibuf(char *src, size_t len); ++char *dos_unistrn2(uint16 *src, int len); ++char *dos_unistr2(uint16 *src); ++char *dos_unistr2_to_str(UNISTR2 *str); ++void ascii_to_unistr(uint16 *dest, const char *src, int maxlen); ++void unistr_to_ascii(char *dest, const uint16 *src, int len); ++void unistr2_to_ascii(char *dest, const UNISTR2 *str, size_t maxlen); ++char *unistr2_tdup(TALLOC_CTX *ctx, const UNISTR2 *str); ++uint32 buffer2_to_uint32(BUFFER2 *str); ++char *dos_buffer2_to_str(BUFFER2 *str); ++char *dos_buffer2_to_multistr(BUFFER2 *str); ++size_t dos_struni2(char *dst, const char *src, size_t max_len); ++char *dos_unistr(char *buf); ++int unistrlen(uint16 *s); ++int unistrcpy(uint16 *dst, uint16 *src); ++void default_unicode_map(smb_ucs2_t **pp_cp_to_ucs2, uint16 **pp_ucs2_to_cp); ++BOOL load_unicode_map(const char *codepage, smb_ucs2_t **pp_cp_to_ucs2, uint16 **pp_ucs2_to_cp); ++BOOL load_dos_unicode_map(int codepage); ++BOOL load_unix_unicode_map(const char *unix_char_set, BOOL override); ++smb_ucs2_t *multibyte_to_unicode(smb_ucs2_t *dst, const char *src, ++ size_t dst_len, smb_ucs2_t *cp_to_ucs2); ++char *unicode_to_unix(char *dst, const smb_ucs2_t *src, size_t dst_len); ++smb_ucs2_t *unix_to_unicode(smb_ucs2_t *dst, const char *src, size_t dst_len); ++size_t unicode_to_unix_char(char *dst, const smb_ucs2_t src); ++char *unicode_to_dos(char *dst, const smb_ucs2_t *src, size_t dst_len); ++size_t unicode_to_dos_char(char *dst, const smb_ucs2_t src); ++smb_ucs2_t *dos_to_unicode(smb_ucs2_t *dst, const char *src, size_t dst_len); ++size_t strlen_w(const smb_ucs2_t *src); ++smb_ucs2_t *safe_strcpy_w(smb_ucs2_t *dest,const smb_ucs2_t *src, size_t maxlength); ++smb_ucs2_t *safe_strcat_w(smb_ucs2_t *dest, const smb_ucs2_t *src, size_t maxlength); ++int strcmp_w(const smb_ucs2_t *s1, const smb_ucs2_t *s2); ++int strncmp_w(const smb_ucs2_t *s1, const smb_ucs2_t *s2, size_t len); ++smb_ucs2_t *strstr_w(const smb_ucs2_t *s1, const smb_ucs2_t *s2); ++smb_ucs2_t *strchr_w(const smb_ucs2_t *s, smb_ucs2_t c); ++smb_ucs2_t *strrchr_w(const smb_ucs2_t *s, smb_ucs2_t c); ++smb_ucs2_t *strtok_w(smb_ucs2_t *s1, const smb_ucs2_t *s2); ++smb_ucs2_t *strdup_w(const smb_ucs2_t *s); ++int isupper_w( smb_ucs2_t val); ++int islower_w( smb_ucs2_t val); ++int isdigit_w( smb_ucs2_t val); ++int isxdigit_w( smb_ucs2_t val); ++int isspace_w( smb_ucs2_t val); ++smb_ucs2_t toupper_w( smb_ucs2_t val ); ++smb_ucs2_t tolower_w( smb_ucs2_t val ); ++void set_first_token_w(smb_ucs2_t *ptr); ++BOOL next_token_w(smb_ucs2_t **ptr, smb_ucs2_t *buff, smb_ucs2_t *sep, size_t bufsize); ++smb_ucs2_t **toktocliplist_w(int *ctok, smb_ucs2_t *sep); ++int StrCaseCmp_w(const smb_ucs2_t *s, const smb_ucs2_t *t); ++int StrnCaseCmp_w(const smb_ucs2_t *s, const smb_ucs2_t *t, size_t n); ++BOOL strequal_w(const smb_ucs2_t *s1, const smb_ucs2_t *s2); ++BOOL strnequal_w(const smb_ucs2_t *s1,const smb_ucs2_t *s2,size_t n); ++BOOL strcsequal_w(const smb_ucs2_t *s1,const smb_ucs2_t *s2); ++void strlower_w(smb_ucs2_t *s); ++void strupper_w(smb_ucs2_t *s); ++void strnorm_w(smb_ucs2_t *s); ++BOOL strisnormal_w(smb_ucs2_t *s); ++void string_replace_w(smb_ucs2_t *s, smb_ucs2_t oldc, smb_ucs2_t newc); ++smb_ucs2_t *skip_string_w(smb_ucs2_t *buf,size_t n); ++size_t str_charnum_w(const smb_ucs2_t *s); ++BOOL trim_string_w(smb_ucs2_t *s,const smb_ucs2_t *front,const smb_ucs2_t *back); ++BOOL strhasupper_w(const smb_ucs2_t *s); ++BOOL strhaslower_w(const smb_ucs2_t *s); ++size_t count_chars_w(const smb_ucs2_t *s,smb_ucs2_t c); ++BOOL str_is_all_w(const smb_ucs2_t *s,smb_ucs2_t c); ++smb_ucs2_t *alpha_strcpy_w(smb_ucs2_t *dest, const smb_ucs2_t *src, const smb_ucs2_t *other_safe_chars, size_t maxlength); ++smb_ucs2_t *StrnCpy_w(smb_ucs2_t *dest,const smb_ucs2_t *src,size_t n); ++smb_ucs2_t *strncpyn_w(smb_ucs2_t *dest, const smb_ucs2_t *src,size_t n, smb_ucs2_t c); ++size_t strhex_to_str_w(char *p, size_t len, const smb_ucs2_t *strhex); ++BOOL in_list_w(smb_ucs2_t *s,smb_ucs2_t *list,BOOL casesensitive); ++BOOL string_init_w(smb_ucs2_t **dest,const smb_ucs2_t *src); ++void string_free_w(smb_ucs2_t **s); ++BOOL string_set_w(smb_ucs2_t **dest,const smb_ucs2_t *src); ++void string_sub_w(smb_ucs2_t *s,const smb_ucs2_t *pattern,const smb_ucs2_t *insert, size_t len); ++void fstring_sub_w(smb_ucs2_t *s,const smb_ucs2_t *pattern,const smb_ucs2_t *insert); ++void pstring_sub_w(smb_ucs2_t *s,const smb_ucs2_t *pattern,smb_ucs2_t *insert); ++void all_string_sub_w(smb_ucs2_t *s,const smb_ucs2_t *pattern,const smb_ucs2_t *insert, size_t len); ++void split_at_last_component_w(smb_ucs2_t *path, smb_ucs2_t *front, smb_ucs2_t sep, smb_ucs2_t *back); ++smb_ucs2_t *octal_string_w(int i); ++smb_ucs2_t *string_truncate_w(smb_ucs2_t *s, size_t length); ++smb_ucs2_t doscp2ucs2(int w); ++int ucs2doscp(smb_ucs2_t w); ++int rpcstr_pull(char* dest, void *src, int dest_len, int src_len, int flags); + +-/* The following definitions come from libsmb/clifile.c */ ++/* The following definitions come from lib/wins_srv.c */ + +-uint32 unix_perms_to_wire(mode_t perms); +-BOOL cli_unix_symlink(struct cli_state *cli, const char *fname_src, const char *fname_dst); +-BOOL cli_unix_hardlink(struct cli_state *cli, const char *fname_src, const char *fname_dst); +-BOOL cli_unix_chmod(struct cli_state *cli, const char *fname, mode_t mode); +-BOOL cli_unix_chown(struct cli_state *cli, const char *fname, uid_t uid, gid_t gid); +-BOOL cli_rename(struct cli_state *cli, const char *fname_src, const char *fname_dst); +-BOOL cli_unlink(struct cli_state *cli, const char *fname); +-BOOL cli_mkdir(struct cli_state *cli, const char *dname); +-BOOL cli_rmdir(struct cli_state *cli, const char *dname); +-int cli_nt_delete_on_close(struct cli_state *cli, int fnum, BOOL flag); +-int cli_nt_create_full(struct cli_state *cli, const char *fname, uint32 DesiredAccess, +- uint32 FileAttributes, uint32 ShareAccess, +- uint32 CreateDisposition, uint32 CreateOptions); +-int cli_nt_create(struct cli_state *cli, const char *fname, uint32 DesiredAccess); +-int cli_open(struct cli_state *cli, const char *fname, int flags, int share_mode); +-BOOL cli_close(struct cli_state *cli, int fnum); +-NTSTATUS cli_locktype(struct cli_state *cli, int fnum, +- uint32 offset, uint32 len, int timeout, unsigned char locktype); +-BOOL cli_lock(struct cli_state *cli, int fnum, +- uint32 offset, uint32 len, int timeout, enum brl_type lock_type); +-BOOL cli_unlock(struct cli_state *cli, int fnum, uint32 offset, uint32 len); +-BOOL cli_lock64(struct cli_state *cli, int fnum, +- SMB_BIG_UINT offset, SMB_BIG_UINT len, int timeout, enum brl_type lock_type); +-BOOL cli_unlock64(struct cli_state *cli, int fnum, SMB_BIG_UINT offset, SMB_BIG_UINT len); +-BOOL cli_getattrE(struct cli_state *cli, int fd, +- uint16 *attr, size_t *size, +- time_t *c_time, time_t *a_time, time_t *m_time); +-BOOL cli_getatr(struct cli_state *cli, const char *fname, +- uint16 *attr, size_t *size, time_t *t); +-BOOL cli_setatr(struct cli_state *cli, const char *fname, uint16 attr, time_t t); +-BOOL cli_chkpath(struct cli_state *cli, const char *path); +-BOOL cli_dskattr(struct cli_state *cli, int *bsize, int *total, int *avail); +-int cli_ctemp(struct cli_state *cli, const char *path, char **tmp_path); ++BOOL wins_srv_load_list( char *src ); ++struct in_addr wins_srv_ip( void ); ++void wins_srv_died( struct in_addr boothill_ip ); ++unsigned long wins_srv_count( void ); + +-/* The following definitions come from libsmb/clilist.c */ ++/* The following definitions come from libsmb/cli_dfs.c */ + +-int cli_list_new(struct cli_state *cli,const char *Mask,uint16 attribute, +- void (*fn)(file_info *, const char *, void *), void *state); +-int cli_list_old(struct cli_state *cli,const char *Mask,uint16 attribute, +- void (*fn)(file_info *, const char *, void *), void *state); +-int cli_list(struct cli_state *cli,const char *Mask,uint16 attribute, +- void (*fn)(file_info *, const char *, void *), void *state); ++struct cli_state *cli_dfs_initialise(struct cli_state *cli, char *system_name, ++ struct ntuser_creds *creds); ++NTSTATUS cli_dfs_exist(struct cli_state *cli, TALLOC_CTX *mem_ctx, ++ BOOL *dfs_exists); ++NTSTATUS cli_dfs_add(struct cli_state *cli, TALLOC_CTX *mem_ctx, ++ char *entrypath, char *servername, char *sharename, ++ char *comment, uint32 flags); ++NTSTATUS cli_dfs_remove(struct cli_state *cli, TALLOC_CTX *mem_ctx, ++ char *entrypath, char *servername, char *sharename); ++NTSTATUS cli_dfs_get_info(struct cli_state *cli, TALLOC_CTX *mem_ctx, ++ char *entrypath, char *servername, char *sharename, ++ uint32 info_level, DFS_INFO_CTR *ctr); ++NTSTATUS cli_dfs_enum(struct cli_state *cli, TALLOC_CTX *mem_ctx, ++ uint32 info_level, DFS_INFO_CTR *ctr); + + /* The following definitions come from libsmb/cli_lsarpc.c */ + +@@ -355,13 +871,6 @@ + SEC_DESC_BUF **psdb); + BOOL fetch_domain_sid( char *domain, char *remote_machine, DOM_SID *psid); + +-/* The following definitions come from libsmb/climessage.c */ +- +-BOOL cli_message_start(struct cli_state *cli, char *host, char *username, +- int *grp); +-BOOL cli_message_text(struct cli_state *cli, char *msg, int len, int grp); +-BOOL cli_message_end(struct cli_state *cli, int grp); +- + /* The following definitions come from libsmb/cli_netlogon.c */ + + struct cli_state *cli_netlogon_initialise(struct cli_state *cli, +@@ -395,12 +904,6 @@ + DATA_BLOB lm_response, DATA_BLOB nt_response, + NET_USER_INFO_3 *info3); + +-/* The following definitions come from libsmb/clioplock.c */ +- +-BOOL cli_oplock_ack(struct cli_state *cli, int fnum, unsigned char level); +-void cli_oplock_handler(struct cli_state *cli, +- BOOL (*handler)(struct cli_state *, int, unsigned char)); +- + /* The following definitions come from libsmb/cli_pipe_util.c */ + + struct cli_state *cli_pipe_initialise(struct cli_state *cli, char *system_name, +@@ -408,56 +911,6 @@ + struct ntuser_creds *creds); + void cli_pipe_shutdown(struct cli_state *cli); + +-/* The following definitions come from libsmb/cliprint.c */ +- +-int cli_print_queue(struct cli_state *cli, +- void (*fn)(struct print_job_info *)); +-int cli_printjob_del(struct cli_state *cli, int job); +- +-/* The following definitions come from libsmb/clirap.c */ +- +-BOOL cli_api_pipe(struct cli_state *cli, char *pipe_name, +- uint16 *setup, uint32 setup_count, uint32 max_setup_count, +- char *params, uint32 param_count, uint32 max_param_count, +- char *data, uint32 data_count, uint32 max_data_count, +- char **rparam, uint32 *rparam_count, +- char **rdata, uint32 *rdata_count); +-BOOL cli_api(struct cli_state *cli, +- char *param, int prcnt, int mprcnt, +- char *data, int drcnt, int mdrcnt, +- char **rparam, int *rprcnt, +- char **rdata, int *rdrcnt); +-BOOL cli_NetWkstaUserLogon(struct cli_state *cli,char *user, char *workstation); +-int cli_RNetShareEnum(struct cli_state *cli, void (*fn)(const char *, uint32, const char *, void *), void *state); +-BOOL cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype, +- void (*fn)(const char *, uint32, const char *, void *), +- void *state); +-BOOL cli_oem_change_password(struct cli_state *cli, const char *user, const char *new_password, +- const char *old_password); +-BOOL cli_qpathinfo(struct cli_state *cli, const char *fname, +- time_t *c_time, time_t *a_time, time_t *m_time, +- size_t *size, uint16 *mode); +-BOOL cli_qpathinfo2(struct cli_state *cli, const char *fname, +- time_t *c_time, time_t *a_time, time_t *m_time, +- time_t *w_time, size_t *size, uint16 *mode, +- SMB_INO_T *ino); +-BOOL cli_qfileinfo(struct cli_state *cli, int fnum, +- uint16 *mode, size_t *size, +- time_t *c_time, time_t *a_time, time_t *m_time, +- time_t *w_time, SMB_INO_T *ino); +-BOOL cli_qfileinfo_test(struct cli_state *cli, int fnum, int level, char *outdata); +-NTSTATUS cli_qpathinfo_alt_name(struct cli_state *cli, const char *fname, fstring alt_name); +- +-/* The following definitions come from libsmb/clireadwrite.c */ +- +-ssize_t cli_read(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size); +-ssize_t cli_readraw(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size); +-ssize_t cli_write(struct cli_state *cli, +- int fnum, uint16 write_mode, +- char *buf, off_t offset, size_t size); +-ssize_t cli_smbwrite(struct cli_state *cli, +- int fnum, char *buf, off_t offset, size_t size1); +- + /* The following definitions come from libsmb/cli_reg.c */ + + struct cli_state *cli_winreg_initialise(struct cli_state *cli, +@@ -546,12 +999,6 @@ + POLICY_HND *user_pol, uint16 switch_value, + TALLOC_CTX *ctx, SEC_DESC_BUF **sec_desc_buf); + +-/* The following definitions come from libsmb/clisecdesc.c */ +- +-SEC_DESC *cli_query_secdesc(struct cli_state *cli, int fnum, +- TALLOC_CTX *mem_ctx); +-BOOL cli_set_secdesc(struct cli_state *cli, int fnum, SEC_DESC *sd); +- + /* The following definitions come from libsmb/cli_spoolss.c */ + + struct cli_state *cli_spoolss_initialise(struct cli_state *cli, +@@ -632,805 +1079,360 @@ + TALLOC_CTX *mem_ctx, + uint32 switch_value, SRV_INFO_CTR *ctr); + +-/* The following definitions come from libsmb/clistr.c */ +- +-int clistr_push(struct cli_state *cli, void *dest, const char *src, int dest_len, int flags); +-int clistr_pull(struct cli_state *cli, char *dest, const void *src, int dest_len, int src_len, int flags); +-int clistr_align_out(struct cli_state *cli, const void *p, int flags); +-int clistr_align_in(struct cli_state *cli, const void *p, int flags); +- +-/* The following definitions come from libsmb/clitrans.c */ +- +-BOOL cli_send_trans(struct cli_state *cli, int trans, +- const char *pipe_name, +- int fid, int flags, +- uint16 *setup, int lsetup, int msetup, +- char *param, int lparam, int mparam, +- char *data, int ldata, int mdata); +-BOOL cli_receive_trans(struct cli_state *cli,int trans, +- char **param, int *param_len, +- char **data, int *data_len); +-BOOL cli_send_nt_trans(struct cli_state *cli, +- int function, +- int flags, +- uint16 *setup, int lsetup, int msetup, +- char *param, int lparam, int mparam, +- char *data, int ldata, int mdata); +-BOOL cli_receive_nt_trans(struct cli_state *cli, +- char **param, int *param_len, +- char **data, int *data_len); +- +-/* The following definitions come from libsmb/credentials.c */ +- +-char *credstr(const uchar *cred); +-void cred_session_key(const DOM_CHAL *clnt_chal, const DOM_CHAL *srv_chal, const uchar *pass, +- uchar session_key[8]); +-void cred_create(uchar session_key[8], DOM_CHAL *stor_cred, UTIME timestamp, +- DOM_CHAL *cred); +-int cred_assert(DOM_CHAL *cred, uchar session_key[8], DOM_CHAL *stored_cred, +- UTIME timestamp); +-BOOL clnt_deal_with_creds(uchar sess_key[8], +- DOM_CRED *sto_clnt_cred, DOM_CRED *rcv_srv_cred); +-BOOL deal_with_creds(uchar sess_key[8], +- DOM_CRED *sto_clnt_cred, +- DOM_CRED *rcv_clnt_cred, DOM_CRED *rtn_srv_cred); +- +-/* The following definitions come from libsmb/doserr.c */ +- +-char *dos_errstr(WERROR werror); +- +-/* The following definitions come from libsmb/errormap.c */ +- +-NTSTATUS dos_to_ntstatus(int eclass, int ecode); +-void ntstatus_to_dos(NTSTATUS ntstatus, uint8 *eclass, uint32 *ecode); +-NTSTATUS werror_to_ntstatus(WERROR error); +-WERROR ntstatus_to_werror(NTSTATUS error); +- +-/* The following definitions come from libsmb/namequery.c */ +- +-struct node_status *node_status_query(int fd,struct nmb_name *name, +- struct in_addr to_ip, int *num_names); +-BOOL name_status_find(const char *q_name, int q_type, int type, struct in_addr to_ip, char *name); +-BOOL name_register(int fd, const char *name, int name_type, +- struct in_addr name_ip, int opcode, +- BOOL bcast, +- struct in_addr to_ip, int *count); +-struct in_addr *name_query(int fd,const char *name,int name_type, +- BOOL bcast,BOOL recurse, +- struct in_addr to_ip, int *count); +-FILE *startlmhosts(char *fname); +-BOOL getlmhostsent( FILE *fp, pstring name, int *name_type, struct in_addr *ipaddr); +-void endlmhosts(FILE *fp); +-BOOL name_register_wins(const char *name, int name_type); +-BOOL name_resolve_bcast(const char *name, int name_type, +- struct in_addr **return_ip_list, int *return_count); +-BOOL resolve_name(const char *name, struct in_addr *return_ip, int name_type); +-BOOL resolve_srv_name(const char* srv_name, fstring dest_host, +- struct in_addr *ip); +-BOOL find_master_ip(char *group, struct in_addr *master_ip); +-BOOL lookup_dc_name(const char *srcname, const char *domain, +- struct in_addr *dc_ip, char *ret_name); +-BOOL get_dc_list(BOOL pdc_only, const char *group, struct in_addr **ip_list, int *count); +-BOOL get_lmb_list(struct in_addr **ip_list, int *count); +- +-/* The following definitions come from libsmb/nmblib.c */ +- +-void debug_nmb_packet(struct packet_struct *p); +-char *nmb_namestr(struct nmb_name *n); +-struct packet_struct *copy_packet(struct packet_struct *packet); +-void free_packet(struct packet_struct *packet); +-struct packet_struct *parse_packet(char *buf,int length, +- enum packet_type packet_type); +-struct packet_struct *read_packet(int fd,enum packet_type packet_type); +-void make_nmb_name( struct nmb_name *n, const char *name, int type); +-BOOL nmb_name_equal(struct nmb_name *n1, struct nmb_name *n2); +-int build_packet(char *buf, struct packet_struct *p); +-BOOL send_packet(struct packet_struct *p); +-struct packet_struct *receive_packet(int fd,enum packet_type type,int t); +-struct packet_struct *receive_nmb_packet(int fd, int t, int trn_id); +-struct packet_struct *receive_dgram_packet(int fd, int t, char *mailslot_name); +-BOOL match_mailslot_name(struct packet_struct *p, char *mailslot_name); +-void sort_query_replies(char *data, int n, struct in_addr ip); +-char *dns_to_netbios_name(char *dns_name); +-int name_mangle( char *In, char *Out, char name_type ); +-int name_extract(char *buf,int ofs,char *name); +-int name_len(char *s1); +- +-/* The following definitions come from libsmb/nterr.c */ +- +-char *get_nt_error_msg(NTSTATUS nt_code); +-char *nt_errstr(NTSTATUS nt_code); +-char *get_nt_error_c_code(NTSTATUS nt_code); +- +-/* The following definitions come from libsmb/passchange.c */ +- +-BOOL remote_password_change(const char *remote_machine, const char *user_name, +- const char *old_passwd, const char *new_passwd, +- char *err_str, size_t err_str_len); +- +-/* The following definitions come from libsmb/pwd_cache.c */ +- +-void pwd_init(struct pwd_info *pwd); +-BOOL pwd_is_nullpwd(const struct pwd_info *pwd); +-BOOL pwd_compare(struct pwd_info *pwd1, struct pwd_info *pwd2); +-void pwd_read(struct pwd_info *pwd, char *passwd_report, BOOL do_encrypt); +-void pwd_set_nullpwd(struct pwd_info *pwd); +-void pwd_set_cleartext(struct pwd_info *pwd, char *clr); +-void pwd_get_cleartext(struct pwd_info *pwd, char *clr); +-void pwd_set_lm_nt_16(struct pwd_info *pwd, uchar lm_pwd[16], uchar nt_pwd[16]); +-void pwd_get_lm_nt_16(struct pwd_info *pwd, uchar lm_pwd[16], uchar nt_pwd[16]); +-void pwd_make_lm_nt_16(struct pwd_info *pwd, char *clr); +-void pwd_make_lm_nt_owf(struct pwd_info *pwd, uchar cryptkey[8]); +-void pwd_get_lm_nt_owf(struct pwd_info *pwd, uchar lm_owf[24], uchar nt_owf[24]); +- +-/* The following definitions come from lib/smbrun.c */ +- +-int smbrun(char *cmd, int *outfd); +- +-/* The following definitions come from libsmb/smbdes.c */ +- +-void E_P16(const unsigned char *p14,unsigned char *p16); +-void E_P24(const unsigned char *p21, const unsigned char *c8, unsigned char *p24); +-void D_P16(const unsigned char *p14, const unsigned char *in, unsigned char *out); +-void E_old_pw_hash( unsigned char *p14, const unsigned char *in, unsigned char *out); +-void cred_hash1(unsigned char *out, const unsigned char *in, const unsigned char *key); +-void cred_hash2(unsigned char *out, const unsigned char *in, const unsigned char *key); +-void cred_hash3(unsigned char *out, unsigned char *in, const unsigned char *key, int forw); +-void SamOEMhash( unsigned char *data, const unsigned char *key, int val); +-void sam_pwd_hash(unsigned int rid, const uchar *in, uchar *out, int forw); +- +-/* The following definitions come from libsmb/smbencrypt.c */ ++/* The following definitions come from libsmb/cliconnect.c */ + +-void SMBencrypt(const uchar *passwd, uchar *c8, uchar *p24); +-void E_md4hash(const uchar *passwd, uchar *p16); +-void nt_lm_owf_gen(char *pwd, uchar nt_p16[16], uchar p16[16]); +-void SMBOWFencrypt(uchar passwd[16], uchar *c8, uchar p24[24]); +-void NTLMSSPOWFencrypt(uchar passwd[8], uchar *ntlmchalresp, uchar p24[24]); +-void SMBNTencrypt(const uchar *passwd, uchar *c8, uchar *p24); +-BOOL make_oem_passwd_hash(char data[516], const char *passwd, uchar old_pw_hash[16], BOOL unicode); +-BOOL encode_pw_buffer(char buffer[516], const char *new_pass, +- int new_pw_len, BOOL nt_pass_set); +-BOOL decode_pw_buffer(char in_buffer[516], char *new_pwrd, +- int new_pwrd_size, uint32 *new_pw_len, +- uchar nt_p16[16], uchar p16[16]); +-void nt_owf_genW(const UNISTR2 *pwd, uchar nt_p16[16]); ++BOOL cli_session_setup(struct cli_state *cli, ++ char *user, ++ char *pass, int passlen, ++ char *ntpass, int ntpasslen, ++ char *workgroup); ++BOOL cli_ulogoff(struct cli_state *cli); ++BOOL cli_send_tconX(struct cli_state *cli, ++ const char *share, const char *dev, const char *pass, int passlen); ++BOOL cli_tdis(struct cli_state *cli); ++void cli_negprot_send(struct cli_state *cli); ++BOOL cli_negprot(struct cli_state *cli); ++BOOL cli_session_request(struct cli_state *cli, ++ struct nmb_name *calling, struct nmb_name *called); ++BOOL cli_connect(struct cli_state *cli, const char *host, struct in_addr *ip); ++BOOL cli_establish_connection(struct cli_state *cli, ++ char *dest_host, struct in_addr *dest_ip, ++ struct nmb_name *calling, struct nmb_name *called, ++ char *service, char *service_type, ++ BOOL do_shutdown, BOOL do_tcon); ++NTSTATUS cli_full_connection(struct cli_state **output_cli, ++ const char *my_name, const char *dest_host, ++ struct in_addr *dest_ip, int port, ++ char *service, char *service_type, ++ char *user, char *domain, ++ char *password, int pass_len) ; ++BOOL attempt_netbios_session_request(struct cli_state *cli, char *srchost, char *desthost, ++ struct in_addr *pdest_ip); + +-/* The following definitions come from libsmb/smberr.c */ ++/* The following definitions come from libsmb/clidgram.c */ + +-char *smb_dos_err_name(uint8 class, uint16 num); +-char *get_dos_error_msg(WERROR result); +-char *smb_dos_err_class(uint8 class); +-char *smb_dos_errstr(char *inbuf); +-WERROR map_werror_from_unix(int error); ++int cli_send_mailslot(int dgram_sock, BOOL unique, char *mailslot, ++ char *buf, int len, ++ const char *srcname, int src_type, ++ const char *dstname, int dest_type, ++ struct in_addr dest_ip, struct in_addr src_ip, ++ int dest_port, int src_port); ++int cli_get_response(int dgram_sock, BOOL unique, char *mailslot, char *buf, int bufsiz); ++int cli_get_backup_list(const char *myname, const char *send_to_name); ++int cli_get_backup_server(char *my_name, char *target, char *servername, int namesize); + +-/* The following definitions come from libsmb/unexpected.c */ ++/* The following definitions come from libsmb/clientgen.c */ + +-void unexpected_packet(struct packet_struct *p); +-void clear_unexpected(time_t t); +-struct packet_struct *receive_unexpected(enum packet_type packet_type, int id, +- char *mailslot_name); ++int cli_set_port(struct cli_state *cli, int port); ++BOOL cli_receive_smb(struct cli_state *cli); ++BOOL cli_send_smb(struct cli_state *cli); ++void cli_setup_packet(struct cli_state *cli); ++void cli_setup_bcc(struct cli_state *cli, void *p); ++void cli_init_creds(struct cli_state *cli, const struct ntuser_creds *usr); ++struct cli_state *cli_initialise(struct cli_state *cli); ++void cli_shutdown(struct cli_state *cli); ++void cli_sockopt(struct cli_state *cli, char *options); ++uint16 cli_setpid(struct cli_state *cli, uint16 pid); + +-/* The following definitions come from lib/snprintf.c */ ++/* The following definitions come from libsmb/clierror.c */ + ++char *cli_errstr(struct cli_state *cli); ++NTSTATUS cli_nt_error(struct cli_state *cli); ++void cli_dos_error(struct cli_state *cli, uint8 *eclass, uint32 *ecode); ++int cli_errno_from_dos(uint8 eclass, uint32 num); ++int cli_errno_from_nt(NTSTATUS status); ++int cli_errno(struct cli_state *cli); ++BOOL cli_is_error(struct cli_state *cli); ++BOOL cli_is_nt_error(struct cli_state *cli); ++BOOL cli_is_dos_error(struct cli_state *cli); + +-/* The following definitions come from lib/substitute.c */ ++/* The following definitions come from libsmb/clifile.c */ + +-void standard_sub_basic(char *str); +-void standard_sub_advanced(int snum, char *user, char *connectpath, gid_t gid, char *str); +-void standard_sub_conn(connection_struct *conn, char *str); +-void standard_sub_home(int snum, char *user, char *str); +-void standard_sub_snum(int snum, char *str); +-void standard_sub_vuser(char *str, user_struct *vuser); +-void standard_sub_vsnum(char *str, user_struct *vuser, int snum); ++uint32 unix_perms_to_wire(mode_t perms); ++BOOL cli_unix_symlink(struct cli_state *cli, const char *fname_src, const char *fname_dst); ++BOOL cli_unix_hardlink(struct cli_state *cli, const char *fname_src, const char *fname_dst); ++BOOL cli_unix_chmod(struct cli_state *cli, const char *fname, mode_t mode); ++BOOL cli_unix_chown(struct cli_state *cli, const char *fname, uid_t uid, gid_t gid); ++BOOL cli_rename(struct cli_state *cli, const char *fname_src, const char *fname_dst); ++BOOL cli_unlink(struct cli_state *cli, const char *fname); ++BOOL cli_mkdir(struct cli_state *cli, const char *dname); ++BOOL cli_rmdir(struct cli_state *cli, const char *dname); ++int cli_nt_delete_on_close(struct cli_state *cli, int fnum, BOOL flag); ++int cli_nt_create_full(struct cli_state *cli, const char *fname, uint32 DesiredAccess, ++ uint32 FileAttributes, uint32 ShareAccess, ++ uint32 CreateDisposition, uint32 CreateOptions); ++int cli_nt_create(struct cli_state *cli, const char *fname, uint32 DesiredAccess); ++int cli_open(struct cli_state *cli, const char *fname, int flags, int share_mode); ++BOOL cli_close(struct cli_state *cli, int fnum); ++NTSTATUS cli_locktype(struct cli_state *cli, int fnum, ++ uint32 offset, uint32 len, int timeout, unsigned char locktype); ++BOOL cli_lock(struct cli_state *cli, int fnum, ++ uint32 offset, uint32 len, int timeout, enum brl_type lock_type); ++BOOL cli_unlock(struct cli_state *cli, int fnum, uint32 offset, uint32 len); ++BOOL cli_lock64(struct cli_state *cli, int fnum, ++ SMB_BIG_UINT offset, SMB_BIG_UINT len, int timeout, enum brl_type lock_type); ++BOOL cli_unlock64(struct cli_state *cli, int fnum, SMB_BIG_UINT offset, SMB_BIG_UINT len); ++BOOL cli_getattrE(struct cli_state *cli, int fd, ++ uint16 *attr, size_t *size, ++ time_t *c_time, time_t *a_time, time_t *m_time); ++BOOL cli_getatr(struct cli_state *cli, const char *fname, ++ uint16 *attr, size_t *size, time_t *t); ++BOOL cli_setatr(struct cli_state *cli, const char *fname, uint16 attr, time_t t); ++BOOL cli_chkpath(struct cli_state *cli, const char *path); ++BOOL cli_dskattr(struct cli_state *cli, int *bsize, int *total, int *avail); ++int cli_ctemp(struct cli_state *cli, const char *path, char **tmp_path); + +-/* The following definitions come from lib/sysacls.c */ ++/* The following definitions come from libsmb/clilist.c */ + +-int sys_acl_get_entry( SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p); +-int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p); +-int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p); +-void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d); +-SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type); +-SMB_ACL_T sys_acl_get_fd(int fd); +-int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset); +-int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); +-int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); +-char *sys_acl_to_text( SMB_ACL_T the_acl, ssize_t *plen); +-SMB_ACL_T sys_acl_init( int count); +-int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry); +-int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype); +-int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual); +-int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset); +-int sys_acl_valid( SMB_ACL_T theacl ); +-int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl); +-int sys_acl_set_fd( int fd, SMB_ACL_T theacl); +-int sys_acl_delete_def_file(const char *name); +-int sys_acl_free_text(char *text); +-int sys_acl_free_acl(SMB_ACL_T the_acl) ; +-int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype); +-int sys_acl_get_entry( SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p); +-int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p); +-int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p); +-void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d); +-SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type); +-SMB_ACL_T sys_acl_get_fd(int fd); +-int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset); +-int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); +-int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); +-char *sys_acl_to_text( SMB_ACL_T the_acl, ssize_t *plen); +-SMB_ACL_T sys_acl_init( int count); +-int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry); +-int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype); +-int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual); +-int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset); +-int sys_acl_valid( SMB_ACL_T theacl ); +-int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl); +-int sys_acl_set_fd( int fd, SMB_ACL_T theacl); +-int sys_acl_delete_def_file(const char *name); +-int sys_acl_free_text(char *text); +-int sys_acl_free_acl(SMB_ACL_T the_acl) ; +-int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype); +-int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p); +-int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p); +-int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p); +-void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d); +-SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type); +-SMB_ACL_T sys_acl_get_fd(int fd); +-int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d); +-int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm); +-int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm); +-char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p); +-SMB_ACL_T sys_acl_init(int count); +-int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p); +-int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type); +-int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p); +-int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d); +-int sys_acl_valid(SMB_ACL_T acl_d); +-int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d); +-int sys_acl_set_fd(int fd, SMB_ACL_T acl_d); +-int sys_acl_delete_def_file(const char *path); +-int sys_acl_free_text(char *text); +-int sys_acl_free_acl(SMB_ACL_T acl_d) ; +-int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype); +-int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p); +-int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p); +-int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p); +-void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d); +-SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type); +-SMB_ACL_T sys_acl_get_fd(int fd); +-int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d); +-int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm); +-int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm); +-char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p); +-SMB_ACL_T sys_acl_init(int count); +-int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p); +-int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type); +-int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p); +-int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d); +-int sys_acl_valid(SMB_ACL_T acl_d); +-int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d); +-int sys_acl_set_fd(int fd, SMB_ACL_T acl_d); +-int sys_acl_delete_def_file(const char *path); +-int sys_acl_free_text(char *text); +-int sys_acl_free_acl(SMB_ACL_T acl_d) ; +-int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype); +-int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p); +-int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p); +-int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p); +-void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d); +-SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type); +-SMB_ACL_T sys_acl_get_fd(int fd); +-int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d); +-int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm); +-int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm); +-char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p); +-SMB_ACL_T sys_acl_init(int count); +-int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p); +-int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type); +-int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p); +-int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d); +-int sys_acl_valid(SMB_ACL_T acl_d); +-int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d); +-int sys_acl_set_fd(int fd, SMB_ACL_T acl_d); +-int sys_acl_delete_def_file(const char *name); +-int sys_acl_free_text(char *text); +-int sys_acl_free_acl(SMB_ACL_T acl_d) ; +-int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype); +-int sys_acl_get_entry( SMB_ACL_T theacl, int entry_id, SMB_ACL_ENTRY_T *entry_p); +-int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p); +-int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p); +-void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d); +-SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type); +-SMB_ACL_T sys_acl_get_fd(int fd); +-int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset); +-int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); +-char *sys_acl_to_text( SMB_ACL_T theacl, ssize_t *plen); +-SMB_ACL_T sys_acl_init( int count); +-int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry); +-int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype); +-int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual); +-int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset); +-int sys_acl_valid( SMB_ACL_T theacl ); +-int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl); +-int sys_acl_set_fd( int fd, SMB_ACL_T theacl); +-int sys_acl_delete_def_file(const char *name); +-int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); +-int sys_acl_free_text(char *text); +-int sys_acl_free_acl(SMB_ACL_T posix_acl); +-int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype); +-int sys_acl_get_entry( SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p); +-int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p); +-int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p); +-void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d); +-SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type); +-SMB_ACL_T sys_acl_get_fd(int fd); +-int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset); +-int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); +-int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); +-char *sys_acl_to_text( SMB_ACL_T the_acl, ssize_t *plen); +-int sys_acl_free_text(char *text); +-SMB_ACL_T sys_acl_init( int count); +-int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry); +-int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype); +-int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual); +-int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset); +-int sys_acl_valid( SMB_ACL_T theacl ); +-int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl); +-int sys_acl_set_fd( int fd, SMB_ACL_T theacl); +-int sys_acl_delete_def_file(const char *name); +-int sys_acl_free_acl(SMB_ACL_T the_acl) ; +-int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype); ++int cli_list_new(struct cli_state *cli,const char *Mask,uint16 attribute, ++ void (*fn)(file_info *, const char *, void *), void *state); ++int cli_list_old(struct cli_state *cli,const char *Mask,uint16 attribute, ++ void (*fn)(file_info *, const char *, void *), void *state); ++int cli_list(struct cli_state *cli,const char *Mask,uint16 attribute, ++ void (*fn)(file_info *, const char *, void *), void *state); + +-/* The following definitions come from lib/system.c */ ++/* The following definitions come from libsmb/climessage.c */ + +-int sys_usleep(long usecs); +-ssize_t sys_read(int fd, void *buf, size_t count); +-ssize_t sys_write(int fd, const void *buf, size_t count); +-ssize_t sys_send(int s, const void *msg, size_t len, int flags); +-ssize_t sys_sendto(int s, const void *msg, size_t len, int flags, const struct sockaddr *to, socklen_t tolen); +-ssize_t sys_recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlen); +-int sys_fcntl_ptr(int fd, int cmd, void *arg); +-int sys_fcntl_long(int fd, int cmd, long arg); +-int sys_stat(const char *fname,SMB_STRUCT_STAT *sbuf); +-int sys_fstat(int fd,SMB_STRUCT_STAT *sbuf); +-int sys_lstat(const char *fname,SMB_STRUCT_STAT *sbuf); +-int sys_ftruncate(int fd, SMB_OFF_T offset); +-SMB_OFF_T sys_lseek(int fd, SMB_OFF_T offset, int whence); +-int sys_fseek(FILE *fp, SMB_OFF_T offset, int whence); +-SMB_OFF_T sys_ftell(FILE *fp); +-int sys_creat(const char *path, mode_t mode); +-int sys_open(const char *path, int oflag, mode_t mode); +-FILE *sys_fopen(const char *path, const char *type); +-SMB_STRUCT_DIRENT *sys_readdir(DIR *dirp); +-int sys_mknod(const char *path, mode_t mode, SMB_DEV_T dev); +-char *sys_realpath(const char *path, char *resolved_path); +-int sys_waitpid(pid_t pid,int *status,int options); +-char *sys_getwd(char *s); +-int sys_symlink(const char *oldpath, const char *newpath); +-int sys_readlink(const char *path, char *buf, size_t bufsiz); +-int sys_link(const char *oldpath, const char *newpath); +-int sys_chown(const char *fname,uid_t uid,gid_t gid); +-int sys_chroot(const char *dname); +-struct hostent *sys_gethostbyname(const char *name); +-void oplock_set_capability(BOOL this_process, BOOL inherit); +-long sys_random(void); +-void sys_srandom(unsigned int seed); +-int groups_max(void); +-int sys_getgroups(int setlen, gid_t *gidset); +-int sys_setgroups(int setlen, gid_t *gidset); +-void sys_setpwent(void); +-struct passwd *sys_getpwent(void); +-void sys_endpwent(void); +-struct passwd *sys_getpwnam(const char *name); +-struct passwd *sys_getpwuid(uid_t uid); +-int wsys_stat(const smb_ucs2_t *wfname,SMB_STRUCT_STAT *sbuf); +-int wsys_lstat(const smb_ucs2_t *wfname,SMB_STRUCT_STAT *sbuf); +-int wsys_creat(const smb_ucs2_t *wfname, mode_t mode); +-int wsys_open(const smb_ucs2_t *wfname, int oflag, mode_t mode); +-FILE *wsys_fopen(const smb_ucs2_t *wfname, const char *type); +-DIR *wsys_opendir(const smb_ucs2_t *wfname); +-smb_ucs2_t *wsys_getwd(smb_ucs2_t *s); +-int wsys_chown(const smb_ucs2_t *wfname, uid_t uid, gid_t gid); +-int wsys_chroot(const smb_ucs2_t *wfname); +-pid_t sys_fork(void); +-pid_t sys_getpid(void); +-int sys_popen(const char *command); +-int sys_pclose(int fd); +-void *sys_dlopen(const char *name, int flags); +-void *sys_dlsym(void *handle, char *symbol); +-int sys_dlclose (void *handle); +-const char *sys_dlerror(void); +-void sys_adminlog(int priority, const char *format_str, ...); ++BOOL cli_message_start(struct cli_state *cli, char *host, char *username, ++ int *grp); ++BOOL cli_message_text(struct cli_state *cli, char *msg, int len, int grp); ++BOOL cli_message_end(struct cli_state *cli, int grp); + +-/* The following definitions come from lib/talloc.c */ ++/* The following definitions come from libsmb/clioplock.c */ + +-TALLOC_CTX *talloc_init(void); +-void *talloc(TALLOC_CTX *t, size_t size); +-void *talloc_realloc(TALLOC_CTX *t, void *ptr, size_t size); +-void talloc_destroy_pool(TALLOC_CTX *t); +-void talloc_destroy(TALLOC_CTX *t); +-size_t talloc_pool_size(TALLOC_CTX *t); +-const char * talloc_pool_name(TALLOC_CTX const *t); +-void *talloc_zero(TALLOC_CTX *t, size_t size); +-void *talloc_memdup(TALLOC_CTX *t, const void *p, size_t size); +-char *talloc_strdup(TALLOC_CTX *t, const char *p); +-char *talloc_describe_all(TALLOC_CTX *rt); +-void talloc_get_allocation(TALLOC_CTX *t, +- size_t *total_bytes, +- int *n_chunks); ++BOOL cli_oplock_ack(struct cli_state *cli, int fnum, unsigned char level); ++void cli_oplock_handler(struct cli_state *cli, ++ BOOL (*handler)(struct cli_state *, int, unsigned char)); + +-/* The following definitions come from lib/time.c */ ++/* The following definitions come from libsmb/cliprint.c */ + +-time_t get_time_t_min(void); +-time_t get_time_t_max(void); +-void GetTimeOfDay(struct timeval *tval); +-void TimeInit(void); +-void get_process_uptime(struct timeval *ret_time); +-int TimeDiff(time_t t); +-struct tm *LocalTime(time_t *t); +-time_t nt_time_to_unix(NTTIME *nt); +-time_t nt_time_to_unix_abs(NTTIME *nt); +-time_t interpret_long_date(char *p); +-void unix_to_nt_time(NTTIME *nt, time_t t); +-void unix_to_nt_time_abs(NTTIME *nt, time_t t); +-void put_long_date(char *p,time_t t); +-BOOL null_mtime(time_t mtime); +-void put_dos_date(char *buf,int offset,time_t unixdate); +-void put_dos_date2(char *buf,int offset,time_t unixdate); +-void put_dos_date3(char *buf,int offset,time_t unixdate); +-time_t make_unix_date(void *date_ptr); +-time_t make_unix_date2(void *date_ptr); +-time_t make_unix_date3(void *date_ptr); +-char *http_timestring(time_t t); +-char *timestring(BOOL hires); +-time_t get_create_time(SMB_STRUCT_STAT *st,BOOL fake_dirs); +-void init_nt_time(NTTIME *nt); ++int cli_print_queue(struct cli_state *cli, ++ void (*fn)(struct print_job_info *)); ++int cli_printjob_del(struct cli_state *cli, int job); + +-/* The following definitions come from lib/ufc.c */ ++/* The following definitions come from libsmb/clirap.c */ + +-char *ufc_crypt(const char *key,const char *salt); ++BOOL cli_api_pipe(struct cli_state *cli, char *pipe_name, ++ uint16 *setup, uint32 setup_count, uint32 max_setup_count, ++ char *params, uint32 param_count, uint32 max_param_count, ++ char *data, uint32 data_count, uint32 max_data_count, ++ char **rparam, uint32 *rparam_count, ++ char **rdata, uint32 *rdata_count); ++BOOL cli_api(struct cli_state *cli, ++ char *param, int prcnt, int mprcnt, ++ char *data, int drcnt, int mdrcnt, ++ char **rparam, int *rprcnt, ++ char **rdata, int *rdrcnt); ++BOOL cli_NetWkstaUserLogon(struct cli_state *cli,char *user, char *workstation); ++int cli_RNetShareEnum(struct cli_state *cli, void (*fn)(const char *, uint32, const char *, void *), void *state); ++BOOL cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype, ++ void (*fn)(const char *, uint32, const char *, void *), ++ void *state); ++BOOL cli_oem_change_password(struct cli_state *cli, const char *user, const char *new_password, ++ const char *old_password); ++BOOL cli_qpathinfo(struct cli_state *cli, const char *fname, ++ time_t *c_time, time_t *a_time, time_t *m_time, ++ size_t *size, uint16 *mode); ++BOOL cli_qpathinfo2(struct cli_state *cli, const char *fname, ++ time_t *c_time, time_t *a_time, time_t *m_time, ++ time_t *w_time, size_t *size, uint16 *mode, ++ SMB_INO_T *ino); ++BOOL cli_qfileinfo(struct cli_state *cli, int fnum, ++ uint16 *mode, size_t *size, ++ time_t *c_time, time_t *a_time, time_t *m_time, ++ time_t *w_time, SMB_INO_T *ino); ++BOOL cli_qfileinfo_test(struct cli_state *cli, int fnum, int level, char *outdata); ++NTSTATUS cli_qpathinfo_alt_name(struct cli_state *cli, const char *fname, fstring alt_name); + +-/* The following definitions come from lib/username.c */ ++/* The following definitions come from libsmb/clireadwrite.c */ + +-BOOL name_is_local(const char *name); +-char *get_user_home_dir(char *user); +-char *get_user_service_home_dir(char *user); +-BOOL map_username(char *user); +-struct passwd *Get_Pwnam(char *user,BOOL allow_change); +-BOOL user_in_group_list(char *user,char *gname); +-BOOL user_in_list(char *user,char *list); +-struct passwd *smb_getpwnam(char *user, BOOL allow_change); ++ssize_t cli_read(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size); ++ssize_t cli_readraw(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size); ++ssize_t cli_write(struct cli_state *cli, ++ int fnum, uint16 write_mode, ++ char *buf, off_t offset, size_t size); ++ssize_t cli_smbwrite(struct cli_state *cli, ++ int fnum, char *buf, off_t offset, size_t size1); + +-/* The following definitions come from lib/util.c */ ++/* The following definitions come from libsmb/clisecdesc.c */ + +-char *tmpdir(void); +-BOOL in_group(gid_t group, gid_t current_gid, int ngroups, gid_t *groups); +-char *Atoic(char *p, int *n, char *c); +-char *get_numlist(char *p, uint32 **num, int *count); +-BOOL file_exist(char *fname,SMB_STRUCT_STAT *sbuf); +-time_t file_modtime(char *fname); +-BOOL directory_exist(char *dname,SMB_STRUCT_STAT *st); +-SMB_OFF_T get_file_size(char *file_name); +-char *attrib_string(uint16 mode); +-void show_msg(char *buf); +-void smb_setlen(char *buf,int len); +-int set_message(char *buf,int num_words,int num_bytes,BOOL zero); +-int set_message_bcc(char *buf,int num_bytes); +-int set_message_end(void *outbuf,void *end_ptr); +-void dos_clean_name(char *s); +-void unix_clean_name(char *s); +-void make_dir_struct(char *buf,char *mask,char *fname,SMB_OFF_T size,int mode,time_t date); +-void close_low_fds(void); +-int set_blocking(int fd, BOOL set); +-ssize_t transfer_file_internal(int infd, int outfd, size_t n, ssize_t (*read_fn)(int, void *, size_t), +- ssize_t (*write_fn)(int, const void *, size_t)); +-SMB_OFF_T transfer_file(int infd,int outfd,SMB_OFF_T n); +-void msleep(unsigned int t); +-void become_daemon(void); +-BOOL yesno(char *p); +-void *Realloc(void *p,size_t size); +-void safe_free(void *p); +-BOOL get_myname(char *my_name); +-int interpret_protocol(char *str,int def); +-BOOL is_ipaddress(const char *str); +-uint32 interpret_addr(const char *str); +-struct in_addr *interpret_addr2(const char *str); +-BOOL is_zero_ip(struct in_addr ip); +-void zero_ip(struct in_addr *ip); +-char *automount_lookup(char *user_name); +-char *automount_lookup(char *user_name); +-BOOL same_net(struct in_addr ip1,struct in_addr ip2,struct in_addr mask); +-BOOL process_exists(pid_t pid); +-char *uidtoname(uid_t uid); +-char *gidtoname(gid_t gid); +-uid_t nametouid(char *name); +-gid_t nametogid(char *name); +-void smb_panic(char *why); +-char *readdirname(DIR *p); +-BOOL is_in_path(char *name, name_compare_entry *namelist); +-void set_namearray(name_compare_entry **ppname_array, char *namelist); +-void free_namearray(name_compare_entry *name_array); +-BOOL fcntl_lock(int fd, int op, SMB_OFF_T offset, SMB_OFF_T count, int type); +-BOOL is_myname(char *s); +-const char* get_my_primary_ip (void); +-BOOL is_myname_or_ipaddr(char *s); +-void set_remote_arch(enum remote_arch_types type); +-enum remote_arch_types get_remote_arch(void); +-void out_ascii(FILE *f, unsigned char *buf,int len); +-void out_data(FILE *f,char *buf1,int len, int per_line); +-void print_asc(int level, unsigned char *buf,int len); +-void dump_data(int level,char *buf1,int len); +-char *tab_depth(int depth); +-int str_checksum(const char *s); +-void zero_free(void *p, size_t size); +-int set_maxfiles(int requested_max); +-BOOL reg_split_key(char *full_keyname, uint32 *reg_type, char *key_name); +-int smb_mkstemp(char *template); +-void *smb_xmalloc(size_t size); +-void *smb_xmemdup(const void *p, size_t size); +-char *smb_xstrdup(const char *s); +-int smb_xvasprintf(char **ptr, const char *format, va_list ap); +-void *memdup(void *p, size_t size); +-char *myhostname(void); +-char *lock_path(char *name); +-char *pid_path(char *name); +-char *parent_dirname(const char *path); +-BOOL ms_has_wild(char *s); +-BOOL mask_match(char *string, char *pattern, BOOL is_case_sensitive); +-BOOL unix_wild_match(char *pattern, char *string); +-DATA_BLOB data_blob(const void *p, size_t length); +-DATA_BLOB data_blob_talloc(TALLOC_CTX *mem_ctx, const void *p, size_t length); +-void data_blob_free(DATA_BLOB *d); +-void data_blob_clear(DATA_BLOB *d); +-int _Insure_trap_error(int a1, int a2, int a3, int a4, int a5, int a6); ++SEC_DESC *cli_query_secdesc(struct cli_state *cli, int fnum, ++ TALLOC_CTX *mem_ctx); ++BOOL cli_set_secdesc(struct cli_state *cli, int fnum, SEC_DESC *sd); ++ ++/* The following definitions come from libsmb/clistr.c */ ++ ++int clistr_push(struct cli_state *cli, void *dest, const char *src, int dest_len, int flags); ++int clistr_pull(struct cli_state *cli, char *dest, const void *src, int dest_len, int src_len, int flags); ++int clistr_align_out(struct cli_state *cli, const void *p, int flags); ++int clistr_align_in(struct cli_state *cli, const void *p, int flags); + +-/* The following definitions come from lib/util_file.c */ ++/* The following definitions come from libsmb/clitrans.c */ + +-BOOL do_file_lock(int fd, int waitsecs, int type); +-BOOL file_lock(int fd, int type, int secs, int *plock_depth); +-BOOL file_unlock(int fd, int *plock_depth); +-void *startfilepwent(char *pfile, char *s_readbuf, int bufsize, +- int *file_lock_depth, BOOL update); +-void endfilepwent(void *vp, int *file_lock_depth); +-SMB_BIG_UINT getfilepwpos(void *vp); +-BOOL setfilepwpos(void *vp, SMB_BIG_UINT tok); +-int getfileline(void *vp, char *linebuf, int linebuf_size); +-char *fgets_slash(char *s2,int maxlen,FILE *f); +-char *file_pload(char *syscmd, size_t *size); +-char *fd_load(int fd, size_t *size); +-char *file_load(char *fname, size_t *size); +-char **file_lines_load(char *fname, int *numlines, BOOL convert); +-char **fd_lines_load(int fd, int *numlines, BOOL convert); +-char **file_lines_pload(char *syscmd, int *numlines, BOOL convert); +-void file_lines_free(char **lines); +-void file_lines_slashcont(char **lines); ++BOOL cli_send_trans(struct cli_state *cli, int trans, ++ const char *pipe_name, ++ int fid, int flags, ++ uint16 *setup, int lsetup, int msetup, ++ char *param, int lparam, int mparam, ++ char *data, int ldata, int mdata); ++BOOL cli_receive_trans(struct cli_state *cli,int trans, ++ char **param, int *param_len, ++ char **data, int *data_len); ++BOOL cli_send_nt_trans(struct cli_state *cli, ++ int function, ++ int flags, ++ uint16 *setup, int lsetup, int msetup, ++ char *param, int lparam, int mparam, ++ char *data, int ldata, int mdata); ++BOOL cli_receive_nt_trans(struct cli_state *cli, ++ char **param, int *param_len, ++ char **data, int *data_len); + +-/* The following definitions come from lib/util_getent.c */ ++/* The following definitions come from libsmb/credentials.c */ + +-struct sys_grent * getgrent_list(void); +-void grent_free (struct sys_grent *glist); +-struct sys_pwent * getpwent_list(void); +-void pwent_free (struct sys_pwent *plist); +-struct sys_userlist *get_users_in_group(const char *gname); +-void free_userlist(struct sys_userlist *list_head); ++char *credstr(const uchar *cred); ++void cred_session_key(const DOM_CHAL *clnt_chal, const DOM_CHAL *srv_chal, const uchar *pass, ++ uchar session_key[8]); ++void cred_create(uchar session_key[8], DOM_CHAL *stor_cred, UTIME timestamp, ++ DOM_CHAL *cred); ++int cred_assert(DOM_CHAL *cred, uchar session_key[8], DOM_CHAL *stored_cred, ++ UTIME timestamp); ++BOOL clnt_deal_with_creds(uchar sess_key[8], ++ DOM_CRED *sto_clnt_cred, DOM_CRED *rcv_srv_cred); ++BOOL deal_with_creds(uchar sess_key[8], ++ DOM_CRED *sto_clnt_cred, ++ DOM_CRED *rcv_clnt_cred, DOM_CRED *rtn_srv_cred); + +-/* The following definitions come from lib/util_seaccess.c */ ++/* The following definitions come from libsmb/doserr.c */ + +-void se_map_generic(uint32 *access_mask, struct generic_mapping *mapping); +-void se_map_standard(uint32 *access_mask, struct standard_mapping *mapping); +-BOOL se_access_check(SEC_DESC *sd, NT_USER_TOKEN *token, +- uint32 acc_desired, uint32 *acc_granted, +- NTSTATUS *status); +-SEC_DESC_BUF *se_create_child_secdesc(TALLOC_CTX *ctx, SEC_DESC *parent_ctr, +- BOOL child_container); ++char *dos_errstr(WERROR werror); + +-/* The following definitions come from lib/util_sec.c */ ++/* The following definitions come from libsmb/errormap.c */ + +-void sec_init(void); +-uid_t sec_initial_uid(void); +-gid_t sec_initial_gid(void); +-BOOL non_root_mode(void); +-void gain_root_privilege(void); +-void gain_root_group_privilege(void); +-void set_effective_uid(uid_t uid); +-void set_effective_gid(gid_t gid); +-void save_re_uid(void); +-void restore_re_uid(void); +-int set_re_uid(void); +-void become_user_permanently(uid_t uid, gid_t gid); +-BOOL is_setuid_root(void) ; ++NTSTATUS dos_to_ntstatus(int eclass, int ecode); ++void ntstatus_to_dos(NTSTATUS ntstatus, uint8 *eclass, uint32 *ecode); ++NTSTATUS werror_to_ntstatus(WERROR error); ++WERROR ntstatus_to_werror(NTSTATUS error); + +-/* The following definitions come from lib/util_sid.c */ ++/* The following definitions come from libsmb/namequery.c */ + +-void generate_wellknown_sids(void); +-BOOL map_domain_sid_to_name(DOM_SID *sid, char *nt_domain); +-BOOL lookup_known_rid(DOM_SID *sid, uint32 rid, char *name, enum SID_NAME_USE *psid_name_use); +-BOOL map_domain_name_to_sid(DOM_SID *sid, char *nt_domain); +-void split_domain_name(const char *fullname, char *domain, char *name); +-char *sid_to_string(fstring sidstr_out, DOM_SID *sid); +-const char *sid_string_static(DOM_SID *sid); +-BOOL string_to_sid(DOM_SID *sidout, const char *sidstr); +-BOOL sid_append_rid(DOM_SID *sid, uint32 rid); +-BOOL sid_split_rid(DOM_SID *sid, uint32 *rid); +-BOOL sid_peek_rid(DOM_SID *sid, uint32 *rid); +-void sid_copy(DOM_SID *dst, const DOM_SID *src); +-DOM_SID *sid_dup(DOM_SID *src); +-BOOL sid_linearize(char *outbuf, size_t len, DOM_SID *sid); +-BOOL sid_parse(char *inbuf, size_t len, DOM_SID *sid); +-int sid_compare_auth(const DOM_SID *sid1, const DOM_SID *sid2); +-int sid_compare(const DOM_SID *sid1, const DOM_SID *sid2); +-int sid_compare_domain(const DOM_SID *sid1, const DOM_SID *sid2); +-BOOL sid_equal(const DOM_SID *sid1, const DOM_SID *sid2); +-BOOL sid_check_is_domain(const DOM_SID *sid); +-BOOL sid_check_is_builtin(const DOM_SID *sid); +-BOOL sid_check_is_in_our_domain(const DOM_SID *sid); +-BOOL sid_check_is_in_builtin(const DOM_SID *sid); +-size_t sid_size(DOM_SID *sid); +-BOOL non_mappable_sid(DOM_SID *sid); +-char *sid_binstring(DOM_SID *sid); ++struct node_status *node_status_query(int fd,struct nmb_name *name, ++ struct in_addr to_ip, int *num_names); ++BOOL name_status_find(const char *q_name, int q_type, int type, struct in_addr to_ip, char *name); ++BOOL name_register(int fd, const char *name, int name_type, ++ struct in_addr name_ip, int opcode, ++ BOOL bcast, ++ struct in_addr to_ip, int *count); ++struct in_addr *name_query(int fd,const char *name,int name_type, ++ BOOL bcast,BOOL recurse, ++ struct in_addr to_ip, int *count); ++FILE *startlmhosts(char *fname); ++BOOL getlmhostsent( FILE *fp, pstring name, int *name_type, struct in_addr *ipaddr); ++void endlmhosts(FILE *fp); ++BOOL name_register_wins(const char *name, int name_type); ++BOOL name_resolve_bcast(const char *name, int name_type, ++ struct in_addr **return_ip_list, int *return_count); ++BOOL resolve_name(const char *name, struct in_addr *return_ip, int name_type); ++BOOL resolve_srv_name(const char* srv_name, fstring dest_host, ++ struct in_addr *ip); ++BOOL find_master_ip(char *group, struct in_addr *master_ip); ++BOOL lookup_dc_name(const char *srcname, const char *domain, ++ struct in_addr *dc_ip, char *ret_name); ++BOOL get_dc_list(BOOL pdc_only, const char *group, struct in_addr **ip_list, int *count); ++BOOL get_lmb_list(struct in_addr **ip_list, int *count); + +-/* The following definitions come from lib/util_sock.c */ ++/* The following definitions come from libsmb/nmblib.c */ + +-BOOL is_a_socket(int fd); +-void set_socket_options(int fd, char *options); +-ssize_t read_udp_socket(int fd,char *buf,size_t len); +-ssize_t read_with_timeout(int fd,char *buf,size_t mincnt,size_t maxcnt,unsigned int time_out); +-BOOL send_keepalive(int client); +-ssize_t read_data(int fd,char *buffer,size_t N); +-ssize_t write_data(int fd,char *buffer,size_t N); +-ssize_t write_socket_data(int fd,char *buffer,size_t N); +-ssize_t write_socket(int fd,char *buf,size_t len); +-ssize_t read_smb_length(int fd,char *inbuf,unsigned int timeout); +-BOOL receive_smb(int fd,char *buffer, unsigned int timeout); +-BOOL client_receive_smb(int fd,char *buffer, unsigned int timeout); +-BOOL send_smb(int fd,char *buffer); +-BOOL send_one_packet(char *buf,int len,struct in_addr ip,int port,int type); +-int open_socket_in( int type, int port, int dlevel, uint32 socket_addr, BOOL rebind ); +-int open_socket_out(int type, struct in_addr *addr, int port ,int timeout); +-void client_setfd(int fd); +-char *client_name(void); +-char *client_addr(void); +-char *get_socket_name(int fd); +-char *get_socket_addr(int fd); +-int create_pipe_sock(const char *socket_dir, +- const char *socket_name, +- mode_t dir_perms); +-int sock_exec(const char *prog); ++void debug_nmb_packet(struct packet_struct *p); ++char *nmb_namestr(struct nmb_name *n); ++struct packet_struct *copy_packet(struct packet_struct *packet); ++void free_packet(struct packet_struct *packet); ++struct packet_struct *parse_packet(char *buf,int length, ++ enum packet_type packet_type); ++struct packet_struct *read_packet(int fd,enum packet_type packet_type); ++void make_nmb_name( struct nmb_name *n, const char *name, int type); ++BOOL nmb_name_equal(struct nmb_name *n1, struct nmb_name *n2); ++int build_packet(char *buf, struct packet_struct *p); ++BOOL send_packet(struct packet_struct *p); ++struct packet_struct *receive_packet(int fd,enum packet_type type,int t); ++struct packet_struct *receive_nmb_packet(int fd, int t, int trn_id); ++struct packet_struct *receive_dgram_packet(int fd, int t, char *mailslot_name); ++BOOL match_mailslot_name(struct packet_struct *p, char *mailslot_name); ++void sort_query_replies(char *data, int n, struct in_addr ip); ++char *dns_to_netbios_name(char *dns_name); ++int name_mangle( char *In, char *Out, char name_type ); ++int name_extract(char *buf,int ofs,char *name); ++int name_len(char *s1); + +-/* The following definitions come from lib/util_str.c */ ++/* The following definitions come from libsmb/nterr.c */ + +-void set_first_token(char *ptr); +-BOOL next_token(char **ptr,char *buff,char *sep, size_t bufsize); +-char **toktocliplist(int *ctok, char *sep); +-int StrCaseCmp(const char *s, const char *t); +-int StrnCaseCmp(const char *s, const char *t, size_t n); +-BOOL strequal(const char *s1, const char *s2); +-BOOL strnequal(const char *s1,const char *s2,size_t n); +-BOOL strcsequal(const char *s1,const char *s2); +-int strwicmp(char *psz1, char *psz2); +-void strlower(char *s); +-void strupper(char *s); +-void strnorm(char *s); +-BOOL strisnormal(char *s); +-void string_replace(char *s,char oldc,char newc); +-char *skip_string(char *buf,size_t n); +-size_t str_charnum(const char *s); +-BOOL trim_string(char *s,const char *front,const char *back); +-BOOL strhasupper(const char *s); +-BOOL strhaslower(const char *s); +-size_t count_chars(const char *s,char c); +-BOOL str_is_all(const char *s,char c); +-char *safe_strcpy(char *dest,const char *src, size_t maxlength); +-char *safe_strcat(char *dest, const char *src, size_t maxlength); +-char *alpha_strcpy(char *dest, const char *src, const char *other_safe_chars, size_t maxlength); +-char *StrnCpy(char *dest,const char *src,size_t n); +-char *strncpyn(char *dest, const char *src,size_t n, char c); +-size_t strhex_to_str(char *p, size_t len, const char *strhex); +-BOOL in_list(char *s,char *list,BOOL casesensitive); +-void string_free(char **s); +-BOOL string_set(char **dest,const char *src); +-void string_sub(char *s,const char *pattern,const char *insert, size_t len); +-void fstring_sub(char *s,const char *pattern,const char *insert); +-void pstring_sub(char *s,const char *pattern,const char *insert); +-void all_string_sub(char *s,const char *pattern,const char *insert, size_t len); +-void split_at_last_component(char *path, char *front, char sep, char *back); +-char *octal_string(int i); +-char *string_truncate(char *s, int length); +-char *binary_string(char *buf, int len); ++char *get_nt_error_msg(NTSTATUS nt_code); ++char *nt_errstr(NTSTATUS nt_code); ++char *get_nt_error_c_code(NTSTATUS nt_code); ++ ++/* The following definitions come from libsmb/passchange.c */ ++ ++BOOL remote_password_change(const char *remote_machine, const char *user_name, ++ const char *old_passwd, const char *new_passwd, ++ char *err_str, size_t err_str_len); ++ ++/* The following definitions come from libsmb/pwd_cache.c */ ++ ++void pwd_init(struct pwd_info *pwd); ++BOOL pwd_is_nullpwd(const struct pwd_info *pwd); ++BOOL pwd_compare(struct pwd_info *pwd1, struct pwd_info *pwd2); ++void pwd_read(struct pwd_info *pwd, char *passwd_report, BOOL do_encrypt); ++void pwd_set_nullpwd(struct pwd_info *pwd); ++void pwd_set_cleartext(struct pwd_info *pwd, char *clr); ++void pwd_get_cleartext(struct pwd_info *pwd, char *clr); ++void pwd_set_lm_nt_16(struct pwd_info *pwd, uchar lm_pwd[16], uchar nt_pwd[16]); ++void pwd_get_lm_nt_16(struct pwd_info *pwd, uchar lm_pwd[16], uchar nt_pwd[16]); ++void pwd_make_lm_nt_16(struct pwd_info *pwd, char *clr); ++void pwd_make_lm_nt_owf(struct pwd_info *pwd, uchar cryptkey[8]); ++void pwd_get_lm_nt_owf(struct pwd_info *pwd, uchar lm_owf[24], uchar nt_owf[24]); ++ ++/* The following definitions come from libsmb/smbdes.c */ ++ ++void E_P16(const unsigned char *p14,unsigned char *p16); ++void E_P24(const unsigned char *p21, const unsigned char *c8, unsigned char *p24); ++void D_P16(const unsigned char *p14, const unsigned char *in, unsigned char *out); ++void E_old_pw_hash( unsigned char *p14, const unsigned char *in, unsigned char *out); ++void cred_hash1(unsigned char *out, const unsigned char *in, const unsigned char *key); ++void cred_hash2(unsigned char *out, const unsigned char *in, const unsigned char *key); ++void cred_hash3(unsigned char *out, unsigned char *in, const unsigned char *key, int forw); ++void SamOEMhash( unsigned char *data, const unsigned char *key, int val); ++void sam_pwd_hash(unsigned int rid, const uchar *in, uchar *out, int forw); + +-/* The following definitions come from lib/util_unistr.c */ ++/* The following definitions come from libsmb/smbencrypt.c */ + +-size_t unix_PutUniCode(char *dst,const char *src, ssize_t len, BOOL null_terminate); +-size_t dos_PutUniCode(char *dst,const char *src, ssize_t len, BOOL null_terminate); +-void unistr_to_dos(char *dest, const char *src, size_t len); +-char *skip_unibuf(char *src, size_t len); +-char *dos_unistrn2(uint16 *src, int len); +-char *dos_unistr2(uint16 *src); +-char *dos_unistr2_to_str(UNISTR2 *str); +-void ascii_to_unistr(uint16 *dest, const char *src, int maxlen); +-void unistr_to_ascii(char *dest, const uint16 *src, int len); +-void unistr2_to_ascii(char *dest, const UNISTR2 *str, size_t maxlen); +-char *unistr2_tdup(TALLOC_CTX *ctx, const UNISTR2 *str); +-uint32 buffer2_to_uint32(BUFFER2 *str); +-char *dos_buffer2_to_str(BUFFER2 *str); +-char *dos_buffer2_to_multistr(BUFFER2 *str); +-size_t dos_struni2(char *dst, const char *src, size_t max_len); +-char *dos_unistr(char *buf); +-int unistrlen(uint16 *s); +-int unistrcpy(uint16 *dst, uint16 *src); +-void default_unicode_map(smb_ucs2_t **pp_cp_to_ucs2, uint16 **pp_ucs2_to_cp); +-BOOL load_unicode_map(const char *codepage, smb_ucs2_t **pp_cp_to_ucs2, uint16 **pp_ucs2_to_cp); +-BOOL load_dos_unicode_map(int codepage); +-BOOL load_unix_unicode_map(const char *unix_char_set, BOOL override); +-smb_ucs2_t *multibyte_to_unicode(smb_ucs2_t *dst, const char *src, +- size_t dst_len, smb_ucs2_t *cp_to_ucs2); +-char *unicode_to_unix(char *dst, const smb_ucs2_t *src, size_t dst_len); +-smb_ucs2_t *unix_to_unicode(smb_ucs2_t *dst, const char *src, size_t dst_len); +-size_t unicode_to_unix_char(char *dst, const smb_ucs2_t src); +-char *unicode_to_dos(char *dst, const smb_ucs2_t *src, size_t dst_len); +-size_t unicode_to_dos_char(char *dst, const smb_ucs2_t src); +-smb_ucs2_t *dos_to_unicode(smb_ucs2_t *dst, const char *src, size_t dst_len); +-size_t strlen_w(const smb_ucs2_t *src); +-smb_ucs2_t *safe_strcpy_w(smb_ucs2_t *dest,const smb_ucs2_t *src, size_t maxlength); +-smb_ucs2_t *safe_strcat_w(smb_ucs2_t *dest, const smb_ucs2_t *src, size_t maxlength); +-int strcmp_w(const smb_ucs2_t *s1, const smb_ucs2_t *s2); +-int strncmp_w(const smb_ucs2_t *s1, const smb_ucs2_t *s2, size_t len); +-smb_ucs2_t *strstr_w(const smb_ucs2_t *s1, const smb_ucs2_t *s2); +-smb_ucs2_t *strchr_w(const smb_ucs2_t *s, smb_ucs2_t c); +-smb_ucs2_t *strrchr_w(const smb_ucs2_t *s, smb_ucs2_t c); +-smb_ucs2_t *strtok_w(smb_ucs2_t *s1, const smb_ucs2_t *s2); +-smb_ucs2_t *strdup_w(const smb_ucs2_t *s); +-int isupper_w( smb_ucs2_t val); +-int islower_w( smb_ucs2_t val); +-int isdigit_w( smb_ucs2_t val); +-int isxdigit_w( smb_ucs2_t val); +-int isspace_w( smb_ucs2_t val); +-smb_ucs2_t toupper_w( smb_ucs2_t val ); +-smb_ucs2_t tolower_w( smb_ucs2_t val ); +-void set_first_token_w(smb_ucs2_t *ptr); +-BOOL next_token_w(smb_ucs2_t **ptr, smb_ucs2_t *buff, smb_ucs2_t *sep, size_t bufsize); +-smb_ucs2_t **toktocliplist_w(int *ctok, smb_ucs2_t *sep); +-int StrCaseCmp_w(const smb_ucs2_t *s, const smb_ucs2_t *t); +-int StrnCaseCmp_w(const smb_ucs2_t *s, const smb_ucs2_t *t, size_t n); +-BOOL strequal_w(const smb_ucs2_t *s1, const smb_ucs2_t *s2); +-BOOL strnequal_w(const smb_ucs2_t *s1,const smb_ucs2_t *s2,size_t n); +-BOOL strcsequal_w(const smb_ucs2_t *s1,const smb_ucs2_t *s2); +-void strlower_w(smb_ucs2_t *s); +-void strupper_w(smb_ucs2_t *s); +-void strnorm_w(smb_ucs2_t *s); +-BOOL strisnormal_w(smb_ucs2_t *s); +-void string_replace_w(smb_ucs2_t *s, smb_ucs2_t oldc, smb_ucs2_t newc); +-smb_ucs2_t *skip_string_w(smb_ucs2_t *buf,size_t n); +-size_t str_charnum_w(const smb_ucs2_t *s); +-BOOL trim_string_w(smb_ucs2_t *s,const smb_ucs2_t *front,const smb_ucs2_t *back); +-BOOL strhasupper_w(const smb_ucs2_t *s); +-BOOL strhaslower_w(const smb_ucs2_t *s); +-size_t count_chars_w(const smb_ucs2_t *s,smb_ucs2_t c); +-BOOL str_is_all_w(const smb_ucs2_t *s,smb_ucs2_t c); +-smb_ucs2_t *alpha_strcpy_w(smb_ucs2_t *dest, const smb_ucs2_t *src, const smb_ucs2_t *other_safe_chars, size_t maxlength); +-smb_ucs2_t *StrnCpy_w(smb_ucs2_t *dest,const smb_ucs2_t *src,size_t n); +-smb_ucs2_t *strncpyn_w(smb_ucs2_t *dest, const smb_ucs2_t *src,size_t n, smb_ucs2_t c); +-size_t strhex_to_str_w(char *p, size_t len, const smb_ucs2_t *strhex); +-BOOL in_list_w(smb_ucs2_t *s,smb_ucs2_t *list,BOOL casesensitive); +-BOOL string_init_w(smb_ucs2_t **dest,const smb_ucs2_t *src); +-void string_free_w(smb_ucs2_t **s); +-BOOL string_set_w(smb_ucs2_t **dest,const smb_ucs2_t *src); +-void string_sub_w(smb_ucs2_t *s,const smb_ucs2_t *pattern,const smb_ucs2_t *insert, size_t len); +-void fstring_sub_w(smb_ucs2_t *s,const smb_ucs2_t *pattern,const smb_ucs2_t *insert); +-void pstring_sub_w(smb_ucs2_t *s,const smb_ucs2_t *pattern,smb_ucs2_t *insert); +-void all_string_sub_w(smb_ucs2_t *s,const smb_ucs2_t *pattern,const smb_ucs2_t *insert, size_t len); +-void split_at_last_component_w(smb_ucs2_t *path, smb_ucs2_t *front, smb_ucs2_t sep, smb_ucs2_t *back); +-smb_ucs2_t *octal_string_w(int i); +-smb_ucs2_t *string_truncate_w(smb_ucs2_t *s, size_t length); +-smb_ucs2_t doscp2ucs2(int w); +-int ucs2doscp(smb_ucs2_t w); +-int rpcstr_pull(char* dest, void *src, int dest_len, int src_len, int flags); ++void SMBencrypt(const uchar *passwd, uchar *c8, uchar *p24); ++void E_md4hash(const uchar *passwd, uchar *p16); ++void nt_lm_owf_gen(char *pwd, uchar nt_p16[16], uchar p16[16]); ++void SMBOWFencrypt(uchar passwd[16], uchar *c8, uchar p24[24]); ++void NTLMSSPOWFencrypt(uchar passwd[8], uchar *ntlmchalresp, uchar p24[24]); ++void SMBNTencrypt(const uchar *passwd, uchar *c8, uchar *p24); ++BOOL make_oem_passwd_hash(char data[516], const char *passwd, uchar old_pw_hash[16], BOOL unicode); ++BOOL encode_pw_buffer(char buffer[516], const char *new_pass, ++ int new_pw_len, BOOL nt_pass_set); ++BOOL decode_pw_buffer(char in_buffer[516], char *new_pwrd, ++ int new_pwrd_size, uint32 *new_pw_len, ++ uchar nt_p16[16], uchar p16[16]); ++void nt_owf_genW(const UNISTR2 *pwd, uchar nt_p16[16]); + +-/* The following definitions come from lib/wins_srv.c */ ++/* The following definitions come from libsmb/smberr.c */ + +-BOOL wins_srv_load_list( char *src ); +-struct in_addr wins_srv_ip( void ); +-void wins_srv_died( struct in_addr boothill_ip ); +-unsigned long wins_srv_count( void ); ++char *smb_dos_err_name(uint8 class, uint16 num); ++char *get_dos_error_msg(WERROR result); ++char *smb_dos_err_class(uint8 class); ++char *smb_dos_errstr(char *inbuf); ++WERROR map_werror_from_unix(int error); ++ ++/* The following definitions come from libsmb/unexpected.c */ ++ ++void unexpected_packet(struct packet_struct *p); ++void clear_unexpected(time_t t); ++struct packet_struct *receive_unexpected(enum packet_type packet_type, int id, ++ char *mailslot_name); + + /* The following definitions come from locking/brlock.c */ + +@@ -1519,6 +1521,9 @@ + struct name_record **n); + void kill_async_dns_child(void); + ++/* The following definitions come from nmbd/nmbd.c */ ++ ++ + /* The following definitions come from nmbd/nmbd_become_dmb.c */ + + void add_domain_names(time_t t); +@@ -1549,9 +1554,6 @@ + void collect_all_workgroup_names_from_wins_server(time_t t); + void sync_all_dmbs(time_t t); + +-/* The following definitions come from nmbd/nmbd.c */ +- +- + /* The following definitions come from nmbd/nmbd_elections.c */ + + void check_master_browser_exists(time_t t); +@@ -2435,14 +2437,19 @@ + /* The following definitions come from printing/print_cups.c */ + + ++/* The following definitions come from printing/print_generic.c */ ++ ++ ++/* The following definitions come from printing/print_svid.c */ ++ ++void sysv_printer_fn(void (*fn)(char *, char *)); ++int sysv_printername_ok(char *name); ++ + /* The following definitions come from printing/printfsp.c */ + + files_struct *print_fsp_open(connection_struct *conn, char *fname); + void print_fsp_end(files_struct *fsp, BOOL normal_close); + +-/* The following definitions come from printing/print_generic.c */ +- +- + /* The following definitions come from printing/printing.c */ + + BOOL print_backend_init(void); +@@ -2468,11 +2475,6 @@ + BOOL print_queue_resume(struct current_user *user, int snum, WERROR *errcode); + BOOL print_queue_purge(struct current_user *user, int snum, WERROR *errcode); + +-/* The following definitions come from printing/print_svid.c */ +- +-void sysv_printer_fn(void (*fn)(char *, char *)); +-int sysv_printername_ok(char *name); +- + /* The following definitions come from profile/profile.c */ + + void profile_message(int msg_type, pid_t src, void *buf, size_t len); +@@ -2531,42 +2533,6 @@ + + BOOL change_trust_account_password( char *domain, char *remote_machine_list); + +-/* The following definitions come from rpcclient/cmd_dfs.c */ +- +- +-/* The following definitions come from rpcclient/cmd_lsarpc.c */ +- +- +-/* The following definitions come from rpcclient/cmd_netlogon.c */ +- +- +-/* The following definitions come from rpcclient/cmd_reg.c */ +- +- +-/* The following definitions come from rpcclient/cmd_samr.c */ +- +- +-/* The following definitions come from rpcclient/cmd_spoolss.c */ +- +-BOOL get_short_archi(char *short_archi, char *long_archi); +-void set_drv_info_3_env (DRIVER_INFO_3 *info, const char *arch); +- +-/* The following definitions come from rpcclient/cmd_srvsvc.c */ +- +- +-/* The following definitions come from rpcclient/display_sec.c */ +- +-char *get_sec_mask_str(uint32 type); +-void display_sec_access(SEC_ACCESS *info); +-void display_sec_ace(SEC_ACE *ace); +-void display_sec_acl(SEC_ACL *sec_acl); +-void display_sec_desc(SEC_DESC *sec); +- +-/* The following definitions come from rpcclient/rpcclient.c */ +- +-void fetch_machine_sid(struct cli_state *cli); +-int main(int argc, char *argv[]); +- + /* The following definitions come from rpc_parse/parse_dfs.c */ + + void init_dfs_q_dfs_exist(DFS_Q_DFS_EXIST *q_d); +@@ -4273,6 +4239,42 @@ + + NTSTATUS _wks_query_info(pipes_struct *p, WKS_Q_QUERY_INFO *q_u, WKS_R_QUERY_INFO *r_u); + ++/* The following definitions come from rpcclient/cmd_dfs.c */ ++ ++ ++/* The following definitions come from rpcclient/cmd_lsarpc.c */ ++ ++ ++/* The following definitions come from rpcclient/cmd_netlogon.c */ ++ ++ ++/* The following definitions come from rpcclient/cmd_reg.c */ ++ ++ ++/* The following definitions come from rpcclient/cmd_samr.c */ ++ ++ ++/* The following definitions come from rpcclient/cmd_spoolss.c */ ++ ++BOOL get_short_archi(char *short_archi, char *long_archi); ++void set_drv_info_3_env (DRIVER_INFO_3 *info, const char *arch); ++ ++/* The following definitions come from rpcclient/cmd_srvsvc.c */ ++ ++ ++/* The following definitions come from rpcclient/display_sec.c */ ++ ++char *get_sec_mask_str(uint32 type); ++void display_sec_access(SEC_ACCESS *info); ++void display_sec_ace(SEC_ACE *ace); ++void display_sec_acl(SEC_ACL *sec_acl); ++void display_sec_desc(SEC_DESC *sec); ++ ++/* The following definitions come from rpcclient/rpcclient.c */ ++ ++void fetch_machine_sid(struct cli_state *cli); ++int main(int argc, char *argv[]); ++ + /* The following definitions come from smbd/blocking.c */ + + BOOL push_blocking_lock_request( char *inbuf, int length, int lock_timeout, int lock_num); +@@ -4740,24 +4742,6 @@ + void sys_utmp_claim(const char *username, const char *hostname, + const char *id_str, int id_num); + +-/* The following definitions come from smbd/vfs.c */ +- +-BOOL smbd_vfs_init(connection_struct *conn); +-BOOL vfs_directory_exist(connection_struct *conn, const char *dname, SMB_STRUCT_STAT *st); +-int vfs_mkdir(connection_struct *conn, char *const fname, mode_t mode); +-char *vfs_getwd(connection_struct *conn, char *unix_path); +-BOOL vfs_object_exist(connection_struct *conn, const char *fname,SMB_STRUCT_STAT *sbuf); +-BOOL vfs_file_exist(connection_struct *conn, const char *fname,SMB_STRUCT_STAT *sbuf); +-ssize_t vfs_read_data(files_struct *fsp, char *buf, size_t byte_count); +-ssize_t vfs_write_data(files_struct *fsp,const char *buffer,size_t N); +-int vfs_allocate_file_space(files_struct *fsp, SMB_OFF_T len); +-int vfs_set_filelen(files_struct *fsp, SMB_OFF_T len); +-SMB_OFF_T vfs_transfer_file(files_struct *in, files_struct *out, SMB_OFF_T n); +-char *vfs_readdirname(connection_struct *conn, void *p); +-int vfs_ChDir(connection_struct *conn, const char *path); +-char *vfs_GetWd(connection_struct *conn, char *path); +-BOOL reduce_name(connection_struct *conn, char *s,char *dir,BOOL widelinks); +- + /* The following definitions come from smbd/vfs-wrap.c */ + + int vfswrap_dummy_connect(connection_struct *conn, const char *service, const char *user); +@@ -4822,6 +4806,24 @@ + int vfswrap_sys_acl_free_text(struct connection_struct *conn, char *text); + int vfswrap_sys_acl_free_acl(struct connection_struct *conn, SMB_ACL_T posix_acl); + int vfswrap_sys_acl_free_qualifier(struct connection_struct *conn, void *qualifier, SMB_ACL_TAG_T tagtype); ++ ++/* The following definitions come from smbd/vfs.c */ ++ ++BOOL smbd_vfs_init(connection_struct *conn); ++BOOL vfs_directory_exist(connection_struct *conn, const char *dname, SMB_STRUCT_STAT *st); ++int vfs_mkdir(connection_struct *conn, char *const fname, mode_t mode); ++char *vfs_getwd(connection_struct *conn, char *unix_path); ++BOOL vfs_object_exist(connection_struct *conn, const char *fname,SMB_STRUCT_STAT *sbuf); ++BOOL vfs_file_exist(connection_struct *conn, const char *fname,SMB_STRUCT_STAT *sbuf); ++ssize_t vfs_read_data(files_struct *fsp, char *buf, size_t byte_count); ++ssize_t vfs_write_data(files_struct *fsp,const char *buffer,size_t N); ++int vfs_allocate_file_space(files_struct *fsp, SMB_OFF_T len); ++int vfs_set_filelen(files_struct *fsp, SMB_OFF_T len); ++SMB_OFF_T vfs_transfer_file(files_struct *in, files_struct *out, SMB_OFF_T n); ++char *vfs_readdirname(connection_struct *conn, void *p); ++int vfs_ChDir(connection_struct *conn, const char *path); ++char *vfs_GetWd(connection_struct *conn, char *path); ++BOOL reduce_name(connection_struct *conn, char *s,char *dir,BOOL widelinks); + + /* The following definitions come from smbwrapper/realcalls.c */ + diff --git a/packaging/Debian/debian/patches/loadparm.patch b/packaging/Debian/debian/patches/loadparm.patch index d7880a25146..b2c74c3eb85 100644 --- a/packaging/Debian/debian/patches/loadparm.patch +++ b/packaging/Debian/debian/patches/loadparm.patch @@ -1,6 +1,6 @@ ---- samba-2.2.2.cvs20020201/source/param/loadparm.c.orig Fri Feb 1 17:03:50 2002 -+++ samba-2.2.2.cvs20020201/source/param/loadparm.c Fri Feb 1 18:45:41 2002 -@@ -1085,26 +1085,26 @@ +--- samba-2.2.4/source/param/loadparm.c.orig Thu May 2 01:34:29 2002 ++++ samba-2.2.4/source/param/loadparm.c Thu May 2 01:34:39 2002 +@@ -1126,26 +1126,26 @@ case PRINT_AIX: case PRINT_LPRNT: case PRINT_LPROS2: @@ -37,7 +37,7 @@ break; case PRINT_CUPS: -@@ -1120,19 +1120,19 @@ +@@ -1161,19 +1161,19 @@ string_set(&Globals.szPrintcapname, "cups"); #else string_set(&sDefault.szLpqcommand, @@ -64,7 +64,7 @@ string_set(&Globals.szPrintcapname, "lpstat"); #endif /* HAVE_CUPS */ break; -@@ -1437,7 +1437,10 @@ +@@ -1486,7 +1486,10 @@ else StrnCpy(ret, s, len); diff --git a/packaging/Debian/debian/patches/lpq_parse.c.patch b/packaging/Debian/debian/patches/lpq_parse.c.patch new file mode 100644 index 00000000000..37c9dc557d7 --- /dev/null +++ b/packaging/Debian/debian/patches/lpq_parse.c.patch @@ -0,0 +1,12 @@ +--- samba-2.2.4/source/printing/lpq_parse.c.orig Wed May 1 23:14:51 2002 ++++ samba-2.2.4/source/printing/lpq_parse.c Thu May 2 00:18:30 2002 +@@ -263,6 +263,9 @@ + buf->status = LPQ_PAUSED; + } + ++ if(strequal(tokarr[LPRNG_RANKTOK],"done")) ++ buf->status = LPQ_PRINTED; ++ + buf->priority = *tokarr[LPRNG_PRIOTOK] -'A'; + + buf->time = LPRng_time(tokarr[LPRNG_TIMETOK]); diff --git a/packaging/Debian/debian/patches/samba.patch b/packaging/Debian/debian/patches/samba.patch index be251861cb1..8321307a782 100644 --- a/packaging/Debian/debian/patches/samba.patch +++ b/packaging/Debian/debian/patches/samba.patch @@ -1,6 +1,6 @@ ---- samba-2.2.2.cvs20020120.orig/source/client/smbmount.c -+++ samba-2.2.2.cvs20020120/source/client/smbmount.c -@@ -719,7 +719,7 @@ +--- samba-2.2.4/source/client/smbmount.c.orig Wed May 1 23:13:57 2002 ++++ samba-2.2.4/source/client/smbmount.c Thu May 2 00:20:44 2002 +@@ -716,7 +716,7 @@ *lp = 0; pstrcpy(password,lp+1); got_pass = True; @@ -9,7 +9,7 @@ } if ((lp=strchr(username,'/'))) { *lp = 0; -@@ -729,7 +729,7 @@ +@@ -726,7 +726,7 @@ !strcmp(opts, "password")) { pstrcpy(password,opteq+1); got_pass = True; @@ -18,7 +18,7 @@ } else if(!strcmp(opts, "credentials")) { pstrcpy(credentials,opteq+1); } else if(!strcmp(opts, "netbiosname")) { -@@ -822,7 +822,7 @@ +@@ -819,7 +819,7 @@ *p = 0; pstrcpy(password,p+1); got_pass = True; @@ -27,6 +27,20 @@ } strupper(username); } +--- samba-2.2.4/source/pam_smbpass/pam_smb_passwd.c.orig Wed May 1 23:14:47 2002 ++++ samba-2.2.4/source/pam_smbpass/pam_smb_passwd.c Thu May 2 00:20:44 2002 +@@ -190,6 +190,11 @@ + + } else if (flags & PAM_UPDATE_AUTHTOK) { + ++/* ++ The following has been commented out per Steve Langasek ++ <vorlon@debian.org> instructions. It's about Debian bug ++ #113763. ++*/ + #if 0 + /* We used to return when this flag was set, but that breaks + password synchronization when /other/ tokens are expired. For --- samba-2.2.2.cvs20020120.orig/source/script/installbin.sh +++ samba-2.2.2.cvs20020120/source/script/installbin.sh @@ -11,7 +11,7 @@ @@ -61,7 +75,7 @@ echo $FNAME - cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges? - chmod 0644 $FNAME -+ ln -s ../../../../doc/samba-doc/htmldocs/`basename $f` $FNAME || echo Cannot install $FNAME. Does $USER have privileges? ++ ln -s ../../../doc/samba-doc/htmldocs/`basename $f` $FNAME || echo Cannot install $FNAME. Does $USER have privileges? +# chmod 0644 $FNAME done @@ -78,6 +92,17 @@ # Create directories +--- samba-2.2.2.cvs20020120.orig/source/smbwrapper/smbsh.c ++++ samba-2.2.2.cvs20020120/source/smbwrapper/smbsh.c +@@ -39,7 +39,7 @@ + int main(int argc, char *argv[]) + { + char *p, *u; +- char *libd = BINDIR; ++ char *libd = "/usr/share/samba"; + pstring line, wd; + int opt; + extern char *optarg; --- samba-2.2.2.cvs20020120.orig/source/web/diagnose.c +++ samba-2.2.2.cvs20020120/source/web/diagnose.c @@ -54,6 +54,7 @@ @@ -108,92 +133,20 @@ become_daemon(); ---- samba-2.2.2.cvs20020120.orig/source/web/swat.c -+++ samba-2.2.2.cvs20020120/source/web/swat.c -@@ -49,6 +49,19 @@ - #define ENABLE_USER_FLAG "enable_user_flag" - #define RHOST "remote_host" +--- samba-2.2.4/source/smbd/service.c.orig Wed May 1 23:15:10 2002 ++++ samba-2.2.4/source/smbd/service.c Thu May 2 00:20:44 2002 +@@ -713,6 +713,14 @@ + smbrun(cmd,NULL); + } -+typedef struct html_conversion { -+ char src; -+ char *dest; -+} html_conversion; -+ -+static const html_conversion entities[] = { -+ { '"', """ }, -+ { '&', "&" }, -+ { '<', "<" }, -+ { '>', ">" }, -+ { '\0', NULL }, -+}; ++ /* If our root postexec command includes a call to 'unmount', we want ++ to make sure we aren't blocking the mount point. */ ++ /* I think this patch should go here, but I am not sure since ++ the code looks very different than in Samba 2.2.2. Will come ++ back later; should check what change_to_root_user() does. Eloy.- ++ vfs_ChDir(conn,"/"); ++ /* + - /* we need these because we link to locking*.o */ - void become_root(void) {} - void unbecome_root(void) {} -@@ -77,6 +90,51 @@ - return newstring; - } - -+static char *htmlentities(char *str) -+{ -+ int i,j, destlen = 0; -+ int length = strlen(str); -+ /* Feel free to use a pstring if appropriate -- I haven't -+ checked if it's guaranteed to be long enough, and suspect it -+ isn't. -SRL */ -+ char *dststr = NULL; -+ char *p; -+ -+ for (i = 0; i < length; i++) { -+ for (j = 0; entities[j].src; j++) { -+ if (str[i] == entities[j].src) { -+ destlen += strlen(entities[j].dest); -+ break; -+ } -+ } -+ if (!entities[j].src) { -+ destlen++; -+ } -+ } -+ if (length == destlen) { -+ return(strdup(str)); -+ } -+ p = dststr = malloc(destlen + 1); -+ if (!dststr) { -+ return(NULL); -+ } -+ dststr[destlen] = '\0'; -+ for (i = 0; i < length; i++) { -+ for (j = 0; entities[j].src; j++) { -+ if (str[i] == entities[j].src) { -+ strncpy(p, entities[j].dest, -+ strlen(entities[j].dest)); -+ p += strlen(entities[j].dest); -+ break; -+ } -+ } -+ if (!entities[j].src) { -+ *p++ = str[i]; -+ } -+ } -+ return(dststr); -+} -+ - static char *stripspace(char *str) - { - static char newstring[1024]; -@@ -182,8 +240,12 @@ - - case P_STRING: - case P_USTRING: -- printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">", -- make_parm_name(parm->label), *(char **)ptr); -+ str = htmlentities(*(char **)ptr); -+ printf("<input type=\"text\" size=\"40\" name=\"parm_%s\" value=\"%s\">", -+ make_parm_name(parm->label), str); -+ if (str != NULL) { -+ free(str); -+ } - printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.value=\'%s\'\">", - make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue))); - break; + change_to_root_user(); + /* execute any "root postexec = " line */ + if (*lp_rootpostexec(SNUM(conn))) { diff --git a/packaging/Debian/debian/patches/smbclient-xfer-speed.patch b/packaging/Debian/debian/patches/smbclient-xfer-speed.patch index 3ff8b600691..adfce3ab90b 100644 --- a/packaging/Debian/debian/patches/smbclient-xfer-speed.patch +++ b/packaging/Debian/debian/patches/smbclient-xfer-speed.patch @@ -1,6 +1,6 @@ ---- samba-2.2.2.cvs20020120/source/client/client.c.orig Wed Jan 23 23:32:44 2002 -+++ samba-2.2.2.cvs20020120/source/client/client.c Wed Jan 23 23:33:50 2002 -@@ -92,10 +92,10 @@ +--- samba-2.2.4/source/client/client.c.orig Wed May 1 23:13:57 2002 ++++ samba-2.2.4/source/client/client.c Thu May 2 00:34:16 2002 +@@ -91,10 +91,10 @@ extern file_info def_finfo; /* timing globals */ diff --git a/packaging/Debian/debian/patches/smbmount-nomtab.patch b/packaging/Debian/debian/patches/smbmount-nomtab.patch new file mode 100644 index 00000000000..8725e60da75 --- /dev/null +++ b/packaging/Debian/debian/patches/smbmount-nomtab.patch @@ -0,0 +1,158 @@ +--- samba-2.2.3a/source/client/smbmnt.c.orig Tue Apr 2 09:58:18 2002 ++++ samba-2.2.3a/source/client/smbmnt.c Tue Apr 2 09:58:24 2002 +@@ -28,6 +28,7 @@ + static uid_t mount_uid; + static gid_t mount_gid; + static int mount_ro; ++static int no_mtab; + static unsigned mount_fmask; + static unsigned mount_dmask; + static int user_mount; +@@ -40,6 +41,7 @@ + printf("Usage: smbmnt mount-point [options]\n"); + printf("Version %s\n\n",VERSION); + printf("-s share share name on server\n" ++ "-n don't update /etc/mtab\n" + "-r mount read-only\n" + "-u uid mount as uid\n" + "-g gid mount as gid\n" +@@ -54,7 +56,7 @@ + { + int opt; + +- while ((opt = getopt (argc, argv, "s:u:g:rf:d:o:")) != EOF) ++ while ((opt = getopt (argc, argv, "s:u:g:nrf:d:o:")) != EOF) + { + switch (opt) + { +@@ -71,6 +73,9 @@ + mount_gid = strtol(optarg, NULL, 0); + } + break; ++ case 'n': ++ no_mtab = 1; ++ break; + case 'r': + mount_ro = 1; + break; +@@ -271,36 +276,38 @@ + return -1; + } + +- if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1) +- { +- fprintf(stderr, "Can't get "MOUNTED"~ lock file"); +- return 1; +- } +- close(fd); ++ if (!no_mtab) { ++ if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1) ++ { ++ fprintf(stderr, "Can't get "MOUNTED"~ lock file"); ++ return 1; ++ } ++ close(fd); + +- if ((mtab = setmntent(MOUNTED, "a+")) == NULL) +- { +- fprintf(stderr, "Can't open " MOUNTED); +- return 1; +- } ++ if ((mtab = setmntent(MOUNTED, "a+")) == NULL) ++ { ++ fprintf(stderr, "Can't open " MOUNTED); ++ return 1; ++ } + +- if (addmntent(mtab, &ment) == 1) +- { +- fprintf(stderr, "Can't write mount entry"); +- return 1; +- } +- if (fchmod(fileno(mtab), 0644) == -1) +- { +- fprintf(stderr, "Can't set perms on "MOUNTED); +- return 1; +- } +- endmntent(mtab); ++ if (addmntent(mtab, &ment) == 1) ++ { ++ fprintf(stderr, "Can't write mount entry"); ++ return 1; ++ } ++ if (fchmod(fileno(mtab), 0644) == -1) ++ { ++ fprintf(stderr, "Can't set perms on "MOUNTED); ++ return 1; ++ } ++ endmntent(mtab); + +- if (unlink(MOUNTED"~") == -1) +- { +- fprintf(stderr, "Can't remove "MOUNTED"~"); +- return 1; +- } ++ if (unlink(MOUNTED"~") == -1) ++ { ++ fprintf(stderr, "Can't remove "MOUNTED"~"); ++ return 1; ++ } ++ } + + return 0; + } +--- samba-2.2.4/source/client/smbmount.c.orig Thu May 2 00:33:08 2002 ++++ samba-2.2.4/source/client/smbmount.c Thu May 2 00:36:12 2002 +@@ -50,6 +50,7 @@ + static int mount_ro; + static unsigned mount_fmask; + static unsigned mount_dmask; ++static BOOL no_mtab = False; + + static void usage(void); + +@@ -250,6 +251,9 @@ + return; + } + ++ if (no_mtab) ++ return; ++ + if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1) { + DEBUG(0,("%d: Can't get "MOUNTED"~ lock file", getpid())); + return; +@@ -444,6 +448,9 @@ + args[i++] = "-s"; + args[i++] = svc2; + ++ if (no_mtab) { ++ args[i++] = "-n"; ++ } + if (mount_ro) { + args[i++] = "-r"; + } +@@ -626,7 +633,7 @@ + ****************************************************************************/ + static void usage(void) + { +- printf("Usage: mount.smbfs service mountpoint [-o options,...]\n"); ++ printf("Usage: mount.smbfs service mountpoint [-n] [-o options,...]\n"); + + printf("Version %s\n\n",VERSION); + +@@ -691,8 +698,13 @@ + argc -= 2; + argv += 2; + +- opt = getopt(argc, argv, "o:"); +- if(opt != 'o') { ++ opt = getopt(argc, argv, "no:"); ++ if (opt == 'n') { ++ DEBUG(3,("No mtab!\n")); ++ no_mtab = True; ++ opt = getopt(argc, argv, "o:"); ++ } ++ if (opt != 'o') { + return; + } + diff --git a/packaging/Debian/debian/rules b/packaging/Debian/debian/rules index 1083a10f466..e128ab782b7 100755 --- a/packaging/Debian/debian/rules +++ b/packaging/Debian/debian/rules @@ -1,9 +1,11 @@ #!/usr/bin/make -f # # Important modifications (introduction of a saved config.cache to -# solve build problems) we introduced in Samba 2.2.1a-5. These +# solve build problems) introduced in Samba 2.2.1a-5. These # modification were made by Steve Langasek <vorlon@netexpress.net>. # +# $Id: rules,v 1.1.2.2 2002/05/02 20:02:04 jerry Exp $ +# # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -22,8 +24,6 @@ DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) export DEB_HOST_GNU_TYPE export DEB_BUILD_GNU_TYPE -BVARS = SMBLOGFILE=/var/log/smb NMBLOGFILE=/var/log/nmb - DESTDIR=`pwd`/debian/samba SWATDIR=`pwd`/debian/swat SAMBABOOK=`pwd`/debian/swat @@ -33,7 +33,7 @@ IVARS = BASEDIR=$(DESTDIR)/usr \ SBINDIR=$(DESTDIR)/usr/sbin \ MANDIR=$(DESTDIR)/usr/share/man \ LIBDIR=$(DESTDIR)/etc/samba \ - VARDIR=$(DESTDIR)/var/state/samba \ + VARDIR=$(DESTDIR)/var \ INCLUDEDIR=$(DESTDIR)/usr/include \ SWATDIR=$(SWATDIR)/usr/share/samba/swat \ SAMBABOOK=$(SAMBABOOK)/usr/share/samba/swat/using_samba \ @@ -42,36 +42,22 @@ IVARS = BASEDIR=$(DESTDIR)/usr \ patch: patch-stamp patch-stamp: dh_testdir - if [ ! -f patch-stamp ]; then debian/scripts/patch-source; fi + if [ ! -f patch-stamp ]; then /bin/sh debian/scripts/patch-source; fi touch patch-stamp unpatch: dh_testdir - if [ -f patch-stamp ]; then debian/scripts/unpatch-source; fi + if [ -f patch-stamp ]; then /bin/sh debian/scripts/unpatch-source; fi rm -f patch-stamp configure: patch-stamp configure-stamp configure-stamp: dh_testdir - # Add here commands to configure the package. -# > -# > Does the --with-fhs option work in configure? I tried it with -# > alpha3, but everything was stored in /usr/local. Is that correct? -# > ... -# -# Yes - the default prefix is still /usr/local; --with-fhs just -# changes the default paths for the config, etc. files to match -# the GNU/FHS specs. To get a complete FHS directory spec, use: -# -# ./configure --with-fhs --prefix=/usr --sysconfdir=/etc \ -# --localstatedir=/var - if [ -f debian/config.cache ]; then \ cp -f debian/config.cache source/config.cache; \ fi -# [ -f source/Makefile ] || (cd source && ./configure --with-fhs --prefix=/usr --exec-prefix=/usr --with-netatalk --with-smbmount --with-pam --with-syslog --with-sambabook --with-utmp) [ -f source/Makefile ] || (cd source && ./configure \ --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ @@ -79,7 +65,6 @@ configure-stamp: --prefix=/usr \ --sysconfdir=/etc \ --with-privatedir=/etc/samba \ - --with-lockdir=/var/state/samba \ --localstatedir=/var \ --with-netatalk \ --with-smbmount \ @@ -89,7 +74,9 @@ configure-stamp: --with-utmp \ --with-readline \ --with-pam_smbpass \ - --with-libsmbclient) + --with-libsmbclient \ + --with-winbind \ + --with-msdfs) touch configure-stamp @@ -97,9 +84,7 @@ build: patch-stamp configure-stamp build-stamp build-stamp: dh_testdir - # Compile the Samba package first -# $(MAKE) -C source $(BVARS) all smbtorture rpctorture debug2html - $(MAKE) -C source all + $(MAKE) -C source all nsswitch/libnss_wins.so touch build-stamp @@ -114,8 +99,8 @@ clean: unpatch -$(MAKE) -C source distclean # Delete stuff left after a build that is not deleted by 'make clean' - rm -f source/bin/wbinfo source/bin/winbindd source/bin/rpctorture \ - source/bin/debug2html + rm -f source/bin/wbinfo source/bin/winbindd source/bin/debug2html \ + source/include/stamp-h dh_clean @@ -129,26 +114,29 @@ install: build # Add here commands to install the package into debian/tmp. $(MAKE) -C source install $(IVARS) - # libsmbclient is installed in usr/bin/. Move to usr/lib/. - mv $(DESTDIR)/usr/bin/libsmbclient.so $(DESTDIR)/usr/lib/libsmbclient.so.0.1 - mv $(DESTDIR)/usr/bin/libsmbclient.a $(DESTDIR)/usr/lib/ - - # This is to comply with policy (the symlink that ldconfig would - # produce must exist in the package). - /sbin/ldconfig -n $(DESTDIR)/usr/lib/ - - # libsmbclient include file is not installed by standard + # libsmbclient files are not installed by the standard # 'make install' - do it manually. $(MAKE) -C source installclientlib $(IVARS) + mv $(DESTDIR)/usr/lib/libsmbclient.so $(DESTDIR)/usr/lib/libsmbclient.so.0.1 # Install other stuff not installed by "make install" install -m 0755 debian/mksmbpasswd.awk $(DESTDIR)/usr/sbin/mksmbpasswd - install -m 0755 debian/sambaconfig $(DESTDIR)/usr/sbin/ - install -m 0755 source/bin/pam_smbpass.so $(DESTDIR)/lib/security/ - # This is only temporary, while we create new packages for winbind and friends - install -m 0644 source/nsswitch/libnss_winbind.so $(DESTDIR)/lib/libnss_winbind.so.2 - install -m 0644 source/nsswitch/pam_winbind.so $(DESTDIR)/lib/security/ + # Install winbind stuff not installed by 'make install' + install -m 0644 source/nsswitch/libnss_winbind.so \ + $(DESTDIR)/lib/libnss_winbind.so.2 + install -m 0644 source/nsswitch/pam_winbind.so \ + $(DESTDIR)/lib/security/ + + # Install libnss_wins.so, which is not installed by 'make install' either. + install -m 0644 source/nsswitch/libnss_wins.so \ + $(DESTDIR)/lib/libnss_wins.so + + # pam_smbpass.so is installed by 'make install' in $(DESTDIR)/usr/bin/. + # We'll move it here to $(DESTDIR)/lib/security/ and then + # libpam-smbpass.files will make dh_movefiles move it to the + # right location in the libpam-smbpass package. + mv $(DESTDIR)/usr/bin/pam_smbpass.so $(DESTDIR)/lib/security/ # Create the symlink that will allow us to do "mount -t smbfs ...". # Create also a symlink that will allow "mount -t smb ..." to @@ -162,7 +150,7 @@ install: build # For CUPS to support printing to samba printers, it's necessary # to make the following symlink (according to # Erich Schubert <debian@vitavonni.de> in #109509): - ln -s /usr/bin/smbspool $(DESTDIR)/usr/lib/cups/backend/smb + ln -s ../../../bin/smbspool $(DESTDIR)/usr/lib/cups/backend/smb # To avoid duplication of a large number of files, the swat package # does not contain the "Using Samba" book nor the HTML docs. @@ -170,10 +158,9 @@ install: build # are accessed through symlinks provided in the swat package. # Here we create the symlink for the book, and the symlinks # for the HTML files are created by the script installswat.sh. - ln -s ../../../doc/samba-doc/htmldocs/using_samba $(SAMBABOOK)/usr/share/samba/swat/using_samba + ln -s ../../doc/samba-doc/htmldocs/using_samba $(SAMBABOOK)/usr/share/samba/swat/using_samba # Install man pages for files without man pages in the upstream sources - install -m 0644 debian/sambaconfig.8 $(DESTDIR)/usr/share/man/man8/sambaconfig.8 install -m 0644 debian/mksmbpasswd.8 $(DESTDIR)/usr/share/man/man8/mksmbpasswd.8 # Delete unwanted stuff leftover from "make install" @@ -182,11 +169,19 @@ install: build # delete the related man pages. rm $(DESTDIR)/usr/share/man/man1/smbsh.1 + # We're not providing findsmb (should we?) so let's remove the man + # pages. + find debian/ -name 'findsmb*' -exec rm {} \; + # Install samba-common's conffiles - they'll get moved later to their # correct place by dh_movefiles. - cp debian/smb.conf $(DESTDIR)/etc/samba/ + cp debian/smb.conf $(DESTDIR)/usr/share/samba/ cp debian/samba.pamd $(DESTDIR)/etc/pam.d/samba + # This is to comply with policy (the symlink that ldconfig would + # produce must exist in the package). + /sbin/ldconfig -n $(DESTDIR)/usr/lib/ + dh_movefiles --sourcedir=debian/samba/ # Remove empty directories that will never be used. @@ -196,11 +191,9 @@ install: build # Pass -i to all debhelper commands in this target to reduce clutter. binary-indep: DH_OPTIONS=-i binary-indep: build install - # Need this version of debhelper for DH_OPTIONS to work. - dh_testversion 1.1.17 dh_testdir dh_testroot -# dh_installdebconf + dh_installdebconf dh_installdocs -A docs/textdocs/DIAGNOSIS.txt debian/README.build docs/README* docs/Samba-HOWTO-Collection.pdf # dh_installexamples is not available in Debian Potato... [ -x /usr/bin/dh_installexamples ] && dh_installexamples @@ -226,20 +219,25 @@ binary-indep: build install # Pass -a to all debhelper commands in this target to reduce clutter. binary-arch: DH_OPTIONS=-a binary-arch: build install - # Need this version of debhelper for DH_OPTIONS to work. - dh_testversion 1.1.17 dh_testdir dh_testroot -# dh_installdebconf + dh_installdebconf dh_installdocs -A docs/textdocs/DIAGNOSIS.txt debian/README.build docs/README* docs/Samba-HOWTO-Collection.pdf # dh_installexamples is not available in Debian Potato... [ -x /usr/bin/dh_installexamples ] && dh_installexamples # dh_installmenu # dh_installlogrotate is not available in Debian Potato... - if [ -x /usr/bin/dh_installlogrotate ]; then dh_installlogrotate; else mkdir debian/samba/etc/logrotate.d; cp debian/samba.logrotate debian/samba/etc/logrotate.d/samba; fi + if [ -x /usr/bin/dh_installlogrotate ]; then \ + dh_installlogrotate; \ + else \ + mkdir -p debian/samba/etc/logrotate.d; \ + cp debian/samba.logrotate debian/samba/etc/logrotate.d/samba; \ + mkdir -p debian/winbind/etc/logrotate.d; \ + cp debian/winbind.logrotate debian/winbind/etc/logrotate.d/winbind; \ + fi # dh_installemacsen # dh_installpam - dh_installinit + dh_installinit -n dh_installcron # dh_installmanpages # dh_installinfo @@ -250,6 +248,9 @@ binary-arch: build install dh_compress dh_fixperms + # Why this is executable, I have NO idea... + chmod a-x debian/libsmbclient-dev/usr/include/libsmbclient.h + # You may want to make some executables suid here. # The smbmnt and smbumount binaries should be setuid-root. This # has security implications because these programs haven't had diff --git a/packaging/Debian/debian/samba-common.conffiles b/packaging/Debian/debian/samba-common.conffiles index b5703025dde..d14c1b51c1b 100644 --- a/packaging/Debian/debian/samba-common.conffiles +++ b/packaging/Debian/debian/samba-common.conffiles @@ -1,2 +1 @@ -/etc/samba/smb.conf /etc/pam.d/samba diff --git a/packaging/Debian/debian/samba-common.config b/packaging/Debian/debian/samba-common.config new file mode 100644 index 00000000000..c82dd887b06 --- /dev/null +++ b/packaging/Debian/debian/samba-common.config @@ -0,0 +1,61 @@ +#/bin/sh -e + +# Source debconf library. +. /usr/share/debconf/confmodule + +FILE=/etc/samba/smb.conf + +db_title "Samba Server" + +db_input medium samba-common/do_debconf || true +db_go + +# If user doesn't want to use debconf to configure Samba the leave... +db_get samba-common/do_debconf || true +if [ "${RET}" = "false" ]; then + exit 0 +fi + +# User wants to use debconf, let's continue... + +# Adjust priority of the question about the workgroup name depending +# on whether a workgroup name has already being specified. +db_get samba-common/workgroup || true +if [ "${RET}" ]; then + WGPRIORITY=medium +else + WGPRIORITY=high +fi + +# Preload any values from the existing smb.conf file +if [ -f $FILE ]; then + WORKGROUP=`grep -i '^[[:space:]]*workgroup[[:space:]]*=' $FILE \ + | sed -e's/^[[:space:]]*workgroup[[:space:]]*=[[:space:]]*//i' \ + | tail -1` + if [ "$WORKGROUP" ]; then + db_set samba-common/workgroup "$WORKGROUP" + fi + + ENCRYPT=`grep -i '^[[:space:]]*encrypt passwords[[:space:]]*=' $FILE \ + | sed -e's/^[[:space:]]*encrypt passwords[[:space:]]*=[[:space:]]*//i' \ + | tail -1` + if [ "$ENCRYPT" ]; then + ENCRYPT=`echo $ENCRYPT | tr '[A-Z]' '[a-z]'` + if [ "$ENCRYPT" = "yes" ]; then + ENCRYPT=true + elif [ "$ENCRYPT" = "no" ]; then + ENCRYPT=false + fi + + db_set samba-common/encrypt_passwords "$ENCRYPT" + fi +fi + +# Get workgroup name +db_input $WGPRIORITY samba-common/workgroup || true +db_go + +# Use encrypted passwords? +db_input medium samba-common/encrypt_passwords || true +db_go + diff --git a/packaging/Debian/debian/samba-common.dirs b/packaging/Debian/debian/samba-common.dirs new file mode 100644 index 00000000000..7c8094b988a --- /dev/null +++ b/packaging/Debian/debian/samba-common.dirs @@ -0,0 +1 @@ +etc/samba diff --git a/packaging/Debian/debian/samba-common.files b/packaging/Debian/debian/samba-common.files index 94f2e25f6a6..0929836f6a6 100644 --- a/packaging/Debian/debian/samba-common.files +++ b/packaging/Debian/debian/samba-common.files @@ -1,7 +1,8 @@ -etc/samba/ +etc/samba usr/bin/nmblookup usr/bin/smbpasswd etc/pam.d/ usr/share/man/man1/nmblookup.1 usr/share/man/man8/smbpasswd.8 usr/share/samba/codepages/ +usr/share/samba/smb.conf diff --git a/packaging/Debian/debian/samba-common.postinst b/packaging/Debian/debian/samba-common.postinst new file mode 100644 index 00000000000..6e423e0b5c7 --- /dev/null +++ b/packaging/Debian/debian/samba-common.postinst @@ -0,0 +1,48 @@ +#!/bin/sh +# +# $Id: samba-common.postinst,v 1.1.2.1 2002/05/02 20:02:04 jerry Exp $ +# + +set -e + +# We need a default smb.conf file. If one doesn't exist we put in place +# one that has some basic defaults. +if [ ! -e /etc/samba/smb.conf ]; then + cp -a /usr/share/samba/smb.conf /etc/samba/ +fi + +# Do debconf stuff here +. /usr/share/debconf/confmodule + +# ------------------------- Debconf questions start --------------------- + +# Is the user configuring with debconf, or he/she prefers swat/manual +# config? +db_get samba-common/do_debconf || true +if [ "${RET}" = "true" ]; then + # Get workgroup name + db_get samba-common/workgroup || true + WORKGROUP="${RET}" + + TMPFILE=`mktemp -q /tmp/smb.conf.XXXXXX` + sed -e "s/^\([[:space:]]*\)workgroup[[:space:]]*=.*/\1workgroup = ${WORKGROUP}/" \ + < /etc/samba/smb.conf >${TMPFILE} + mv -f ${TMPFILE} /etc/samba/smb.conf + + # Encrypt passwords? + db_get samba-common/encrypt_passwords || true + ENCRYPT_PASSWORDS="${RET}" + + TMPFILE=`mktemp -q /tmp/smb.conf.XXXXXX` + sed -e "s/^\([[:space:]]*\)encrypt passwords[[:space:]]*=.*/\1encrypt passwords = ${ENCRYPT_PASSWORDS}/" \ + < /etc/samba/smb.conf >${TMPFILE} + mv -f ${TMPFILE} /etc/samba/smb.conf +fi + +chmod a+r /etc/samba/smb.conf + +# ------------------------- Debconf questions end --------------------- + +db_stop + +#DEBHELPER# diff --git a/packaging/Debian/debian/samba-common.postrm b/packaging/Debian/debian/samba-common.postrm index 2cd832b33d2..2a0de47a6f6 100644 --- a/packaging/Debian/debian/samba-common.postrm +++ b/packaging/Debian/debian/samba-common.postrm @@ -1,6 +1,11 @@ #!/bin/sh +# +# $Id: samba-common.postrm,v 1.1.2.2 2002/05/02 20:02:04 jerry Exp $ +# if [ "$1" = purge ]; then # Remove any files left in /etc/samba/ rm -Rf /etc/samba/ fi + +#DEBHELPER# diff --git a/packaging/Debian/debian/samba-common.templates b/packaging/Debian/debian/samba-common.templates new file mode 100644 index 00000000000..c729b0b3243 --- /dev/null +++ b/packaging/Debian/debian/samba-common.templates @@ -0,0 +1,28 @@ +Template: samba-common/do_debconf +Type: boolean +Default: true +Description: Configure smb.conf through debconf? + The rest of the configuration of Samba deals with questions that + affect parameters in /etc/samba/smb.conf, which is the file used + to configure the Samba programs (nmbd and smbd.) If you want to be + asked just a few questions then select "Yes" and continue with the + configuration. If you want to have full control, select "No" and + configure your smb.conf manually or through SWAT. + +Template: samba-common/workgroup +Type: string +Description: Workgroup/Domain Name? + This controls what workgroup your server will appear to be in when + queried by clients. Note that this parameter also controls the Domain + name used with the security=domain setting. + +Template: samba-common/encrypt_passwords +Type: boolean +Default: true +Description: Use password encryption? + Recent Windows clients communicate with SMB servers using encrypted + passwords. If you want to use clear text passwords you will need to + change a parameter in your Windows registry. It is recommended that + you use encrypted passwords. If you do, make sure you have a valid + /etc/samba/smbpasswd file and that you set passwords in there for + each user using the smbpasswd command. diff --git a/packaging/Debian/debian/samba-common.templates.es b/packaging/Debian/debian/samba-common.templates.es new file mode 100644 index 00000000000..2db32ba9ad6 --- /dev/null +++ b/packaging/Debian/debian/samba-common.templates.es @@ -0,0 +1,46 @@ +Template: samba-common/do_debconf +Type: boolean +Default: true +Description: Configure smb.conf through debconf? + The rest of the configuration of Samba deals with questions that affect + parameters in /etc/samba/smb.conf, which is the file used to configure the + Samba programs (nmbd and smbd.) If you want to be asked just a few + questions then select "Yes" and continue with the configuration. If you + want to have full control, select "No" and configure your smb.conf + manually or through SWAT. +Description-es: ¿Configurar smb.conf mediante debconf? + El resto de la configuración de Samba trata sobre cuestiones que afectan + al contenido de /etc/samba/smb.conf, que es el fichero utilizado para + configurar los programas de Samba (nmbd y smbd). Si desea responder a las + preguntas, elija "Sí" y continuará con la configuración. Si quiere + tener control total, escoja "No" y configure smb.conf manualmente o con + SWAT. + +Template: samba-common/workgroup +Type: string +Description: Workgroup/Domain Name? + This controls what workgroup your server will appear to be in when queried + by clients. Note that this parameter also controls the Domain name used + with the security=domain setting. +Description-es: Nombre del dominio o del grupo de trabajo. + Es el grupo de trabajo en el que aparecerá su servidor cuando se lo + pregunten los clientes de la red. Este parámetro también controla el + nombre de dominio que se usa con la configuración security=domain. + +Template: samba-common/encrypt_passwords +Type: boolean +Default: true +Description: Use password encryption? + Recent Windows clients communicate with SMB servers using encrypted + passwords. If you want to use clear text passwords you will need to change + a parameter in your Windows registry. It is recommended that you use + encrypted passwords. If you do, make sure you have a valid + /etc/samba/smbpasswd file and that you set passwords in there for each + user using the smbpasswd command. +Description-es: ¿Utilizar contraseñas cifradas? + Los clientes Windows más modernos se comunican con los servidores SMB + utilizando contraseñas cifradas. Si quiere usar contraseñas en texto + plano, tendrá que cambiar un parámetro en el registro de Windows. Es muy + recomendable usar cifrado en las contraseñas. Si elige hacerlo, compruebe + que tiene un fichero /etc/samba/smbpasswd válido y que ha puesto las + contraseñas con el programa smbpasswd. diff --git a/packaging/Debian/debian/samba-common.templates.fr b/packaging/Debian/debian/samba-common.templates.fr new file mode 100644 index 00000000000..e26fedaf5b7 --- /dev/null +++ b/packaging/Debian/debian/samba-common.templates.fr @@ -0,0 +1,47 @@ +Template: samba-common/do_debconf +Type: boolean +Default: true +Description: Configure smb.conf through debconf? + The rest of the configuration of Samba deals with questions that affect + parameters in /etc/samba/smb.conf, which is the file used to configure the + Samba programs (nmbd and smbd.) If you want to be asked just a few + questions then select "Yes" and continue with the configuration. If you + want to have full control, select "No" and configure your smb.conf + manually or through SWAT. +Description-fr: Voulez-vous configurer smb.conf avec debconf ? + La suite de la configuration de Samba pose des questions sur des paramètres + de /etc/samba/smb.conf, le fichier utilisé pour configurer les programmes + de Samba (nmbd et smbd). Si vous voulez bien répondre à quelques questions, + choisissez « Yes » et poursuivez la configuration. Si vous voulez un + contrôle total, choisissez « No » et configurez le fichier smb.conf + manuellement ou avec SWAT. + +Template: samba-common/workgroup +Type: string +Description: Workgroup/Domain Name? + This controls what workgroup your server will appear to be in when queried + by clients. Note that this parameter also controls the Domain name used + with the security=domain setting. +Description-fr: Groupe de travail et nom de domaine ? + Ce paramètre indique le groupe de travail où les clients trouveront le + serveur. Il indique aussi le nom de domaine utilisé par le paramètre + « security=domain ». + +Template: samba-common/encrypt_passwords +Type: boolean +Default: true +Description: Use password encryption? + Recent Windows clients communicate with SMB servers using encrypted + passwords. If you want to use clear text passwords you will need to change + a parameter in your Windows registry. It is recommended that you use + encrypted passwords. If you do, make sure you have a valid + /etc/samba/smbpasswd file and that you set passwords in there for each + user using the smbpasswd command. +Description-fr: Voulez-vous chiffrer les mots de passe ? + Des clients Windows récents communiquent avec les serveurs SMB en utilisant + des mots de passe chiffrés. Si vous voulez utiliser des mots de passe sans + chiffrement, vous devez modifier un paramètre dans le registre de Windows. + Il est recommandé d'utiliser des mots de passe chiffrés. Si vous le faites, + n'oubliez pas de créer un fichier /etc/samba/smbpasswd et d'y mettre les + mots de passe de tous les utilisateurs qui se servent de la commande + smbpasswd. diff --git a/packaging/Debian/debian/samba-common.templates.pt_BR b/packaging/Debian/debian/samba-common.templates.pt_BR new file mode 100644 index 00000000000..69d5ed8d46f --- /dev/null +++ b/packaging/Debian/debian/samba-common.templates.pt_BR @@ -0,0 +1,47 @@ +Template: samba-common/do_debconf +Type: boolean +Default: true +Description: Configure smb.conf through debconf? + The rest of the configuration of Samba deals with questions that affect + parameters in /etc/samba/smb.conf, which is the file used to configure the + Samba programs (nmbd and smbd.) If you want to be asked just a few + questions then select "Yes" and continue with the configuration. If you + want to have full control, select "No" and configure your smb.conf + manually or through SWAT. +Description-pt_BR: Configurar smb.conf através do debconf ? + O restante da configuração do Samba lida com questões que afetam + parâmetros no arquivo /etc/samba/smb.conf, que é o arquivo usado para + configurar os programas Samba (nmbd e smbd). Caso você prefira somente + algumas perguntas selecione "Sim" e continue com a configuração. Se você + quer ter controle total, selecione "Não" e configure seu arquivo smb.conf + manualmente ou através da ferramenta SWAT. + +Template: samba-common/workgroup +Type: string +Description: Workgroup/Domain Name? + This controls what workgroup your server will appear to be in when queried + by clients. Note that this parameter also controls the Domain name used + with the security=domain setting. +Description-pt_BR: Nome de Domínio/Grupo de Trabalho ? + Este parâmetro controla qual grupo de trabalho (workgroup) seu servidor + parecerá estar quando o mesmo for pesquisado por clientes. Note que este + parâmetro também controla o nome de Domínio usado com a configuração + security=domain. + +Template: samba-common/encrypt_passwords +Type: boolean +Default: true +Description: Use password encryption? + Recent Windows clients communicate with SMB servers using encrypted + passwords. If you want to use clear text passwords you will need to change + a parameter in your Windows registry. It is recommended that you use + encrypted passwords. If you do, make sure you have a valid + /etc/samba/smbpasswd file and that you set passwords in there for each + user using the smbpasswd command. +Description-pt_BR: Usar encriptação de senhas ? + Clientes Windows atuais comunicam-se com servidores SMB usando senhas + encriptadas. Caso você queira usar senhas em texto puro você precisará + modificar um parâmetro no registro de seu Windows. É recomendado que você + use senhas encriptadas. Se você usar, certifique-se de possuir um arquivo + /etc/samba/smbpasswd válido e que você definiu senhas no mesmo para cada + usuário utilizando o comando smbpasswd. diff --git a/packaging/Debian/debian/samba.config b/packaging/Debian/debian/samba.config new file mode 100644 index 00000000000..32569c3e9ae --- /dev/null +++ b/packaging/Debian/debian/samba.config @@ -0,0 +1,45 @@ +#/bin/sh -e +# +# $Id: samba.config,v 1.1.2.1 2002/05/02 20:02:04 jerry Exp $ +# + +# Source debconf library. +. /usr/share/debconf/confmodule + +db_title "Samba Server" + +# Babysit users who don't read README.Debian +db_input medium samba/log_files_moved || true +db_go + +db_input medium samba/run_mode || true +db_go + +# We vary the priority of the next question depending on whether +# /etc/samba/smbpasswd already exists... +if [ -f /etc/samba/smbpasswd ]; then + PRIORITY="low" +else + # If 'encrypt passwords' is true in smb.conf, and smbpasswd + # does not exist, default to yes here. + FILE=/etc/samba/smb.conf + if [ -f "$FILE" ]; then + ENCRYPT=`grep -i '^[[:space:]]*encrypt passwords[[:space:]]*=' $FILE \ + | sed -e's/^[[:space:]]*encrypt passwords[[:space:]]*=[[:space:]]*//i' \ + | tail -1` + if [ "$ENCRYPT" ]; then + ENCRYPT=`echo $ENCRYPT | tr '[A-Z]' '[a-z]'` + if [ "$ENCRYPT" = "yes" ]; then + ENCRYPT=true + fi + if [ "$ENCRYPT" = "no" ]; then + ENCRYPT=false + fi + fi + db_set samba/generate_smbpasswd "$ENCRYPT" + fi + PRIORITY="medium" +fi + +db_input $PRIORITY samba/generate_smbpasswd || true +db_go diff --git a/packaging/Debian/debian/samba.dirs b/packaging/Debian/debian/samba.dirs index 237603750a1..0b57a891a76 100644 --- a/packaging/Debian/debian/samba.dirs +++ b/packaging/Debian/debian/samba.dirs @@ -2,8 +2,9 @@ sbin usr/bin usr/sbin var/log/samba -var/state/samba -etc/samba +var/lib/samba +var/run/samba +var/cache/samba etc/pam.d usr/share usr/share/samba diff --git a/packaging/Debian/debian/samba.init b/packaging/Debian/debian/samba.init index 8ac2e97148f..7e152e08417 100644 --- a/packaging/Debian/debian/samba.init +++ b/packaging/Debian/debian/samba.init @@ -2,31 +2,23 @@ # # Start/stops the Samba daemons (nmbd and smbd). # +# $Id: samba.init,v 1.1.2.2 2002/05/02 20:02:04 jerry Exp $ +# + +# Defaults +RUN_MODE="daemons" -PATH=/sbin:/bin:/usr/sbin:/usr/bin -DEBIAN_CONFIG=/etc/samba/debian_config +# Reads config file (will override defaults above) +[ -r /etc/default/samba ] && . /etc/default/samba -NMBDPID=/var/state/samba/nmbd.pid -SMBDPID=/var/state/samba/smbd.pid +NMBDPID=/var/run/samba/nmbd.pid +SMBDPID=/var/run/samba/smbd.pid # clear conflicting settings from the environment unset TMPDIR -# Sanity check: see if Samba has been configured on this system. -if [ ! -f $DEBIAN_CONFIG ]; then - echo "The file $DEBIAN_CONFIG does not exist! There is something wrong" - echo "with the installation of Samba on this system. Please re-install" - echo "Samba. I can't continue!!!" - exit 1 -fi - -# Read current Samba configuration -. $DEBIAN_CONFIG - -# the Samba daemons. - # If Samba is running from inetd then there is nothing to do -if [ "$run_mode" = "from_inetd" ]; then +if [ "$RUN_MODE" = "inetd" ]; then # Commented out to close bug #26884 (startup message is rather long). I # have yet to think how to let the user know that if he/she is running # Samba from inetd, he can't just "/etc/init.d/samba stop" to stop diff --git a/packaging/Debian/debian/samba.postinst b/packaging/Debian/debian/samba.postinst index 5f42cf4b369..237e2076abf 100644 --- a/packaging/Debian/debian/samba.postinst +++ b/packaging/Debian/debian/samba.postinst @@ -1,12 +1,8 @@ -#!/bin/sh +#!/bin/sh -e # # Post-installation script for the Samba package for Debian GNU/Linux # -# Written by Eloy A. Paris <peloy@debian.org> for the Debian project. -# -# The prerm script (run before the postinst) disables Samba in /etc/inetd.conf -# and stops both nmbd and smbd. So, when this script is run we -# know that neither nmbd nor smbd can start. +# $Id: samba.postinst,v 1.1.2.2 2002/05/02 20:02:04 jerry Exp $ # case "$1" in @@ -24,184 +20,132 @@ case "$1" in ;; esac -# Take care of the /usr/doc/ to /usr/shar/doc/ migration. -if [ -d /usr/doc -a ! -e /usr/doc/samba -a -d /usr/share/doc/samba ]; then - ln -sf ../share/doc/samba /usr/doc/samba -fi +# Handle debconf +. /usr/share/debconf/confmodule -# Starting with Samba 2.0.7-4 the location of the WINS database, the browse -# database and other important run-time files are stored in -# /var/state/samba/ rather than in /var/samba/. The following -# code takes care of moving the files in the old directory to -# the new directory. -if [ -d /var/samba/ ]; then - mv /var/samba/* /var/state/samba/ - rmdir /var/samba/ -fi +INITCONFFILE=/etc/default/samba -# Define some constants... -DEBIAN_CONFIG=/etc/samba/debian_config -CONFIG_VERSION=1 +# We generate several files during the postinst, and we don't want +# them to be readable only by root. +umask 022 -# Now some variables... -samba_configured=no +# Generate configuration file if it does not exist, using default values. +[ -r "${INITCONFFILE}" ] || { + echo Generating ${INITCONFFILE}... >&2 + cat >${INITCONFFILE} <<'EOFMAGICNUMBER1234' +# Defaults for samba initscript +# sourced by /etc/init.d/samba +# installed at /etc/default/samba by the maintainer scripts +# +# +# This is a POSIX shell fragment +# -if [ -f $DEBIAN_CONFIG ]; then - . $DEBIAN_CONFIG - if [ "$config_version" -ge "$CONFIG_VERSION" ]; then - samba_configured=yes - fi -fi +# How should Samba (nmbd and smbd) run? Possible values are "daemons" +# or "inetd". +RUN_MODE="" +EOFMAGICNUMBER1234 +} -# If Samba is configured we don't want to pester the user with -# configuration questions, just tell him that he can reconfigure -# Samba at any time by running /usr/sbin/sambaconfig. -if [ "$samba_configured" = "no" ]; then - # Samba is not configured, go and ask the user the information needed - # to configure it, and configure it! +# --- Begin of FHS migration code --- - # Create Debian specific configuration file - echo "config_version=$CONFIG_VERSION" > $DEBIAN_CONFIG +# Starting with Samba 2.2.3-4 the WINS database, the browse +# database and other important run-time files are stored in +# FHS-compliant directories. The following code takes care of +# moving the files in the old directories (/var/samba/ and +# /var/state/samba) to the new FHS-compliant directories. - # We always run /etc/init.d/samba, even if we run Samba from inetd. - # This script file takes care of handling the conflict of running - # from inetd or as daemons. - update-rc.d samba defaults >/dev/null +if [ -d /var/samba/ ]; then + mv /var/samba/* /var/lib/samba/ 2>/dev/null || true + rmdir /var/samba/ +fi - # We want to add these entries to inetd.conf commented out. Otherwise - # UDP traffic could make inetd to start nmbd or smbd right during - # the configuration stage. - update-inetd --add "#<off># netbios-ssn stream tcp nowait root /usr/sbin/tcpd /usr/sbin/smbd" - update-inetd --add "#<off># netbios-ns dgram udp wait root /usr/sbin/tcpd /usr/sbin/nmbd -a" +# Default for anything we don't know about (see next two 'for' loops) +# is /var/lib/samba -- guaranteed not to accidentally tromp on any +# files the admin thought were safe. +if [ -d /var/state/samba ]; then + mv /var/state/samba/* /var/lib/samba/ 2>/dev/null || true + rmdir /var/state/samba/ + + # It's not FHS, and it's probably our fault this is here, + # so delete it if we can. + rmdir /var/state/ 2> /dev/null || true +fi - echo "" - echo Samba Configuration - echo ------------------- - echo "The Samba server may be run either as a daemon at startup, or it may be" - echo "run from the inetd meta-daemon upon request. If run as a daemon, the" - echo "server will always be ready, so starting sessions will be faster. If run" - echo "from the inetd meta-daemon some memory will be saved and utilities such" - echo "as the tcpd TCP-wrapper may be used for extra security. If you don't" - echo "know what to do, running from inetd is a safe choice." - echo "" - echo "Run Samba as daemons or from inetd?" - echo -n "Press 'D' to run as daemons or 'I' to run from inetd: [I] " - - read mode - test -n "$mode" || mode="I" - - case "$mode" in - [Dd]*) - echo "Samba will run as daemons. Run sambaconfig to reconfigure" - update-inetd --disable netbios-ssn - update-inetd --disable netbios-ns - echo "run_mode=as_daemons" >> $DEBIAN_CONFIG - ;; - - *) - echo "Samba will run from inetd. Run sambaconfig to reconfigure" - update-inetd --enable netbios-ssn - update-inetd --enable netbios-ns - echo "run_mode=from_inetd" >> $DEBIAN_CONFIG - ;; - esac - - if [ ! -f /etc/samba/smbpasswd ]; then - echo "" - echo "If you are going to use encrypted passwords you need to have a" - echo "separate password file for this (the format is different from " - echo "/etc/passwd). Right now you don't have an /etc/samba/smbpasswd file." - echo "Do you want to generate this new file from your existing" - echo -n "/etc/passwd file? [y/N] " - - read yn - test -n "$yn" || yn="N" - - if [ $yn = y -o $yn = Y ]; then - cat /etc/passwd | /usr/sbin/mksmbpasswd > /etc/samba/smbpasswd - chmod 600 /etc/samba/smbpasswd - echo "" - echo "/etc/samba/smbpasswd now has the same user names as /etc/passwd. However," - echo "you need to run smbpasswd manually to set the password for each user." - echo "" - echo "smbpasswd_created=yes" >> $DEBIAN_CONFIG - else - echo "smbpasswd_created=no" >> $DEBIAN_CONFIG - fi +# All these files are now placed in their respective FHS-compliant +# directories. Separate out the individual files accordingly. +for F in browse.dat printing.tdb winbindd_cache.tdb +do + if [ -e /var/lib/samba/"$F" ]; then + mv /var/lib/samba/"$F" /var/cache/samba/ fi +done - echo "" - - # Start Samba: nothing wrong will happen if Samba is running from inetd - # and /etc/init.d/samba is run. However, to simplify things, we - # do not run /etc/init.d/samba if we're running from inetd. - - if [ $mode = d -o $mode = D ]; then - echo -n "Samba will run as daemons - start Samba now? [Y/n] " - read yn - test -n "$yn" || yn="Y" - - case "$yn" in - [Nn]*) - echo "Not started; to start later, do: /etc/init.d/samba start" - echo -n "Press [ENTER] " - read line - ;; - - *) - /etc/init.d/samba start - ;; - esac - else - echo "Since you are running Samba from inetd, the daemons will start" - echo "automatically by inetd when there is traffic on the NetBIOS" - echo "ports." - echo -n "Press [ENTER] " - read line +for F in brlock.tdb connections.tdb locking.tdb messages.tdb nmbd.pid \ + sessionid.tdb smbd.pid unexpected.tdb +do + if [ -e /var/lib/samba/"$F" ]; then + mv /var/lib/samba/"$F" /var/run/samba/ fi -else # if (samba_configured) ... - # We are here because Samba was already configured... +done - # At this point the NetBIOS daemons are disabled in /etc/inetd.conf. - # This is a consequence of what we did in the prerm. If Samba was - # configured to run from inetd we need to enable the entries in - # /etc/inetd.conf. +# --- End of FHS migration code --- - # Read current Samba configuration - . $DEBIAN_CONFIG +# ------------------------- Debconf questions start --------------------- - if [ "$run_mode" = "from_inetd" ]; then - update-inetd --enable netbios-ssn - update-inetd --enable netbios-ns - fi +# Run Samba as daemons or from inetd? +db_get samba/run_mode || true +RUN_MODE="${RET}" - echo "" - echo "Samba was already installed and configured so I skipped the " - echo "configuration questions. You can run the script /usr/sbin/sambaconfig" - echo "at any time to reconfigure Samba. See sambaconfig(8) for more" - echo "details. I will not even ask you if you want to restart Samba," - echo "I will just do it!" - echo "" +TMPFILE=`mktemp -q /tmp/samba.config.XXXXXX` +sed -e "s/^[[:space:]]*RUN_MODE[[:space:]]*=.*/RUN_MODE=\"${RUN_MODE}\"/" \ + < ${INITCONFFILE} >${TMPFILE} +mv -f ${TMPFILE} ${INITCONFFILE} - /etc/init.d/samba start -fi # if (samba_configured) ... +# Generate a smbpasswd file? +db_get samba/generate_smbpasswd || true +GENERATE_SMBPASSWD="${RET}" -if test "$1" = configure && dpkg --compare-versions "$2" lt 2.0.0final-2 && [ -f /etc/samba/smbpasswd ]; then +# Done with debconf now. +db_stop - cat << EOF +if [ "${GENERATE_SMBPASSWD}" = "true" -a ! -e /etc/samba/smbpasswd ]; then + getent passwd | /usr/sbin/mksmbpasswd > /etc/samba/smbpasswd + chmod 600 /etc/samba/smbpasswd +fi -*** IMPORTANT *** +# ------------------------- Debconf questions end --------------------- -The format of the smbpasswd file (which is used only if you are using -encrypted passwords) is different in Samba 2.0.0 and above. I will -convert it to the new format. +# We always run /etc/init.d/samba, even if we run Samba from inetd. +# The init.d script takes care of handling the conflict of running +# from inetd or as daemons. +update-rc.d samba defaults 20 19 > /dev/null -EOF +# We want to add these entries to inetd.conf commented out. Otherwise +# UDP traffic could make inetd to start nmbd or smbd right during +# the configuration stage. +if [ "$1" = "configure" -a -z "$2" ]; then + update-inetd --add "#<off># netbios-ns dgram udp wait root /usr/sbin/tcpd /usr/sbin/nmbd -a" + update-inetd --add "#<off># netbios-ssn stream tcp nowait root /usr/sbin/tcpd /usr/sbin/smbd" +fi - mv /etc/samba/smbpasswd /etc/samba/smbpasswd.old - cat /etc/samba/smbpasswd.old | /usr/bin/convert_smbpasswd \ - > /etc/samba/smbpasswd 2> /dev/null +if [ "$RUN_MODE" = "daemons" ]; then + update-inetd --disable netbios-ns + update-inetd --disable netbios-ssn +else + update-inetd --enable netbios-ns + update-inetd --enable netbios-ssn +fi + +# Start Samba: nothing wrong should happen if Samba is running from inetd +# and /etc/init.d/samba is run. + +# Run the init script if this is a first-time install, or if it's an +# upgrade and Samba was running before. +if [ -z "$2" -o ! -f /tmp/samba-was-not-running ]; then + # Check the script is executable before running it. + [ -x /etc/init.d/samba ] && /etc/init.d/samba start fi # This check is a safety net: the /etc/samba/smbpasswd file must have @@ -215,4 +159,18 @@ if [ -f /var/backups/smbpasswd.bak ]; then chmod 600 /var/backups/smbpasswd.bak fi +# Delete old /etc/samba/debian_config file, which is not used anymore +# now that we are using debconf. +rm -f /etc/samba/debian_config + +# Move old log files to the new location of Samba's log files +mv -f /var/log/nmb* /var/log/samba/ 2> /dev/null || true +mv -f /var/log/smb* /var/log/samba/ 2> /dev/null || true + +# Do this last, so we don't accidentally start the daemons if something +# else in the script fails above. +rm -f /tmp/samba-was-not-running + +#DEBHELPER# + exit 0 diff --git a/packaging/Debian/debian/samba.postrm b/packaging/Debian/debian/samba.postrm index 73b2f0d0a1f..82b21e5621c 100644 --- a/packaging/Debian/debian/samba.postrm +++ b/packaging/Debian/debian/samba.postrm @@ -1,7 +1,9 @@ #!/bin/sh +# +# $Id: samba.postrm,v 1.1.2.2 2002/05/02 20:02:04 jerry Exp $ +# if [ "$1" = purge ]; then - update-rc.d samba remove >/dev/null # Remove WINS.DAT, BROWSE.DAT and lock information file rm -Rf /var/samba/ @@ -10,17 +12,24 @@ if [ "$1" = purge ]; then rm -Rf /var/lock/samba/ # Remove files left in /etc/samba/ - rm -Rf /etc/samba/debian_config rm -Rf /etc/samba/MACHINE.SID # Remove log files - rm -f /var/log/[ns]mb* + rm -Rf /var/log/samba/ + + # Remove init.d configuration file + echo Removing configuration file /etc/default/samba... >&2 + rm -f /etc/default/samba # Remove NetBIOS entries from /etc/inetd.conf update-inetd --remove netbios-ssn update-inetd --remove netbios-ns + + update-rc.d samba remove >/dev/null else # Not purging, do not remove NetBIOS entries from /etc/inetd.conf update-inetd --disable netbios-ssn update-inetd --disable netbios-ns fi + +#DEBHELPER# diff --git a/packaging/Debian/debian/samba.preinst b/packaging/Debian/debian/samba.preinst index 6ebefb8fb1b..42c4cf70f5f 100644 --- a/packaging/Debian/debian/samba.preinst +++ b/packaging/Debian/debian/samba.preinst @@ -7,6 +7,8 @@ # Thanks to Ben Pfaff <pfaffben@pilot.msu.edu> for sharing on debian-devel # his ideas about how to move conffiles to new locations. # +# $Id: samba.preinst,v 1.1.2.2 2002/05/02 20:02:04 jerry Exp $ +# # First see if a smb.conf file currently exists. test -f /etc/smb.conf || exit 0 @@ -45,3 +47,5 @@ if [ -f /etc/smbpasswd -a ! -e /etc/samba/smbpasswd ]; then # Finally, move the conffile to its new location. mv /etc/smbpasswd /etc/samba/smbpasswd fi + +#DEBHELPER# diff --git a/packaging/Debian/debian/samba.prerm b/packaging/Debian/debian/samba.prerm index acd6d087b5c..671f677d509 100644 --- a/packaging/Debian/debian/samba.prerm +++ b/packaging/Debian/debian/samba.prerm @@ -1,74 +1,25 @@ -#!/bin/sh -# -# Pre-removal script for the Samba package for Debian GNU/Linux. -# -# Written by Eloy A. Paris for the Debian project. -# - -DEBIAN_CONFIG=/etc/samba/debian_config - -NMBDPID=/var/state/samba/nmbd.pid -SMBDPID=/var/state/samba/smbd.pid - -# The most important thing the prerm script must do is to stop the Samba -# daemons (nmbd and smbd). Note that this can be tricky since Samba -# can be running from the inetd meta-daemon or as daemons (it's a -# user choice). - -# Before we stop Samba we need to know how it is running (from inetd -# or as daemons). We could source in the debian_config file but it -# is safer to grep /etc/inetd.conf. -if grep -q '^netbios-ns' /etc/inetd.conf; then - # Samba is running from inetd. We need to disable the Samba daemons - # in /etc/inetd.conf before we stop the daemons. Otherwise traffic - # in the NetBIOS ports will make inetd start them again. - # - # Note: user preferences regarding the mode he/she wants Samba to - # be run (inetd or daemons) will be lost next. In the postinst - # we depend on the information present in the debian_config - # file to restore everything back to the way it was. - update-inetd --disable netbios-ssn - update-inetd --disable netbios-ns - - # Now it is safe to stop the daemons... - - # I have just recalled that old versions of nmbd and smbd did not store - # their PID's in /var/samba/state/ (or whatever directory - # was used for this purpose in configure), so I can't use - # --pidfile in start-stop-daemon to stop nmbd or smbd. I - # will handle this by testing first whether the PID file exists. - if [ -f $NMBDPID ]; then - start-stop-daemon --stop --oknodo --user root --name nmbd --quiet --pidfile $NMBDPID - else - start-stop-daemon --stop --oknodo --user root --name nmbd --quiet +#!/bin/sh -e + +# Clean up any such stale file. +rm -f /tmp/samba-was-not-running + +# The smbd pid file is missing, or points to a dead process +if [ ! -f /var/run/samba/smbd.pid ] || \ + ! ps h `cat /var/run/samba/smbd.pid` > /dev/null +then + # The nmbd pid file is missing, or points to a dead process + if [ -f /var/run/samba/nmbd.pid ] || \ + ! ps h `cat /var/run/samba/nmbd.pid` > /dev/null + then + # let the postinst know not to start samba. + [ "$1" = "upgrade" ] && touch /tmp/samba-was-not-running fi +fi - # nmbd must be dead by now, now it's smbd's turn - if [ -f $SMBDPID ]; then - start-stop-daemon --stop --oknodo --user root --name smbd --quiet --pidfile $SMBDPID - else - start-stop-daemon --stop --oknodo --user root --name smbd --quiet - fi -elif [ -x /etc/init.d/samba ]; then # Old Samba packages didn't have a - # /etc/init.d/samba so we better +if [ -x /etc/init.d/samba ]; then # Old Samba packages didn't have + # /etc/init.d/samba so we'd better # check first. - # Samba is running as daemons. No problem here, just stop Samba... /etc/init.d/samba stop fi -if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/samba ]; then - rm -f /usr/doc/samba -fi - -# Make sure there are no nmbd or smbd daemons running (security check) -# (as you see this code is commented out - so far I haven't had the need -# to do this sanity check - peloy, Aug. 23, 1998) -#ps -ax | grep nmbd -#if [ $? ... ]; then -# killall -9 nmbd -#fi - -#ps -ax | grep smbd -#if [ $? ... ]; then -# killall -9 smbd -#fi +#DEBHELPER# diff --git a/packaging/Debian/debian/samba.templates b/packaging/Debian/debian/samba.templates new file mode 100644 index 00000000000..9deeaa42b04 --- /dev/null +++ b/packaging/Debian/debian/samba.templates @@ -0,0 +1,33 @@ +Template: samba/run_mode +Type: select +Default: daemons +Choices: daemons, inetd +Description: How do you want to run Samba? + The Samba services (nmbd and smbd) can run as normal daemons or + from inetd. Running as daemons is the recommended approach. + +Template: samba/generate_smbpasswd +Type: boolean +Default: false +Description: Create samba password file, /etc/samba/smbpasswd? + To be compatible with the defaults in most versions of Windows, + Samba must be configured to use encrypted passwords. This requires + user passwords to be stored in a file separate from /etc/passwd. + This file can be created automatically, but the passwords must + be added manually (by you or the user) by running smbpasswd, + and you must arrange to keep it up-to-date in the future. If + you do not create it, you will have to reconfigure samba + (and probably your client machines) to use plaintext passwords. + See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the + samba-doc package for more details. + +Template: samba/log_files_moved +Type: note +Description: Samba's log files have moved. + Starting with the first packages of Samba 2.2 for Debian the log + files for both Samba daemons (nmbd and smbd) are now stored in + /var/log/samba/. The names of the files are log.nmbd and log.smbd, + for nmbd and smbd respectively. + . + The old log files that were in /var/log/ will be moved to + the new location for you. diff --git a/packaging/Debian/debian/samba.templates.es b/packaging/Debian/debian/samba.templates.es new file mode 100644 index 00000000000..a3ea2c0e8bb --- /dev/null +++ b/packaging/Debian/debian/samba.templates.es @@ -0,0 +1,56 @@ +Template: samba/run_mode +Type: select +Default: daemons +Choices: daemons, inetd +Choices-es: demonios, inetd +Description: How do you want to run Samba? + The Samba services (nmbd and smbd) can run as normal daemons or + from inetd. Running as daemons is the recommended approach. +Description-es: ¿Cómo quiere que Samba se ejecute? + Los servicios Samba (nmbd y smbd) pueden ejecutarse como demonios + normales o desde el inetd. Se recomienda que se ejecuten como demonios + independientes. + +Template: samba/generate_smbpasswd +Type: boolean +Default: false +Description: Create samba password file, /etc/samba/smbpasswd? + To be compatible with the defaults in most versions of Windows, + Samba must be configured to use encrypted passwords. This requires + user passwords to be stored in a file separate from /etc/passwd. + This file can be created automatically, but the passwords must + be added manually (by you or the user) by running smbpasswd, + and you must arrange to keep it up-to-date in the future. If + you do not create it, you will have to reconfigure samba + (and probably your client machines) to use plaintext passwords. + See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the + samba-doc package for more details. +Description-es: ¿Crear el fichero de contraseñas /etc/samba/smbpasswd? + Para manterner compatibilidad con el comportamiento por defecto de la + mayoria de los sistemas Windows, hay que configurar Samba para que use + contraseñas encriptadas, lo cual requiere la creación de un fichero + distinto del /etc/passwd donde se guarden las contraseñas de los usuarios. + El fichero se puede crear automaticamente, aunque es necesario añadir + las contraseñas manualmente (por usted o por el usuario) usando + el programa `smbpasswd', y usted debe hacer arreglos para mantener las + contraseñas al día. Si no se crea este fichero, es imprescindible + configurar Samba (y posiblemente los ordenadores Windows) para usar + contraseñas no cifradas. Véa + /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html del paquete samba-doc + para más información. + +Template: samba/log_files_moved +Type: note +Description: Samba's log files have moved. + Starting with the first packages of Samba 2.2 for Debian the log + files for both Samba daemons (nmbd and smbd) are now stored in + /var/log/samba/. The names of the files are log.nmbd and log.smbd, + for nmbd and smbd respectively. + . + The old log files that were in /var/log/ will be moved to + the new location for you. +Description-es: Se han movido los ficheros de registro de Samba. + A partir de los primeros paquetes de Samba 2.2 para Debian, + los ficheros de registro para los dos demonios del Samba (nmbd y smbd) + se encuentran en /var/log/samba/. Los nombres de estos ficheros + son log.nmbd y log.smbd, para nmbd y smbd respectivamente. diff --git a/packaging/Debian/debian/samba.templates.fr b/packaging/Debian/debian/samba.templates.fr new file mode 100644 index 00000000000..4a207750c24 --- /dev/null +++ b/packaging/Debian/debian/samba.templates.fr @@ -0,0 +1,57 @@ +Template: samba/run_mode +Type: select +Choices: daemons, inetd +Choices-fr: démons, inetd +Default: daemons +Description: How do you want to run Samba? + The Samba services (nmbd and smbd) can run as normal daemons or from + inetd. Running as daemons is the recommended approach. +Description-fr: Comment voulez-vous lancer Samba ? + Les services de Samba (nmbd et smbd) peuvent s'exécuter en tant que démons + classiques ou bien être lancés par inetd. L'approche recommandée est qu'ils + s'exécutent en tant que démons. + +Template: samba/generate_smbpasswd +Type: boolean +Default: false +Description: Create samba password file, /etc/samba/smbpasswd? + To be compatible with the defaults in most versions of Windows, + Samba must be configured to use encrypted passwords. This requires + user passwords to be stored in a file separate from /etc/passwd. + This file can be created automatically, but the passwords must + be added manually (by you or the user) by running smbpasswd, + and you must arrange to keep it up-to-date in the future. If + you do not create it, you will have to reconfigure samba + (and probably your client machines) to use plaintext passwords. + See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the + samba-doc package for more details. +Description-fr: Faut-il créer un fichier /etc/samba/smbpasswd ? + Pour préserver la compatibilité avec le comportement par défaut de la + plupart des systèmes Windows, Samba doit utiliser + les mots de passe chiffrés. Cela exige la création d'un fichier, + distinct du fichier /etc/passwd, pour mettre les mots de passe des + utilisateurs. Ce fichier peut être créé automatiquement, mais + quelqu'un (vous ou l'utilisateur) devra ajouter les mots de + passe manuellement en utilisant la commande smbpasswd ; et vous devrez + maintenir à jour ce fichier. Si vous ne voulez pas créer le fichier + maintenant, Samba (et peut-être les ordinateurs Windows) + devra utiliser des mots de passe non chiffrés. + Voyez /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html dans le + paquet samba-doc pour plus de détails. + +Template: samba/log_files_moved +Type: note +Description: Samba's log files have moved. + Starting with the first packages of Samba 2.2 for Debian the log files for + both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The + names of the files are log.nmbd and log.smbd, for nmbd and smbd + respectively. + . + The old log files that were in /var/log/ will be moved to the new location + for you. +Description-fr: Les fichiers-journaux de Samba ont changé de place. + À partir des premiers paquets de Samba 2.2 pour Debian, les fichiers-journaux + des démons nmbd et smbd se trouvent dans /var/log/samba/. Les noms de ces + fichiers sont log.nmbd et log.smbd pour, respectivement, nmbd et smbd. + . + Les anciens fichiers-journaux dans /var/log/ seront mis au bon endroit. diff --git a/packaging/Debian/debian/samba.templates.pt_BR b/packaging/Debian/debian/samba.templates.pt_BR new file mode 100644 index 00000000000..597c4a55e35 --- /dev/null +++ b/packaging/Debian/debian/samba.templates.pt_BR @@ -0,0 +1,57 @@ +Template: samba/run_mode +Type: select +Choices: daemons, inetd +Choices-pt_BR: +Default: daemons +Description: How do you want to run Samba? + The Samba services (nmbd and smbd) can run as normal daemons or from + inetd. Running as daemons is the recommended approach. +Description-pt_BR: Como você deseja que o Samba seja executado ? + Os serviços Samba (nmbd e smbd) podem ser executados como daemons normais + ou a partir do inetd. Executá-los como daemons é o método recomendado. + +Template: samba/generate_smbpasswd +Type: boolean +Default: false +Description: Create samba password file, /etc/samba/smbpasswd? + To be compatible with the defaults in most versions of Windows, Samba must + be configured to use encrypted passwords. This requires user passwords to + be stored in a file separate from /etc/passwd. This file can be created + automatically, but the passwords must be added manually (by you or the + user) by running smbpasswd, and you must arrange to keep it up-to-date in + the future. If you do not create it, you will have to reconfigure samba + (and probably your client machines) to use plaintext passwords. See + See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the + samba-doc package for more details. +Description-pt_BR: Gerar o arquivo de senhas /etc/samba/smbpasswd ? + Para compatibilidade com os padrões adotados em todas as versões + atuais do Windows o Samba deve ser configurado para usar senhas + encriptadas. Isso requer que as senhas dos usuários sejam armazenadas + em um arquivo diferente de /etc/passwd. Esse arquivo pode ser criado + automaticamente, mas as senhas devem ser definidas manualmente (por + você ou pelo usuário) executando-se o utilitário smbpasswd. Você deve + certificar-se de manter esse arquivo atualizado futuramente. + Caso você não crie esse arquivo, você terá que reconfigurar o + Samba (e provavelmente suas máquinas clientes) para utilização de senhas + em texto puro. Consulte a documentação em + /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html do pacote samba-doc + para maiores detalhes. + +Template: samba/log_files_moved +Type: note +Description: Samba's log files have moved. + Starting with the first packages of Samba 2.2 for Debian the log files for + both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The + names of the files are log.nmbd and log.smbd, for nmbd and smbd + respectively. + . + The old log files that were in /var/log/ will be moved to the new location + for you. +Description-pt_BR: Arquivos de log do Samba foram movidos. + Desde os primeiros pacotes Debian do Samba 2.2 os arquivos de log para + ambos os daemons Samba (nmbd e smbd) são armazenados no diretório + /var/log/samba/. Os nomes desses arquivos são log.nmbd e log.smbd, para + o nmbd e para o smbd, respectivamente. + . + Os antigos arquivos de log que estavam em /var/log/ serão movidos para + a nova localização automaticamente para você. diff --git a/packaging/Debian/debian/scripts/patch-source b/packaging/Debian/debian/scripts/patch-source index a95a0020488..fad1802f84e 100755 --- a/packaging/Debian/debian/scripts/patch-source +++ b/packaging/Debian/debian/scripts/patch-source @@ -1,7 +1,16 @@ #!/bin/sh -e +# +# $Id: patch-source,v 1.1.2.2 2002/05/02 20:02:05 jerry Exp $ +# for patch in debian/patches/*.patch; do patch -p1 < $patch done +cat debian/changelog | perl -pi -e '($version) = <STDIN> =~/\((.*)\)/; \ + s/\".*\"/\"$version for Debian\"/' source/include/version.h + +# Regenerate configure only if it is older than configure.in +[ source/configure -ot source/configure.in ] && (cd source && autoconf) + exit 0 diff --git a/packaging/Debian/debian/scripts/unpatch-source b/packaging/Debian/debian/scripts/unpatch-source index 81d51f7dd4e..197e281f066 100755 --- a/packaging/Debian/debian/scripts/unpatch-source +++ b/packaging/Debian/debian/scripts/unpatch-source @@ -1,7 +1,17 @@ #!/bin/sh -e +# +# $Id: unpatch-source,v 1.1.2.2 2002/05/02 20:02:05 jerry Exp $ +# -for patch in debian/patches/*.patch; do +# We want to reverse the patches in the opposite order we applied +# them, hence the 'ls|sort -r'. +for patch in `ls debian/patches/*.patch | sort -r`; do patch -p1 -R < $patch done +perl -pi -e's/-.* for Debian//' source/include/version.h + +# Regenerate configure only if it is older than configure.in +[ source/configure -ot source/configure.in ] && (cd source && autoconf) + exit 0 diff --git a/packaging/Debian/debian/smb.conf b/packaging/Debian/debian/smb.conf index 14cc20f49c4..57b1fff3067 100644 --- a/packaging/Debian/debian/smb.conf +++ b/packaging/Debian/debian/smb.conf @@ -1,119 +1,185 @@ -; -; /etc/samba/smb.conf -; -; Sample configuration file for the Samba suite for Debian GNU/Linux -; -; Please see the manual page for smb.conf for detailed description of -; every parameter. -; +# +# Sample configuration file for the Samba suite for Debian GNU/Linux. +# +# $Id: smb.conf,v 1.1.2.2 2002/05/02 20:02:04 jerry Exp $ +# +# This is the main Samba configuration file. You should read the +# smb.conf(5) manual page in order to understand the options listed +# here. Samba has a huge number of configurable options most of which +# are not shown in this example +# +# Any line which starts with a ; (semi-colon) or a # (hash) +# is a comment and is ignored. In this example we will use a # +# for commentary and a ; for parts of the config file that you +# may wish to enable +# +# NOTE: Whenever you modify this file you should run the command +# "testparm" to check that you have not many any basic syntactic +# errors. +# + +#======================= Global Settings ======================= [global] - printing = bsd - printcap name = /etc/printcap - load printers = yes - guest account = nobody + +# Change this for the workgroup/NT-domain name your Samba server will part of + workgroup = DEBIAN_FANS + +# server string is the equivalent of the NT Description field + server string = %h server (Samba %v) + +# If you want to automatically load your printer list rather +# than setting them up individually then you'll need this +; load printers = yes + +# You may wish to override the location of the printcap file +; printcap name = /etc/printcap + +# 'printing = cups' works nicely +; printing = bsd + +; guest account = nobody invalid users = root -; "security = user" is always a good idea. This will require a Unix account -; in this server for every user accessing the server. - security = user +# This tells Samba to use a separate log file for each machine +# that connects + log file = /var/log/samba/log.%m + +# Put a capping on the size of the log files (in Kb). + max log size = 1000 -; Change this for the workgroup your Samba server will part of - workgroup = WORKGROUP +# If you want Samba to log though syslog only then set the following +# parameter to 'yes'. Please note that logging through syslog in +# Samba is still experimental. +; syslog only = no - server string = %h server (Samba %v) +# We want Samba to log a minimum amount of information to syslog. Everything +# should go to /var/log/samba/log.{smb,nmb} instead. If you want to log +# through syslog you should set the following parameter to something higher. + syslog = 0 + +# "security = user" is always a good idea. This will require a Unix account +# in this server for every user accessing the server. See +# security_level.txt for details. +; security = user + +# You may wish to use password encryption. Please read ENCRYPTION.txt, +# Win95.txt and WinNT.txt in the Samba documentation. Do not enable this +# option unless you have read those documents + encrypt passwords = no + +# Using the following line enables you to customise your configuration +# on a per machine basis. The %m gets replaced with the netbios name +# of the machine that is connecting +; include = /home/samba/etc/smb.conf.%m + +# Most people will find that this option gives better performance. +# See speed.txt and the manual pages for details +# You may want to add the following on a Linux system: +# SO_RCVBUF=8192 SO_SNDBUF=8192 + socket options = TCP_NODELAY + +# --- Browser Control Options --- + +# Please _read_ BROWSING.txt and set the next four parameters according +# to your network setup. The defaults are specified below (commented +# out.) It's important that you read BROWSING.txt so you don't break +# browsing in your network! -; If you want Samba to log though syslog only then set the following -; parameter to 'yes'. Please note that logging through syslog in -; Samba is still experimental. - syslog only = no - -; We want Samba to log a minimum amount of information to syslog. Everything -; should go to /var/log/{smb,nmb} instead. If you want to log through -; syslog you should set the following parameter to something higher. - syslog = 0; - -; This socket options really speed up Samba under Linux, according to my -; own tests. - socket options = IPTOS_LOWDELAY TCP_NODELAY SO_SNDBUF=4096 SO_RCVBUF=4096 - -; Passwords are encrypted by default. This way the latest Windows 95 and NT -; clients can connect to the Samba server with no problems. - encrypt passwords = yes - -; It's always a good idea to use a WINS server. If you want this server -; to be the WINS server for your network change the following parameter -; to "yes". Otherwise leave it as "no" and specify your WINS server -; below (note: only one Samba server can be the WINS server). -; Read BROWSING.txt for more details. - wins support = no - -; If this server is not the WINS server then specify who is it and uncomment -; next line. -; wins server = 172.16.0.10 - -; Please read BROWSING.txt and set the next four parameters according -; to your network setup. There is no valid default so they are commented -; out. -; os level = 0 -; domain master = no -; local master = no -; preferred master = no - -; What naming service and in what order should we use to resolve host names -; to IP addresses - name resolve order = lmhosts host wins bcast - -; This will prevent nmbd to search for NetBIOS names through DNS. +# set local master to no if you don't want Samba to become a master +# browser on your network. Otherwise the normal election rules apply +; local master = yes + +# OS Level determines the precedence of this server in master browser +# elections. The default value should be reasonable +; os level = 20 + +# Domain Master specifies Samba to be the Domain Master Browser. This +# allows Samba to collate browse lists between subnets. Don't use this +# if you already have a Windows NT domain controller doing this job +; domain master = auto + +# Preferred Master causes Samba to force a local browser election on startup +# and gives it a slightly higher chance of winning the election +; preferred master = auto + +# --- End of Browser Control Options --- + +# Windows Internet Name Serving Support Section: +# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server +; wins support = no + +# WINS Server - Tells the NMBD components of Samba to be a WINS Client +# Note: Samba can be either a WINS Server, or a WINS Client, but NOT both +; wins server = w.x.y.z + +# This will prevent nmbd to search for NetBIOS names through DNS. dns proxy = no -; Name mangling options +# What naming service and in what order should we use to resolve host names +# to IP addresses +; name resolve order = lmhosts host wins bcast - preserve case = yes - short preserve case = yes +# Name mangling options +; preserve case = yes +; short preserve case = yes -; This boolean parameter controlls whether Samba attempts to sync. the Unix -; password with the SMB password when the encrypted SMB password in the -; /etc/samba/smbpasswd file is changed. - unix password sync = false +# This boolean parameter controlls whether Samba attempts to sync. the Unix +# password with the SMB password when the encrypted SMB password in the +# /etc/samba/smbpasswd file is changed. +; unix password sync = false -; For Unix password sync. to work on a Debian GNU/Linux system, the following -; parameters must be set (thanks to Augustin Luton -; <aluton@hybrigenics.fr> for sending the correct chat script for -; the passwd program in Debian Potato). +# For Unix password sync. to work on a Debian GNU/Linux system, the following +# parameters must be set (thanks to Augustin Luton <aluton@hybrigenics.fr> for +# sending the correct chat script for the passwd program in Debian Potato). passwd program = /usr/bin/passwd %u passwd chat = *Enter\snew\sUNIX\spassword:* %n\n *Retype\snew\sUNIX\spassword:* %n\n . -; The following parameter is useful only if you have the linpopup package -; installed. The samba maintainer and the linpopup maintainer are -; working to ease installation and configuration of linpopup and samba. -; message command = /bin/sh -c '/usr/bin/linpopup "%f" "%m" %s; rm %s' & +# This boolean controls whether PAM will be used for password changes +# when requested by an SMB client instead of the program listed in +# 'passwd program'. The default is 'no'. +; pam password change = no -; The default maximum log file size is 5 MBytes. That's too big so this -; next parameter sets it to 1 MByte. Currently, Samba rotates log -; files (/var/log/{smb,nmb} in Debian) when these files reach 1000 KBytes. -; A better solution would be to have Samba rotate the log file upon -; reception of a signal, but for now on, we have to live with this. - max log size = 1000 +# The following parameter is useful only if you have the linpopup package +# installed. The samba maintainer and the linpopup maintainer are +# working to ease installation and configuration of linpopup and samba. +; message command = /bin/sh -c '/usr/bin/linpopup "%f" "%m" %s; rm %s' & obey pam restrictions = yes +# Some defaults for winbind (make sure you're not using the ranges +# for something else.) +; winbind uid = 10000-20000 +; winbind gid = 10000-20000 +; template shell = /bin/bash + +#======================= Share Definitions ======================= + [homes] comment = Home Directories browseable = no -; By default, the home directories are exported read only. Change next -; parameter to "no" if you want to be able to write to them. - read only = yes +# By default, the home directories are exported read-only. Change next +# parameter to 'yes' if you want to be able to write to them. + writable = no -; File creation mask is set to 0700 for security reasons. If you want to -; create files with group=rw permissions, set next parameter to 0775. +# File creation mask is set to 0700 for security reasons. If you want to +# create files with group=rw permissions, set next parameter to 0775. create mask = 0700 -; Directory creation mask is set to 0700 for security reasons. If you want to -; create dirs. with group=rw permissions, set next parameter to 0775. +# Directory creation mask is set to 0700 for security reasons. If you want to +# create dirs. with group=rw permissions, set next parameter to 0775. directory mask = 0700 +# Un-comment the following and create the netlogon directory for Domain Logons +# (you need to configure Samba to act as a domain controller too.) +;[netlogon] +; comment = Network Logon Service +; path = /home/samba/netlogon +; guest ok = yes +; writable = no +; share modes = no + [printers] comment = All Printers browseable = no @@ -123,25 +189,25 @@ writable = no create mode = 0700 -; A sample share for sharing your CD-ROM with others. +# A sample share for sharing your CD-ROM with others. ;[cdrom] ; comment = Samba server's CD-ROM ; writable = no ; locking = no ; path = /cdrom ; public = yes -; -; The next two parameters show how to auto-mount a CD-ROM when the -; cdrom share is accesed. For this to work /etc/fstab must contain -; an entry like this: -; -; /dev/scd0 /cdrom iso9660 defaults,noauto,ro,user 0 0 -; -; The CD-ROM gets unmounted automatically after the connection to the -; -; If you don't want to use auto-mounting/unmounting make sure the CD -; is mounted on /cdrom -; + +# The next two parameters show how to auto-mount a CD-ROM when the +# cdrom share is accesed. For this to work /etc/fstab must contain +# an entry like this: +# +# /dev/scd0 /cdrom iso9660 defaults,noauto,ro,user 0 0 +# +# The CD-ROM gets unmounted automatically after the connection to the +# +# If you don't want to use auto-mounting/unmounting make sure the CD +# is mounted on /cdrom +# ; preexec = /bin/mount /cdrom ; postexec = /bin/umount /cdrom diff --git a/packaging/Debian/debian/swat.postinst b/packaging/Debian/debian/swat.postinst index c5ab4890441..a8a30ad5d36 100644 --- a/packaging/Debian/debian/swat.postinst +++ b/packaging/Debian/debian/swat.postinst @@ -1,4 +1,7 @@ #!/bin/sh +# +# $Id: swat.postinst,v 1.1.2.2 2002/05/02 20:02:04 jerry Exp $ +# PATH=/sbin:/bin:/usr/sbin:/usr/bin @@ -18,6 +21,4 @@ esac update-inetd --group OTHER --add \ '#<off># swat\t\tstream\ttcp\tnowait.400\troot\t/usr/sbin/tcpd\t/usr/sbin/swat' -if [ -d /usr/doc -a ! -e /usr/doc/swat -a -d /usr/share/doc/swat ]; then - ln -sf ../share/doc/swat /usr/doc/swat -fi +#DEBHELPER# diff --git a/packaging/Debian/debian/swat.postrm b/packaging/Debian/debian/swat.postrm index e203d2855ff..0cedac309ff 100644 --- a/packaging/Debian/debian/swat.postrm +++ b/packaging/Debian/debian/swat.postrm @@ -1,9 +1,11 @@ #!/bin/sh +# +# $Id: swat.postrm,v 1.1.2.2 2002/05/02 20:02:04 jerry Exp $ +# case "$1" in purge) update-inetd --remove '/usr/sbin/swat$' - exit 0 ;; remove) ;; @@ -15,5 +17,7 @@ case "$1" in ;; esac +#DEBHELPER# + exit 0 diff --git a/packaging/Debian/debian/winbind.conffiles b/packaging/Debian/debian/winbind.conffiles new file mode 100644 index 00000000000..c9adbfff174 --- /dev/null +++ b/packaging/Debian/debian/winbind.conffiles @@ -0,0 +1,2 @@ +/etc/init.d/winbind +/etc/logrotate.d/winbind diff --git a/packaging/Debian/debian/winbind.files b/packaging/Debian/debian/winbind.files new file mode 100644 index 00000000000..9730900e7e9 --- /dev/null +++ b/packaging/Debian/debian/winbind.files @@ -0,0 +1,7 @@ +usr/sbin/winbindd +usr/bin/wbinfo +usr/share/man/man1/wbinfo.1 +usr/share/man/man8/winbindd.8 +lib/security/pam_winbind.so +lib/libnss_winbind.so.2 +lib/libnss_wins.so diff --git a/packaging/Debian/debian/winbind.init b/packaging/Debian/debian/winbind.init new file mode 100644 index 00000000000..993b4117ac4 --- /dev/null +++ b/packaging/Debian/debian/winbind.init @@ -0,0 +1,49 @@ +#!/bin/sh +# +# Start/stops the winbindd daemon. +# +# $Id: winbind.init,v 1.1.2.1 2002/05/02 20:02:04 jerry Exp $ +# + +PATH=/sbin:/bin:/usr/sbin:/usr/bin + +DAEMON=/usr/sbin/winbindd + +# clear conflicting settings from the environment +unset TMPDIR + +# See if the daemon is there +test -x $DAEMON || exit 0 + +case "$1" in + start) + echo -n "Starting the Winbind daemon: winbindd" + + start-stop-daemon --start --quiet --exec $DAEMON + + echo "." + ;; + stop) + echo -n "Stopping the Winbind daemon: winbindd" + + start-stop-daemon --stop --quiet --oknodo --exec $DAEMON + + echo "." + ;; + restart|force-reload) + echo -n "Restarting the Winbind daemon: winbindd" + + start-stop-daemon --stop --quiet --oknodo --exec $DAEMON + sleep 2 + start-stop-daemon --start --quiet --exec $DAEMON + + echo "." + ;; + *) + echo "Usage: /etc/init.d/winbind {start|stop|restart|force-reload}" + exit 1 + ;; +esac + +exit 0 + diff --git a/packaging/Debian/debian/winbind.logrotate b/packaging/Debian/debian/winbind.logrotate new file mode 100644 index 00000000000..7300885eb12 --- /dev/null +++ b/packaging/Debian/debian/winbind.logrotate @@ -0,0 +1,10 @@ +/var/log/samba/log.winbindd { + weekly + missingok + rotate 7 + postrotate + killall -q -HUP winbindd || true + endscript + compress + notifempty +} |