From f83a6ce2adbdd471809ccbcfd69dc3fcf6d89129 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Tue, 9 Sep 2003 11:12:43 +0000 Subject: [PATCH] another round of syncs for HEAD that I forget (This used to be commit 3aaf65d297d20320dc1f2c0ac0487feb47873609) --- README | 89 +-- WHATSNEW.txt | 346 ++++++++- packaging/Debian/debian/libsmbclient.postinst | 12 - .../Debian/debian/patches/configure.patch | 32 - .../Debian/debian/patches/krb5-vars.patch | 688 ------------------ .../debian/patches/pam_smbpass_linkage.patch | 24 - .../Debian/debian/patches/smbadduser.patch | 23 - .../Debian/debian/patches/smbclient-tar.patch | 43 -- packaging/Debian/debian/python2.2-samba.files | 1 - .../Debian/debian/samba-common.conffiles | 3 - packaging/Debian/debian/samba.conffiles | 3 - packaging/Debian/debian/swat.docs | 1 - packaging/Debian/debian/winbind.conffiles | 2 - packaging/Mandrake/samba-2.2.0-gawk.patch | 11 - .../Mandrake/samba-2.2.5-gp-reloc-fix.patch | 12 - packaging/Mandrake/smbmount-sbin.patch | 15 - packaging/Mandrake/swat_16.xpm.bz2 | Bin 1003 -> 0 bytes packaging/Mandrake/swat_32.xpm.bz2 | Bin 2727 -> 0 bytes packaging/Mandrake/swat_48.xpm.bz2 | Bin 3051 -> 0 bytes packaging/README.UnixWare | 6 - packaging/RedHat/samba2.spec.tmpl | 429 ----------- packaging/SGI/relnotes.html | 21 +- packaging/Solaris/makepkg.sh | 154 ---- swat/README | 77 -- swat/help/welcome.html | 20 +- swat/images/globals.gif | Bin 628 -> 2004 bytes swat/images/home.gif | Bin 580 -> 2044 bytes swat/images/passwd.gif | Bin 613 -> 1993 bytes swat/images/printers.gif | Bin 705 -> 2077 bytes swat/images/shares.gif | Bin 569 -> 2006 bytes swat/images/status.gif | Bin 578 -> 2080 bytes swat/images/viewconfig.gif | Bin 820 -> 1939 bytes swat/images/wizard.gif | Bin 853 -> 2554 bytes 33 files changed, 390 insertions(+), 1622 deletions(-) delete mode 100644 packaging/Debian/debian/libsmbclient.postinst delete mode 100644 packaging/Debian/debian/patches/configure.patch delete mode 100644 packaging/Debian/debian/patches/krb5-vars.patch delete mode 100644 packaging/Debian/debian/patches/pam_smbpass_linkage.patch delete mode 100644 packaging/Debian/debian/patches/smbadduser.patch delete mode 100644 packaging/Debian/debian/patches/smbclient-tar.patch delete mode 100644 packaging/Debian/debian/python2.2-samba.files delete mode 100644 packaging/Debian/debian/samba-common.conffiles delete mode 100644 packaging/Debian/debian/samba.conffiles delete mode 100644 packaging/Debian/debian/swat.docs delete mode 100644 packaging/Debian/debian/winbind.conffiles delete mode 100644 packaging/Mandrake/samba-2.2.0-gawk.patch delete mode 100644 packaging/Mandrake/samba-2.2.5-gp-reloc-fix.patch delete mode 100644 packaging/Mandrake/smbmount-sbin.patch delete mode 100644 packaging/Mandrake/swat_16.xpm.bz2 delete mode 100644 packaging/Mandrake/swat_32.xpm.bz2 delete mode 100644 packaging/Mandrake/swat_48.xpm.bz2 delete mode 100644 packaging/README.UnixWare delete mode 100644 packaging/RedHat/samba2.spec.tmpl delete mode 100755 packaging/Solaris/makepkg.sh delete mode 100644 swat/README diff --git a/README b/README index 725a26523a5..f529610ef43 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ This is a development version of Samba, the free SMB and CIFS client and -server for unix and other operating systems. Samba is maintained by +server for UNIX and other operating systems. Samba is maintained by the Samba Team, who support the original author, Andrew Tridgell. >>>> Please read THE WHOLE of this file as it gives important information @@ -13,35 +13,36 @@ copy of which you should have received with this software (in a file called COPYING). -WHAT IS SMB? -============ +WHAT IS SMB/CIFS? +================= This is a big question. The very short answer is that it is the protocol by which a lot of PC-related machines share files and printers and other information such as lists of available files and printers. Operating systems that -support this natively include Windows NT, OS/2, and Linux and add on -packages that achieve the same thing are available for DOS, Windows, -VMS, Unix of all kinds, MVS, and more. Apple Macs and some Web Browsers -can speak this protocol as well. Alternatives to SMB include -Netware, NFS, Appletalk, Banyan Vines, Decnet etc; many of these have -advantages but none are both public specifications and widely -implemented in desktop machines by default. - -The Common Internet Filesystem (CIFS) is what the new SMB initiative +support this natively include Windows 9x, Windows NT (and derivatives), +OS/2, Mac OS X and Linux. Add on packages that achieve the same +thing are available for DOS, Windows 3.1, VMS, Unix of all kinds, +MVS, and more. Some Web Browsers can speak this protocol as well +(smb://). Alternatives to SMB include Netware, NFS, Appletalk, +Banyan Vines, Decnet etc; many of these have advantages but none are +both public specifications and widely implemented in desktop machines +by default. + +The Common Internet File system (CIFS) is what the new SMB initiative is called. For details watch http://samba.org/cifs. WHY DO PEOPLE WANT TO USE SMB? ============================== -1. Many people want to integrate their Microsoft or IBM style desktop - machines with their Unix or VMS (etc) servers. +1. Many people want to integrate their Microsoft desktop clients + with their Unix servers. 2. Others want to integrate their Microsoft (etc) servers with Unix - or VMS (etc) servers. This is a different problem to integrating - desktop clients. + servers. This is a different problem to integrating desktop + clients. 3. Others want to replace protocols like NFS, DecNet and Novell NCP, especially when used with PCs. @@ -50,18 +51,26 @@ WHY DO PEOPLE WANT TO USE SMB? WHAT CAN SAMBA DO? ================== -Here is a very short list of what samba includes, and what it does. For -many networks this can be simply summarised by "Samba provides a complete -replacement for Windows NT, Warp, NFS or Netware servers." +Please refer to the WHATSNEW.txt included with this README for +a list of features in the latest Samba release. + +Here is a very short list of what samba includes, and what it does. +For many networks this can be simply summarized by "Samba provides +a complete replacement for Windows NT, Warp, NFS or Netware servers." - a SMB server, to provide Windows NT and LAN Manager-style file and print services to SMB clients such as Windows 95, Warp Server, smbfs and others. +- a Windows NT 4.0 Domain Controller replacement. + +- a file/print server that can act as a member of a Windows NT 4.0 + or Active Directory domain. + - a NetBIOS (rfc1001/1002) nameserver, which amongst other things gives browsing support. Samba can be the master browser on your LAN if you wish. - a ftp-like SMB client so you can access PC resources (disks and -printers) from unix, Netware and other operating systems + printers) from UNIX, Netware, and other operating systems - a tar extension to the client for backing up PCs @@ -73,16 +82,14 @@ http://samba.org/samba, and browse the user survey. Related packages include: -- smbfs, a linux-only filesystem allowing you to mount remote SMB -filesystems from PCs on your linux box. This is included as standard with +- smbfs, a Linux-only filesystem allowing you to mount remote SMB +filesystems from PCs on your Linux box. This is included as standard with Linux 2.0 and later. -- tcpdump-smb, a extension to tcpdump to allow you to investigate SMB -networking problems over netbeui and tcp/ip. +- cifsvfs, a more advanced Linux-only filesystem allowing you to mount +remote SMB filesystems from PCs on your Linux box. This is included +as standard with Linux 2.5 and later. -- smblib, a library of smb functions which are designed to make it -easy to smb-ise any particular application. See -ftp://samba.org/pub/samba/smblib. CONTRIBUTIONS @@ -90,9 +97,10 @@ CONTRIBUTIONS If you want to contribute to the development of the software then please join the mailing list. The Samba team accepts patches -(preferably in "diff -u" format, see docs/BUGS.txt for more details) -and are always glad to receive feedback or suggestions to the address -samba@lists.samba.org. +(preferably in "diff -u" format, see http://samba.org/samba/devel/ +for more details) and are always glad to receive feedback or +suggestions to the address samba@lists.samba.org. More information +on the various Samba mailing lists can be found at http://lists.samba.org/. You can also get the Samba sourcecode straight from the CVS tree - see http://samba.org/cvs.html. @@ -107,7 +115,7 @@ If you like a particular feature then look through the CVS change-log who added it, then send them an email. Remember that free software of this kind lives or dies by the response -we get. If noone tells us they like it then we'll probably move onto +we get. If no one tells us they like it then we'll probably move onto something else. However, as you can see from the user survey quite a lot of people do seem to like it at the moment :-) @@ -119,17 +127,16 @@ DOCUMENTATION ------------- There is quite a bit of documentation included with the package, -including man pages, and lots of .txt files with hints and useful +including man pages, and lots of .html files with hints and useful info. This is also available from the web page. There is a growing -collection of information under docs/faq; by the next release expect -this to be the default starting point. +collection of information under docs/. A list of Samba documentation in languages other than English is available on the web page. If you would like to help with the documentation (and we _need_ help!) then have a look at the mailing list samba-docs, archived at -http://lists.samba.org/ +http://lists.samba.org/listinfo/samba-docs/ MAILING LIST @@ -197,12 +204,12 @@ A few tips when submitting to this or any mailing list. NEWS GROUP ---------- -You might also like to look at the usenet news group -comp.protocols.smb as it often contains lots of useful info and is -frequented by lots of Samba users. The newsgroup was initially setup -by people on the Samba mailing list. It is not, however, exclusive to -Samba, it is a forum for discussing the SMB protocol (which Samba -implements). The samba list is gatewayed to this newsgroup. +You might also like to look at the usenet news group comp.protocols.smb +as it often contains lots of useful info and is frequented by lots of +Samba users. The newsgroup was initially setup by people on the Samba +mailing list. It is not, however, exclusive to Samba, it is a forum for +discussing the SMB protocol (which Samba implements). The samba list +is gatewayed to this newsgroup. WEB SITE diff --git a/WHATSNEW.txt b/WHATSNEW.txt index c264e6a3c72..4a3c3e1d0a8 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,29 +1,22 @@ - WHATS NEW IN Samba 3.0.0 beta4 - July 16 2003 + WHATS NEW IN Samba 3.0.0 RC3 + September 8, 2003 ============================== -This is the third beta release of Samba 3.0.0. This is a -non-production release intended for testing purposes. Use -at your own risk. +This is the third release candidate snapshot of Samba 3.0.0. A release +candidate implies that the code is very close to a final release, remember +that this is still a non-production release intended for testing purposes. +Use at your own risk. -The purpose of this beta release is to get wider testing of the major -new pieces of code in the current Samba 3.0 development tree. We have -officially ceased development on the 2.2.x release of Samba and are -concentrating on Samba 3.0. To reduce the time before the final -Samba 3.0 release we need as many people as possible to start testing -these beta releases, and to provide high quality feedback on what -needs fixing. - -Samba 3.0 is feature complete. However there is still some final -work to be done on certain pieces of functionality. Please refer to -the section on "Known Issues" for more details. +The purpose of this release candidate is to get wider testing of the major +new pieces of code in the current Samba 3.0 development tree. +Please refer to the section on "Known Issues" for more details. Major new features: ------------------- 1) Active Directory support. Samba 3.0 is now able to - to join a ADS realm as a member server and authenticate + join a ADS realm as a member server and authenticate users using LDAP/Kerberos. 2) Unicode support. Samba will now negotiate UNICODE on the wire and @@ -34,9 +27,7 @@ Major new features: been almost completely rewritten. Most of the changes are internal, but the new auth system is also very configurable. -4) New filename mangling system. The filename mangling system has been - completely rewritten. An internal database now stores mangling maps - persistently. This needs lots of testing. +4) New default filename mangling system. 5) A new "net" command has been added. It is somewhat similar to the "net" command in windows. Eventually we plan to replace @@ -49,9 +40,10 @@ Major new features: 7) Better Windows 2000/XP/2003 printing support including publishing printer attributes in active directory. -8) New loadable RPC modules. +8) New loadable module support for passdb backends and + character sets. -9) New dual-daemon winbindd support for better performance. +9) New default dual-daemon winbindd support for better performance. 10) Support for migrating from a Windows NT 4.0 domain to a Samba domain and maintaining user, group and domain SIDs. @@ -64,25 +56,257 @@ Major new features: 13) Major updates to the Samba documentation tree. +14) Full support for client and server SMB signing to ensure + compatibility with default Windows 2003 security settings. + Plus lots of other improvements! Additional Documentation ------------------------ -Please refer to Samba documentation tree (including in the docs/ +Please refer to Samba documentation tree (included in the docs/ subdirectory) for extensive explanations of installing, configuring and maintaining Samba 3.0 servers and clients. It is advised to begin with the Samba-HOWTO-Collection for overviews and specific tasks (the current book is up to approximately 400 pages) and to refer to the various man pages for information on individual options. +We are very glad to be able to include the second edition of +"Using Samba" by Jay Ts, Robert Eckstein, and David Collier-Brown +(O'Reilly & Associates) in this release. The book is available +on-line at http://samba.org/samba/docs/ and is included with +the Samba Web Administration Tool (SWAT). Thanks to the authors and +publisher for making "Using Samba" under the GNU Free Documentation +License. + + ###################################################################### -Changes since 3.0beta2 -###################### +Changes since 3.0rc2 +#################### Please refer to the CVS log for the SAMBA_3_0 branch for complete -details +details: + +1) Remove Perl module dependencies in generated RedHat 8/9 RPMS. +2) Update mount helper to take synonyms for file_mode and + dir_mode (fmask and dmask). +3) Fix portability bug with log2pcaphex. +4) Use different algorithm to generate codepages source code which + allows to take gaps into account thus making unnecessary + extended [index] = value, syntax in to_ucs2 array (bug 380). +5) Fix comment strings to 43 bytes as per spec. +6) Fix pam_winbind compile bug on FreeBSD (bug 261). +7) Support for in-memory keytabs, which are needed to make heimdal + work properly. MIT does not support them, so this check will be + used to decide whether to use them. (partial fix for bug 372). +8) Disable RC4-HMAC on broken heimdal setups. (remainder of bug + 372). +9) Correct bug in smbclient that resulted in errors when untarring + long filenames (bug 308). +10) Improve autoconf checks for PAM header files and libs. +11) Added fast path to convert_string() when dealing with + ASCII->ASCII, UCS2-LE->ASCII, and ASCII->UCS2-LE with + values <= 0x7F. +12) Quiet debug messages when we don't find a module and it is not + a critical error (bug 375). +13) Fix UNIX passwd sync properly. +14) Fix more transitive trust issues in winbindd (bug 305). +15) Ensure that winbindd functions with 'disable netbios = yes' +16) Store the real short domain name in secrets.tdb as soon as we + know it. Also display an error message when joining an AD + domain and the 'workgroup' parameter has not been specified. +17) Return 0 DFS links instead of -1 when dfs support is not enabled. +18) Update LDAP schema for Netscape DS 4.x and Novell eDirectory 8.7 +19) Ensure that name types can be specified using name#type notation + in the 'net' command (bug 73). +20) Add retry looks to ADS sequence number and domain SID lookups + (bug 364). +21) use a variant of alloc_sub_basic() for string lists such as + 'valid users', 'write list', and 'read list' (bug 397). +22) Fix seg fault when winbindd receives an error from the AD server + in response to an LDAP search (bug 282). +23) Update findsmb to use the new syntax for smbclient and nmblookup. +24) Fix bug that prevented variables from being used in explicitly + defined path in [homes]. +25) Only set SIDs when they're returned by the MySQL query + (pdb_mysql.so). +26) Include support for NTLMv2 key exchange. +27) Revert default for 'client ntlmv2 auth' to off (bug 359). +28) Fix crash in winbindd when the trust account password gets + changed underneath us via 'net rpc changetrustpw' (bug 382). +29) Use djb-algorithm string hash - faster than the tdb one we + used to use. Does not change on disk format or hashing location. +30) Implements some kind of improved AFS support for Samba on + Linux with OpenAFS 1.2.10. './configure --with-fake-kaserver' + assumes that you have OpenAFS on your machine. +31) When enumerating dfs shares loop from 0 to lp_numservices() instead + of relying on lp_servicename(n) to return an empty string for + invalid service numbers (bug 403). +32) Fix crash bug in 'net rpc samdump' (bug 334). +33) Fix crash bug in WINS NSS module (bug 299). +34) Fix a few minor compile errors on HP-UX. + + + +Changes since 3.0rc1 +#################### + +1) Add levels 261 and 262 to search. Found using Samba4 tester. +2) Correct bad error return code in session setup reply +3) Fix bug where smbd returned DOS error codes from SMBsearch + even when NT1 protocol was negotiated. +4) Implement SMBexit properly. +5) Return group lists from a Samba PDC to a Windows 9x/ME box + in implementing user level access control (bug 314). +6) Prevent SWAT from crashing when adding shares (bug 254) +7) Fix various documentation issues (bugs 304 & 214) +8) Fix wins server listing in SWAT (bug 197) +9) Fix problem in rpcclient that caused enumerating printer + drivers to report failure (bug 294). +10) Use kerberos 5 authentication in our client code whenever possible +11) Fix schannel bug that caused Active Directory DC's to downgrade our + machine account to an NT member. +12) Implement missing SAMR_REMOVE_USER_FOREIGN_DOMAIN call (bug 252). +13) Implement automatic generation of include/version.h +14) Include initial version of smbldap-tool scripts for the Samba + 3.0 schema. +15) Implement numerous fixes for multi-byte character strings. +16) Enable 'unix extensions' parameter by default. +17) Make sure we set the SID type when falling back to the rid + algorithm (bug 245). +18) Correct linking problems with pam_smbpass (bug 327). +19) Add SYSV defines for Irix and Solaris to ensure the 'printing' + parameter default to the correct value (bug 230) +20) Fix recursion bug in alloc_string_sub() (bug 289, et. al.) +21) Ensure that 'make install' includes the static and shared + versions of the libsmbclient libraries. +22) Add CP850 and CP437 internal character set support (bug 150). +23) Add support to examples/LDAP/convertSambaAccount for generating + LDIF modify files instead of just add (303). +24) Fix support for -W option in smbclient (bug 39) +25) Remove 'ldap trust ids' parameter since it could not be supported + by the current architecture. +26) Don't crash when no argument is given to -T in smbclient (bug 345). +27) Ensure smbadduser contains the same paths for the smbpasswd file + as the other Samba tools (bug 290). +28) Port of 'available = no' fix for [homes] from SAMBA_2_2 cvs tree. +29) Add sanity checks to DeletePrinterData[Ex]() and ensure that the + modified printer is written to disk. +30) Force winbindd to periodically update the trusted domain cache. +31) Remove outdated import/export script to convert an smbpasswd file + to and from and LDAP directory. Use the pdbedit tool instead. +32) Ensure that %U substitution is restored on next valid packet + if a logon fails. + + +Changes since 3.0beta3 +###################### + +1) Various memory leak fixes. +2) Provide full support for SMB signing (server and client) +3) Check for broken getgrouplist() in glibc. +4) Don't get stuck in an infinite loop listing directories + recursively if the server returns an empty directory name + (bug 222). +5) Idle LDAP connections after 150 seconds. +6) Patched make uninstallmodules (bug 236). +7) Fix bug that caused smbd to return incomplete directory listings + when UNIX files contained MS wildcard characters. +8) Quiet default debug messages in command line tools. +9) Fixes to avoid panics on invalid multi-byte strings. +10) Fix error messages when creating a new smbpasswd file (bug 198). +11) Implemented better detection routines in autoconf scripts for + locating ads support on the host OS. +12) Fix bug that caused libraries in /usr/local/lib to be ignored + (bug 174). +13) Ensure winbindd_ads uses the correct realm or domain name when + connecting to trusted DC. +14) Ensure a correct prototype is created for snprintf() (bug 187) +15) Stop files being created on read-only shares in some circumstances. +16) Fix wbinfo -p (bug 251) +17) Support schannel on any tcp/ip connection if necessary +18) Correct bug in user_in_list() so that it works with winbind groups + again. +19) Ensure the schannel bind credentials default to the domain + of the destination host. +20) Default password expiration time in account_pol.tdb to never + expire. Remove any existing account_pol.tdb file to reset + the new default policy (bug 184). +21) Add buttons to SWAT to change the view of smb.conf (bug 212) +22) Fix incorrect checks that determine whether or not the 'add user + script' has been set. +23) More cleanup for internal character set conversions. +24) Fixes for multi-byte strings in stat cache code. +25) Ensure that the net command honors the 'workgroup' parameter + in smb.conf when not overridden from the command line. +26) Add gss-spnego support to the ntlm_auth tool. +27) Add vfs_default_quota VFS module. +28) Added server support for NT quota interfaces. +29) Prevent Krb5 replay attacks by adding a replay_cache. +30) Fix problems with winbindd and transitive trusts in AD domains. +31) Added -S to client tools for setting SMB signing options on the + command line. +32) Fix bug causing the 'passwd change program' to be called as the + connected user and not root. +33) Fixed data corruption bug in byte-range locking (e.g. affected MS Excel). +34) Support winbindd on FreeBSD is possible. +35) Look at only the first OID in the security blob sent in the session + setup request to determine the token type. +36) Only push locks onto a blocking lock queue if the posix lock failed with + EACCES or EAGAIN (this means another lock conflicts). Else return an + error and don't queue the request. +37) Fix command line argument processing for smbtar. +38) Correct issue that caused smbd to return generic unix_user. + for lookupsid(). +39) Default to algorithmic mapping when generating a rid for a group + mapping. +40) Expand %g and %G in logon script, profile path, etc... during + a domain logon (bug 208). +41) Make sure smbclient obeys '-s ' +42) Added win2k3 shadow copy operations to VFS interface. +43) Allow connections to samba domain member as SERVER\user (don't + always default to DOMAIN\user). +44) Remove checks in winbindd that caused it to attempt to use + non-transitive trust relationships. +45) Remove delays in winbindd caused by invalid DNS lookups. +46) Fix supplementary group memberships on systems with slightly + broken NSS implementations (bug 267). +47) Correct issue that prevented smbclient from viewing shares on + a win2k server when using a non-anonymous connection (bug 284). +48) Add --domain=DOMAIN_NAME to wbinfo for limiting operations like + 'wbinfo -u' to a single domain. The '.' character represents + our domain. +49) Fix group enumeration bug when using an LDAP directory for + storing group mappings. +50) Default to use NTLMv2 if available. Fallback to not use LM/NTLM + when the extended security capability bit is not set. +51) Fix crash in 'wbinfo -a' when using extended characters in the + username (bug 269). +52) Fix multi-byte strupper() panics (bug 205). +53) Add vfs_readonly VFS module. +54) Make sure to initialize the sambaNextUserRid and sambaNextGroupRid + attributes when using 'idmap backend = ldap' (bug 280). +55) Make sure that users shared between a Samba PDC and member + samba server are seen as domain users and not local users on the + domain member. +56) Fix Query FS Info level 2. +57) Allow enumeration of users and groups by win9x "file server" (bug + 286). +58) Create symlinks during install for modules that support mutliple + functions (bug 91). +59) More iconv detection fixes. +60) Fix path length error in vfs_recycle module (bug 291). +61) Added server support for the LSA_DS UUID on the \lsarpc pipe. + (server DsRoleGetPrimaryDomainInfo() is currently disabled). +62) Fix SMBseek and get/set position calls. +62) Fix SetFileInfo level 1. +63) Added tool to convert smbd log file to a pcap file (log2pcaphex). + + + +Changes since 3.0beta2 +###################### 1) Added fix for Japanese case names in statcache code; these can change size on upper casing. @@ -113,8 +337,8 @@ details groups (bug #109). 13) Remove idmap_XX_to_XX calls from smbd. Move back to the the winbind_XXX and local_XXX calls used in 2.2. -14) All uid/gid allocation must involve winbindd now - (we no attempt to map unknown SIDs to a UNIX identify). +14) All uid/gid allocation must involve winbindd now (we do not + attempt to map unknown SIDs to a UNIX identify). 15) Add 'winbind trusted domains only' parameter to force a domain member. The server to use matching users names from /etc/passwd for its domain (needed for domain member of a Samba domain). @@ -241,6 +465,49 @@ Changes since 3.0beta1 ###################################################################### +Upgrading from a previous Samba 3.0 beta +######################################## + +Beginning with Samba 3.0.0beta3, the RID allocation functions +have been moved into winbindd. Previously these were handled +by each passdb backend. This means that winbindd must be running +to automatically allocate RIDs for users and/or groups. Otherwise, +smbd will use the 2.2 algorithm for generating new RIDs. + +If you are using 'passdb backend = tdbsam' with a previous Samba +3.0 beta release (or possibly alpha), it may be necessary to +move the RID_COUNTER entry from /usr/local/samba/private/passdb.tdb +to winbindd_idmap.tdb. To do this: + +1) Ensure that winbindd_idmap.tdb exists (launch winbindd at least + once) +2) build tdbtool by executing 'make tdbtool' in the source/tdb/ + directory +3) run: (note that 'tdb>' is the tool's prompt for input) + + root# ./tdbtool /usr/local/samba/private/passdb.tdb + tdb> show RID_COUNTER + key 12 bytes + RID_COUNTER + data 4 bytes + [000] 0A 52 00 00 .R. + + tdb> move RID_COUNTER /usr/local/samba/var/locks/winbindd_idmap.tdb + .... + record moved + +If you are using 'passdb backend = ldapsam', it will be necessary to +store idmap entries in the LDAP directory as well (i.e. idmap backend += ldap). Refer to the 'net idmap' command for more information on +migrating SID<->UNIX id mappings from one backend to another. + +If the RID_COUNTER record does not exist, then these instructions are +unneccessary and the new RID_COUNTER record will be correctly generated +if needed. + + + +######################## Upgrading from Samba 2.2 ######################## @@ -337,6 +604,7 @@ New Parameters (new parameters have been grouped by function): * ntlm auth * paranoid server security * server schannel + * server signing * smb ports * use spnego @@ -382,7 +650,6 @@ New Parameters (new parameters have been grouped by function): * ldap idmap suffix * ldap machine suffix * ldap passwd sync - * ldap trust ids * ldap user suffix General Configuration @@ -399,6 +666,7 @@ Modified Parameters (changes in behavior): * restrict anonymous (integer value) * security (new 'ads' value) * strict locking (enabled by default) + * unix extensions (enabled by default) * winbind cache time (increased to 5 minutes) * winbind uid (deprecated in favor of 'idmap uid') * winbind gid (deprecated in favor of 'idmap gid') @@ -470,6 +738,14 @@ aware of when moving to Samba 3.0. with an Active Directory domain using the native Windows Kerberos 5 and LDAP protocols. + MIT kerberos 1.3.1 supports the ARCFOUR-HMAC-MD5 encryption + type which is neccessary for servers on which the + administrator password has not been changed, or kerberos-enabled + SMB connections to servers that require Kerberos SMB signing. + Besides this one difference, either MIT or Heimdal Kerberos + distributions are usable by Samba 3.0. + + Samba 3.0 also includes the possibility of setting up chains of authentication methods (auth methods) and account storage backends (passdb backend). Please refer to the smb.conf(5) @@ -716,10 +992,10 @@ Examples Known Issues ############ -* The smbldap perl scripts for managing user entries in an LDAP - directory have not be updated to function with the Samba 3.0 - schema changes. This (or an equivalent solution) work is planned - to be completed prior to the stable 3.0.0 release. +* There are several bugs currently logged against the 3.0 codebase + that affect the use of NT 4.0 GUI domain management tools when run + against a Samba 3.0 PDC. This bugs should be released in an early + 3.0.x release. Please refer to https://bugzilla.samba.org/ for a current list of bugs filed against the Samba 3.0 codebase. @@ -738,6 +1014,6 @@ the problem then you will probably be ignored. A new bugzilla installation has been established to help support the Samba 3.0 community of users. This server, located at -https://bugzilla.samba.org/, will replace the existing jitterbug server -and the old http://bugs.samba.org now points to the new bugzilla server. +https://bugzilla.samba.org/, has replaced the older jitterbug server +previously located at http://bugs.samba.org/. diff --git a/packaging/Debian/debian/libsmbclient.postinst b/packaging/Debian/debian/libsmbclient.postinst deleted file mode 100644 index 3223fa64d6b..00000000000 --- a/packaging/Debian/debian/libsmbclient.postinst +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# -# postinst script for libsmbclient -# -# $Id: libsmbclient.postinst,v 1.3 2003/06/01 07:12:51 peloy Exp $ -# - -if [ "$1" = "configure" ]; then - ldconfig -fi - -#DEBHELPER# diff --git a/packaging/Debian/debian/patches/configure.patch b/packaging/Debian/debian/patches/configure.patch deleted file mode 100644 index 0cf1434b29d..00000000000 --- a/packaging/Debian/debian/patches/configure.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -uNr samba-3.0alpha21.orig/source/configure.in samba-3.0alpha21/source/configure.in ---- samba-3.0alpha21.orig/source/configure.in 2003-02-16 13:01:45.000000000 -0600 -+++ samba-3.0alpha21/source/configure.in 2003-02-16 13:04:03.000000000 -0600 -@@ -481,6 +481,28 @@ - #endif - } - ], [LINUX_LFS_SUPPORT=yes], [LINUX_LFS_SUPPORT=no], [LINUX_LFS_SUPPORT=cross]) -+ if test x$LINUX_LFS_SUPPORT = xyes ; then -+ AC_TRY_RUN([ -+#include -+#include -+#include -+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); -+} -+], [LINUX_LFS_SUPPORT=yes], [LINUX_LFS_SUPPORT=no], [LINUX_LFS_SUPPORT=cross]) -+ 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" diff --git a/packaging/Debian/debian/patches/krb5-vars.patch b/packaging/Debian/debian/patches/krb5-vars.patch deleted file mode 100644 index d6eadfd91b1..00000000000 --- a/packaging/Debian/debian/patches/krb5-vars.patch +++ /dev/null @@ -1,688 +0,0 @@ ---- samba_3_0/source/Makefile.in.orig 2003-07-15 12:26:55.000000000 -0400 -+++ samba_3_0/source/Makefile.in 2003-07-15 12:26:57.000000000 -0400 -@@ -32,7 +32,6 @@ - ACLLIBS=@ACLLIBS@ - PASSDBLIBS=@PASSDBLIBS@ - IDMAP_LIBS=@IDMAP_LIBS@ --ADSLIBS=@ADSLIBS@ - KRB5LIBS=@KRB5_LIBS@ - LDAPLIBS=@LDAP_LIBS@ - -@@ -735,12 +734,12 @@ - - bin/smbd@EXEEXT@: $(SMBD_OBJ) @BUILD_POPT@ bin/.dummy - @echo Linking $@ -- @$(CC) $(FLAGS) -o $@ $(SMBD_OBJ) $(ADSLIBS) $(LDFLAGS) $(DYNEXP) $(PRINTLIBS) \ -+ @$(CC) $(FLAGS) -o $@ $(SMBD_OBJ) $(KRB5LIBS) $(LDAPLIBS) $(LDFLAGS) $(DYNEXP) $(PRINTLIBS) \ - $(AUTHLIBS) $(ACLLIBS) $(PASSDBLIBS) $(LIBS) @POPTLIBS@ - - bin/nmbd@EXEEXT@: $(NMBD_OBJ) @BUILD_POPT@ bin/.dummy - @echo Linking $@ -- @$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @POPTLIBS@ $(ADSLIBS) -+ @$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAPLIBS) - - bin/wrepld@EXEEXT@: $(WREPL_OBJ) @BUILD_POPT@ bin/.dummy - @echo Linking $@ -@@ -749,19 +748,19 @@ - bin/swat@EXEEXT@: $(SWAT_OBJ) @BUILD_POPT@ bin/.dummy - @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(SWAT_OBJ) $(LDFLAGS) $(DYNEXP) $(PRINTLIBS) \ -- $(AUTHLIBS) $(LIBS) $(PASSDBLIBS) @POPTLIBS@ $(KRB5LIBS) -+ $(AUTHLIBS) $(LIBS) $(PASSDBLIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAPLIBS) - - bin/rpcclient@EXEEXT@: $(RPCCLIENT_OBJ) @BUILD_POPT@ bin/.dummy - @echo Linking $@ -- @$(CC) $(FLAGS) -o $@ $(PASSDBLIBS) $(RPCCLIENT_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ $(ADSLIBS) -+ @$(CC) $(FLAGS) -o $@ $(PASSDBLIBS) $(RPCCLIENT_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAPLIBS) - - bin/smbclient@EXEEXT@: $(CLIENT_OBJ) @BUILD_POPT@ bin/.dummy - @echo Linking $@ -- @$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ $(ADSLIBS) -+ @$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAPLIBS) - - bin/net@EXEEXT@: $(NET_OBJ) @BUILD_POPT@ bin/.dummy - @echo Linking $@ -- @$(CC) $(FLAGS) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ $(ADSLIBS) $(PASSDBLIBS) -+ @$(CC) $(FLAGS) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAPLIBS) $(PASSDBLIBS) - - bin/profiles@EXEEXT@: $(PROFILES_OBJ) @BUILD_POPT@ bin/.dummy - @echo Linking $@ -@@ -809,7 +808,7 @@ - - bin/smbpasswd@EXEEXT@: $(SMBPASSWD_OBJ) bin/.dummy - @echo Linking $@ -- @$(CC) $(FLAGS) -o $@ $(SMBPASSWD_OBJ) $(PASSDBLIBS) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) -+ @$(CC) $(FLAGS) -o $@ $(SMBPASSWD_OBJ) $(PASSDBLIBS) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAPLIBS) - - bin/pdbedit@EXEEXT@: $(PDBEDIT_OBJ) @BUILD_POPT@ bin/.dummy - @echo Linking $@ -@@ -881,7 +880,7 @@ - - bin/smbw_sample@EXEEXT@: $(SMBW_OBJ) utils/smbw_sample.o bin/.dummy - @echo Linking $@ -- @$(CC) $(FLAGS) -o $@ $(SMBW_OBJ) utils/smbw_sample.o $(LDFLAGS) $(LIBS) $(KRB5LIBS) -+ @$(CC) $(FLAGS) -o $@ $(SMBW_OBJ) utils/smbw_sample.o $(LDFLAGS) $(LIBS) $(KRB5LIBS) $(LDAPLIBS) - - bin/smbsh@EXEEXT@: $(SMBSH_OBJ) bin/.dummy - @echo Linking $@ -@@ -890,12 +889,14 @@ - bin/smbwrapper.@SHLIBEXT@: $(PICOBJS) bin/.dummy - @echo Linking shared library $@ - @$(SHLD) $(LDSHFLAGS) -o $@ $(PICOBJS) $(LIBS) \ -- @SONAMEFLAG@`basename $@` $(KRB5LIBS) -+ $(KRB5LIBS) $(LDAPLIBS) \ -+ @SONAMEFLAG@`basename $@` - - bin/libsmbclient.@SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS) - @echo Linking libsmbclient shared library $@ - @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(LIBS) \ -- $(KRB5LIBS) @SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR) -+ $(KRB5LIBS) $(LDAPLIBS) \ -+ @SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR) - - bin/libsmbclient.a: $(LIBSMBCLIENT_PICOBJS) - @echo Linking libsmbclient non-shared library $@ -@@ -905,7 +906,8 @@ - bin/libbigballofmud.@SHLIBEXT@: $(LIBBIGBALLOFMUD_PICOBJS) - @echo Linking bigballofmud shared library $@ - @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_PICOBJS) $(LIBS) \ -- @SONAMEFLAG@`basename $@`.$(LIBBIGBALLOFMUD_MAJOR) $(PASSDBLIBS) $(IDMAP_LIBS) $(ADSLIBS) -+ $(PASSDBLIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAPLIBS) \ -+ @SONAMEFLAG@`basename $@`.$(LIBBIGBALLOFMUD_MAJOR) - ln -snf libbigballofmud.so bin/libbigballofmud.so.0 - - # It would be nice to build a static bigballofmud too, but when I try -diff -uNr samba-3.0.0beta2.orig/source/aclocal.m4 samba-3.0.0beta2/source/aclocal.m4 ---- samba-3.0.0beta2.orig/source/aclocal.m4 2003-07-01 15:44:25.000000000 -0500 -+++ samba-3.0.0beta2/source/aclocal.m4 2003-07-05 16:22:30.000000000 -0500 -@@ -111,6 +111,113 @@ - esac - ]) - -+# AC_CHECK_LIB_EXT(LIBRARY, [EXT_LIBS], [FUNCTION], -+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND], -+# [ADD-ACTION-IF-FOUND],[OTHER-LIBRARIES]) -+# ------------------------------------------------------ -+# -+# Use a cache variable name containing both the library and function name, -+# because the test really is for library $1 defining function $3, not -+# just for library $1. Separate tests with the same $1 and different $3s -+# may have different results. -+# -+# Note that using directly AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1_$3]) -+# is asking for troubles, since AC_CHECK_LIB($lib, fun) would give -+# ac_cv_lib_$lib_fun, which is definitely not what was meant. Hence -+# the AS_LITERAL_IF indirection. -+# -+# FIXME: This macro is extremely suspicious. It DEFINEs unconditionnally, -+# whatever the FUNCTION, in addition to not being a *S macro. Note -+# that the cache does depend upon the function we are looking for. -+# -+# It is on purpose we used `ac_check_lib_ext_save_LIBS' and not just -+# `ac_save_LIBS': there are many macros which don't want to see `LIBS' -+# changed but still want to use AC_CHECK_LIB_EXT, so they save `LIBS'. -+# And ``ac_save_LIBS' is too tempting a name, so let's leave them some -+# freedom. -+AC_DEFUN([AC_CHECK_LIB_EXT], -+[ -+AH_CHECK_LIB_EXT([$1]) -+ac_check_lib_ext_save_LIBS=$LIBS -+LIBS="-l$1 $$2 $7 $LIBS" -+AS_LITERAL_IF([$1], -+ [AS_VAR_PUSHDEF([ac_Lib_ext], [ac_cv_lib_ext_$1])], -+ [AS_VAR_PUSHDEF([ac_Lib_ext], [ac_cv_lib_ext_$1''])])dnl -+ -+m4_ifval([$3], -+ [ -+ AH_CHECK_FUNC_EXT([$3]) -+ AS_LITERAL_IF([$1], -+ [AS_VAR_PUSHDEF([ac_Lib_func], [ac_cv_lib_ext_$1_$3])], -+ [AS_VAR_PUSHDEF([ac_Lib_func], [ac_cv_lib_ext_$1''_$3])])dnl -+ AC_CACHE_CHECK([for $3 in -l$1], ac_Lib_func, -+ [AC_TRY_LINK_FUNC($3, -+ [AS_VAR_SET(ac_Lib_func, yes); -+ AS_VAR_SET(ac_Lib_ext, yes)], -+ [AS_VAR_SET(ac_Lib_func, no); -+ AS_VAR_SET(ac_Lib_ext, no)]) -+ ]) -+ AS_IF([test AS_VAR_GET(ac_Lib_func) = yes], -+ [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_$3))])dnl -+ AS_VAR_POPDEF([ac_Lib_func])dnl -+ ],[ -+ AC_CACHE_CHECK([for -l$1], ac_Lib_ext, -+ [AC_TRY_LINK_FUNC([main], -+ [AS_VAR_SET(ac_Lib_ext, yes)], -+ [AS_VAR_SET(ac_Lib_ext, no)]) -+ ]) -+ ]) -+LIBS=$ac_check_lib_ext_save_LIBS -+ -+AS_IF([test AS_VAR_GET(ac_Lib_ext) = yes], -+ [m4_default([$4], -+ [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_LIB$1)) -+ case "$$2" in -+ *-l$1*) -+ ;; -+ *) -+ $2="$$2 -l$1" -+ ;; -+ esac]) -+ [$6] -+ ], -+ [$5])dnl -+AS_VAR_POPDEF([ac_Lib_ext])dnl -+])# AC_CHECK_LIB_EXT -+ -+# AH_CHECK_LIB_EXT(LIBNAME) -+# --------------------- -+m4_define([AH_CHECK_LIB_EXT], -+[AH_TEMPLATE(AS_TR_CPP(HAVE_LIB$1), -+ [Define to 1 if you have the `]$1[' library (-l]$1[).])]) -+ -+# AC_CHECK_FUNCS_EXT(FUNCTION, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -+# ----------------------------------------------------------------- -+dnl check for a function in a $LIBS and $OTHER_LIBS libraries variable. -+dnl AC_CHECK_FUNC_EXT(func,OTHER_LIBS,IF-TRUE,IF-FALSE) -+AC_DEFUN([AC_CHECK_FUNC_EXT], -+[ -+ AH_CHECK_FUNC_EXT($1) -+ ac_check_func_ext_save_LIBS=$LIBS -+ LIBS="$2 $LIBS" -+ AS_VAR_PUSHDEF([ac_var], [ac_cv_func_ext_$1])dnl -+ AC_CACHE_CHECK([for $1], ac_var, -+ [AC_LINK_IFELSE([AC_LANG_FUNC_LINK_TRY([$1])], -+ [AS_VAR_SET(ac_var, yes)], -+ [AS_VAR_SET(ac_var, no)])]) -+ LIBS=$ac_check_func_ext_save_LIBS -+ AS_IF([test AS_VAR_GET(ac_var) = yes], -+ [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_$1])) $3], -+ [$4])dnl -+AS_VAR_POPDEF([ac_var])dnl -+])# AC_CHECK_FUNC -+ -+# AH_CHECK_FUNC_EXT(FUNCNAME) -+# --------------------- -+m4_define([AH_CHECK_FUNC_EXT], -+[AH_TEMPLATE(AS_TR_CPP(HAVE_$1), -+ [Define to 1 if you have the `]$1[' function.])]) -+ - dnl Define an AC_DEFINE with ifndef guard. - dnl AC_N_DEFINE(VARIABLE [, VALUE]) - define(AC_N_DEFINE, -diff -uNr samba-3.0.0beta2.orig/source/configure.in samba-3.0.0beta2/source/configure.in ---- samba-3.0.0beta2.orig/source/configure.in 2003-07-05 16:22:00.000000000 -0500 -+++ samba-3.0.0beta2/source/configure.in 2003-07-05 16:23:53.000000000 -0500 -@@ -162,12 +162,10 @@ - AC_SUBST(PRINTLIBS) - AC_SUBST(AUTHLIBS) - AC_SUBST(ACLLIBS) --AC_SUBST(ADSLIBS) - AC_SUBST(PASSDBLIBS) - AC_SUBST(IDMAP_LIBS) - AC_SUBST(KRB5_LIBS) - AC_SUBST(LDAP_LIBS) --AC_SUBST(LDAP_OBJ) - AC_SUBST(SHLIB_PROGS) - AC_SUBST(SMBWRAPPER) - AC_SUBST(EXTRA_BIN_PROGS) -@@ -2105,14 +2103,107 @@ - AC_MSG_RESULT(no) - ) - -+######################################################## -+# Compile with LDAP support? -+ -+with_ldap_support=auto -+AC_MSG_CHECKING([for LDAP support]) -+ -+AC_ARG_WITH(ldap, -+[ --with-ldap LDAP support (default yes)], -+[ case "$withval" in -+ yes|no) -+ with_ldap_support=$withval -+ ;; -+ esac ]) -+ -+AC_MSG_RESULT($with_ldap_support) -+ -+SMBLDAP="" -+SMBLDAP_PROTO="" -+AC_SUBST(SMBLDAP) -+AC_SUBST(SMBLDAP_PROTO) -+if test x"$with_ldap_support" != x"no"; then -+ -+ ################################################################## -+ # first test for ldap.h and lber.h -+ # (ldap.h is required for this test) -+ AC_CHECK_HEADERS(ldap.h lber.h) -+ -+ if test x"$ac_cv_header_ldap_h" != x"yes"; then -+ if test x"$with_ldap_support" = x"yes"; then -+ AC_MSG_ERROR(ldap.h is needed for LDAP support) -+ else -+ AC_MSG_WARN(ldap.h is needed for LDAP support) -+ fi -+ -+ with_ldap_support=no -+ fi -+fi -+ -+if test x"$with_ldap_support" != x"no"; then -+ ac_save_LIBS=$LIBS -+ -+ ################################################################## -+ # we might need the lber lib on some systems. To avoid link errors -+ # this test must be before the libldap test -+ AC_CHECK_LIB_EXT(lber, LDAP_LIBS, ber_scanf) -+ -+ ######################################################## -+ # now see if we can find the ldap libs in standard paths -+ AC_CHECK_LIB_EXT(ldap, LDAP_LIBS, ldap_init) -+ -+ AC_CHECK_FUNC_EXT(ldap_domain2hostlist,$LDAP_LIBS) -+ -+ ######################################################## -+ # If we have LDAP, does it's rebind procedure take 2 or 3 arguments? -+ # Check found in pam_ldap 145. -+ AC_CHECK_FUNC_EXT(ldap_set_rebind_proc,$LDAP_LIBS) -+ -+ LIBS="$LIBS $LDAP_LIBS" -+ AC_CACHE_CHECK(whether ldap_set_rebind_proc takes 3 arguments, smb_ldap_cv_ldap_set_rebind_proc, [ -+ AC_TRY_COMPILE([ -+ #include -+ #include ], -+ [ldap_set_rebind_proc(0, 0, 0);], -+ [smb_ldap_cv_ldap_set_rebind_proc=3], -+ [smb_ldap_cv_ldap_set_rebind_proc=2] -+ ) -+ ]) -+ -+ AC_DEFINE_UNQUOTED(LDAP_SET_REBIND_PROC_ARGS, $smb_ldap_cv_ldap_set_rebind_proc, [Number of arguments to ldap_set_rebind_proc]) -+ -+ AC_CHECK_FUNC_EXT(ldap_initialize,$LDAP_LIBS) -+ -+ if test x"$ac_cv_lib_ext_ldap_ldap_init" = x"yes" -a x"$ac_cv_func_ext_ldap_domain2hostlist" = x"yes"; then -+ AC_DEFINE(HAVE_LDAP,1,[Whether ldap is available]) -+ default_static_modules="$default_static_modules pdb_ldap idmap_ldap"; -+ SMBLDAP="lib/smbldap.o" -+ with_ldap_support=yes -+ AC_MSG_CHECKING(whether LDAP support is used) -+ AC_MSG_RESULT(yes) -+ else -+ if test x"$with_ldap_support" = x"yes"; then -+ AC_MSG_ERROR(libldap is needed for LDAP support) -+ else -+ AC_MSG_WARN(libldap is needed for LDAP support) -+ fi -+ -+ LDAP_LIBS="" -+ with_ldap_support=no -+ fi -+ LIBS=$ac_save_LIBS -+fi -+ -+ - ################################################# - # active directory support - - with_ads_support=auto --AC_MSG_CHECKING([whether to use Active Directory]) -+AC_MSG_CHECKING([for Active Directory and krb5 support]) - - AC_ARG_WITH(ads, --[ --with-ads Active Directory support (default yes)], -+[ --with-ads Active Directory support (default auto)], - [ case "$withval" in - yes|no) - with_ads_support="$withval" -@@ -2124,22 +2215,28 @@ - FOUND_KRB5=no - KRB5_LIBS="" - -+if test x"$with_ldap_support" != x"yes"; then -+ if test x"$with_ads_support" = x"yes"; then -+ AC_MSG_ERROR(Active Directory Support requires LDAP support) -+ elif test x"$with_ads_support" != x"no"; then -+ AC_MSG_WARN(Active Directory Support requires LDAP support) -+ fi -+ with_ads_support=no -+fi -+ - if test x"$with_ads_support" != x"no"; then - - # Do no harm to the values of CFLAGS and LIBS while testing for - # Kerberos support. - -- ac_save_CFLAGS="$CFLAGS" -- ac_save_LIBS="$LIBS" -- - ################################################# - # check for krb5-config from recent MIT and Heimdal kerberos 5 - AC_PATH_PROG(KRB5_CONFIG, krb5-config) - AC_MSG_CHECKING(for working krb5-config) - if test -x "$KRB5_CONFIG"; then -- LIBS="$LIBS `$KRB5_CONFIG --libs`" -- CFLAGS="$CFLAGS `$KRB5_CONFIG --cflags | sed s/@INCLUDE_des@//`" -- CPPFLAGS="$CPPFLAGS `$KRB5_CONFIG --cflags | sed s/@INCLUDE_des@//`" -+ KRB5_LIBS="`CFLAGS='' $KRB5_CONFIG --libs gssapi`" -+ KRB5_CFLAGS="`$KRB5_CONFIG --cflags | sed s/@INCLUDE_des@//`" -+ KRB5_CPPFLAGS="`$KRB5_CONFIG --cflags | sed s/@INCLUDE_des@//`" - FOUND_KRB5=yes - AC_MSG_RESULT(yes) - else -@@ -2154,18 +2251,23 @@ - [ --with-krb5=base-dir Locate Kerberos 5 support (default=/usr)], - [ case "$withval" in - no) -- AC_MSG_RESULT(no) -+ AC_MSG_RESULT(no krb5-path given) -+ ;; -+ yes) -+ AC_MSG_RESULT(/usr) -+ KRB5_LIBS="-lkrb5" -+ FOUND_KRB5=yes - ;; - *) -- AC_MSG_RESULT(yes) -- LIBS="$LIBS -lkrb5" -- CFLAGS="$CFLAGS -I$withval/include" -- CPPFLAGS="$CPPFLAGS -I$withval/include" -- LDFLAGS="$LDFLAGS -L$withval/lib" -+ AC_MSG_RESULT($withval) -+ KRB5_LIBS="-lkrb5" -+ KRB5_CFLAGS="-I$withval/include" -+ KRB5_CPPFLAGS="-I$withval/include" -+ KRB5_LDFLAGS="-L$withval/lib" - FOUND_KRB5=yes - ;; - esac ], -- AC_MSG_RESULT(no) -+ AC_MSG_RESULT(no krb5-path given) - ) - fi - -@@ -2175,15 +2277,15 @@ - AC_MSG_CHECKING(for /usr/include/heimdal) - if test -d /usr/include/heimdal; then - if test -f /usr/lib/heimdal/lib/libkrb5.a; then -- LIBS="$LIBS -lkrb5" -- CFLAGS="$CFLAGS -I/usr/include/heimdal" -- CPPFLAGS="$CPPFLAGS -I/usr/include/heimdal" -- LDFLAGS="$LDFLAGS -L/usr/lib/heimdal/lib" -+ KRB5_LIBS="-lkrb5" -+ KRB5_CFLAGS="-I/usr/include/heimdal" -+ KRB5_CPPFLAGS="-I/usr/include/heimdal" -+ KRB5_LDFLAGS="-L/usr/lib/heimdal/lib" - AC_MSG_RESULT(yes) - else -- LIBS="$LIBS -lkrb5" -- CFLAGS="$CFLAGS -I/usr/include/heimdal" -- CPPFLAGS="$CPPFLAGS -I/usr/include/heimdal" -+ KRB5_LIBS="-lkrb5" -+ KRB5_CFLAGS="-I/usr/include/heimdal" -+ KRB5_CPPFLAGS="-I/usr/include/heimdal" - AC_MSG_RESULT(yes) - fi - else -@@ -2196,16 +2298,26 @@ - # see if this box has the RedHat location for kerberos - AC_MSG_CHECKING(for /usr/kerberos) - if test -d /usr/kerberos -a -f /usr/kerberos/lib/libkrb5.a; then -- LIBS="$LIBS -lkrb5" -- LDFLAGS="$LDFLAGS -L/usr/kerberos/lib" -- CFLAGS="$CFLAGS -I/usr/kerberos/include" -- CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include" -+ KRB5_LIBS="-lkrb5" -+ KRB5_LDFLAGS="-L/usr/kerberos/lib" -+ KRB5_CFLAGS="-I/usr/kerberos/include" -+ KRB5_CPPFLAGS="-I/usr/kerberos/include" - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - fi - fi - -+ ac_save_CFLAGS=$CFLAGS -+ ac_save_CPPFLAGS=$CPPFLAGS -+ ac_save_LDFLAGS=$LDFLAGS -+ -+ CFLAGS="$CFLAGS $KRB5_CFLAGS" -+ CPPFLAGS="$CPPFLAGS $KRB5_CPPFLAGS" -+ LDFLAGS="$LDFLAGS $KRB5_LDFLAGS" -+ -+ KRB5_LIBS="$KRB5_LDFLAGS $KRB5_LIBS" -+ - # now check for krb5.h. Some systems have the libraries without the headers! - # note that this check is done here to allow for different kerberos - # include paths -@@ -2225,24 +2337,17 @@ - # Turn off AD support and restore CFLAGS and LIBS variables - - with_ads_support="no" -- -- CFLAGS="$ac_save_CFLAGS" -- LIBS="$ac_save_LIBS" -- -- else -- -- # Get rid of case where $with_ads_support=auto -- -- with_ads_support="yes" -- -+ -+ CFLAGS=$ac_save_CFLAGS -+ CPPFLAGS=$ac_save_CPPFLAGS -+ LDFLAGS=$ac_save_LDFLAGS - fi - fi - - # Now we have determined whether we really want ADS support - --if test x"$with_ads_support" = x"yes"; then -- -- AC_DEFINE(WITH_ADS,1,[Whether to include Active Directory support]) -+if test x"$with_ads_support" != x"no"; then -+ ac_save_LIBS=$LIBS - - # now check for gssapi headers. This is also done here to allow for - # different kerberos include paths -@@ -2250,64 +2365,46 @@ - - ################################################################## - # we might need the k5crypto and com_err libraries on some systems -- AC_CHECK_LIB(com_err, _et_list) -- AC_CHECK_LIB(k5crypto, krb5_encrypt_data) -+ AC_CHECK_LIB_EXT(com_err, KRB5_LIBS, _et_list) -+ AC_CHECK_LIB_EXT(k5crypto, KRB5_LIBS, krb5_encrypt_data) - - # Heimdal checks. -- AC_CHECK_LIB(crypto, des_set_key) -- AC_CHECK_LIB(asn1, copy_Authenticator) -- AC_CHECK_LIB(roken, roken_getaddrinfo_hostspec) -+ AC_CHECK_LIB_EXT(crypto, KRB5_LIBS, des_set_key) -+ AC_CHECK_LIB_EXT(asn1, KRB5_LIBS, copy_Authenticator) -+ AC_CHECK_LIB_EXT(roken, KRB5_LIBS, roken_getaddrinfo_hostspec) - - # Heimdal checks. On static Heimdal gssapi must be linked before krb5. -- AC_CHECK_LIB(gssapi, gss_display_status, [LIBS="$LIBS -lgssapi -lkrb5"; -+ AC_CHECK_LIB_EXT(gssapi, KRB5_LIBS, gss_display_status, [KRB5_LIBS="$KRB5_LIBS -lgssapi -lkrb5"; - AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available])]) - -- AC_CHECK_LIB(krb5, krb5_set_real_time, -- [AC_DEFINE(HAVE_KRB5_SET_REAL_TIME,1, -- [Whether krb5_set_real_time is available])]) -- AC_CHECK_LIB(krb5, krb5_set_default_in_tkt_etypes, -- [AC_DEFINE(HAVE_KRB5_SET_DEFAULT_IN_TKT_ETYPES,1, -- [Whether krb5_set_default_in_tkt_etypes, is available])]) -- AC_CHECK_LIB(krb5, krb5_set_default_tgs_ktypes, -- [AC_DEFINE(HAVE_KRB5_SET_DEFAULT_TGS_KTYPES,1, -- [Whether krb5_set_default_tgs_ktypes is available])]) -- -- AC_CHECK_LIB(krb5, krb5_principal2salt, -- [AC_DEFINE(HAVE_KRB5_PRINCIPAL2SALT,1, -- [Whether krb5_principal2salt is available])]) -- AC_CHECK_LIB(krb5, krb5_use_enctype, -- [AC_DEFINE(HAVE_KRB5_USE_ENCTYPE,1, -- [Whether krb5_use_enctype is available])]) -- AC_CHECK_LIB(krb5, krb5_string_to_key, -- [AC_DEFINE(HAVE_KRB5_STRING_TO_KEY,1, -- [Whether krb5_string_to_key is available])]) -- AC_CHECK_LIB(krb5, krb5_get_pw_salt, -- [AC_DEFINE(HAVE_KRB5_GET_PW_SALT,1, -- [Whether krb5_get_pw_salt is available])]) -- AC_CHECK_LIB(krb5, krb5_string_to_key_salt, -- [AC_DEFINE(HAVE_KRB5_STRING_TO_KEY_SALT,1, -- [Whether krb5_string_to_key_salt is available])]) -- AC_CHECK_LIB(krb5, krb5_auth_con_setkey, -- [AC_DEFINE(HAVE_KRB5_AUTH_CON_SETKEY,1, -- [Whether krb5_auth_con_setkey is available])]) -- AC_CHECK_LIB(krb5, krb5_auth_con_setuseruserkey, -- [AC_DEFINE(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY,1, -- [Whether krb5_auth_con_setuseruserkey is available])]) -- AC_CHECK_LIB(krb5, krb5_locate_kdc, -- [AC_DEFINE(HAVE_KRB5_LOCATE_KDC,1, -- [Whether krb5_locate_kdc is available])]) -- AC_CHECK_LIB(krb5, krb5_get_permitted_enctypes, -- [AC_DEFINE(HAVE_KRB5_GET_PERMITTED_ENCTYPES,1, -- [Whether krb5_get_permitted_enctypes is available])]) -- AC_CHECK_LIB(krb5, krb5_get_default_in_tkt_etypes, -- [AC_DEFINE(HAVE_KRB5_GET_DEFAULT_IN_TKT_ETYPES,1, -- [Whether krb5_get_default_in_tkt_etypes is available])]) -- AC_CHECK_LIB(krb5, krb5_free_ktypes, -- [AC_DEFINE(HAVE_KRB5_FREE_KTYPES,1, -- [Whether krb5_free_ktypes is available])]) -- AC_CHECK_LIB(krb5, krb5_principal_get_comp_string, -- [AC_DEFINE(HAVE_KRB5_PRINCIPAL_GET_COMP_STRING,1, -- [Whether krb5_principal_get_comp_string is available])]) -+ ######################################################## -+ # now see if we can find the krb5 libs in standard paths -+ # or as specified above -+ AC_CHECK_LIB_EXT(krb5, KRB5_LIBS, krb5_mk_req_extended) -+ -+ ######################################################## -+ # now see if we can find the gssapi libs in standard paths -+ AC_CHECK_LIB_EXT(gssapi_krb5, KRB5_LIBS,gss_display_status,[],[], -+ AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available])) -+ -+ AC_CHECK_FUNC_EXT(krb5_set_real_time, $KRB5_LIBS) -+ AC_CHECK_FUNC_EXT(krb5_set_default_in_tkt_etypes, $KRB5_LIBS) -+ AC_CHECK_FUNC_EXT(krb5_set_default_tgs_ktypes, $KRB5_LIBS) -+ AC_CHECK_FUNC_EXT(krb5_principal2salt, $KRB5_LIBS) -+ AC_CHECK_FUNC_EXT(krb5_use_enctype, $KRB5_LIBS) -+ AC_CHECK_FUNC_EXT(krb5_string_to_key, $KRB5_LIBS) -+ AC_CHECK_FUNC_EXT(krb5_get_pw_salt, $KRB5_LIBS) -+ AC_CHECK_FUNC_EXT(krb5_string_to_key_salt, $KRB5_LIBS) -+ AC_CHECK_FUNC_EXT(krb5_auth_con_setkey, $KRB5_LIBS) -+ AC_CHECK_FUNC_EXT(krb5_auth_con_setuseruserkey, $KRB5_LIBS) -+ AC_CHECK_FUNC_EXT(krb5_locate_kdc, $KRB5_LIBS) -+ AC_CHECK_FUNC_EXT(krb5_get_permitted_enctypes, $KRB5_LIBS) -+ AC_CHECK_FUNC_EXT(krb5_get_default_in_tkt_etypes, $KRB5_LIBS) -+ AC_CHECK_FUNC_EXT(krb5_free_ktypes, $KRB5_LIBS) -+ AC_CHECK_FUNC_EXT(krb5_principal_get_comp_string, $KRB5_LIBS) -+ -+ LIBS="$LIBS $KRB5_LIBS" -+ - AC_CACHE_CHECK([for the krb5_princ_component macro], - samba_cv_HAVE_KRB5_PRINC_COMPONENT,[ - AC_TRY_LINK([#include ], -@@ -2380,87 +2468,21 @@ - [Whether the ENCTYPE_ARCFOUR_HMAC_MD5 key type is available]) - fi - -- ######################################################## -- # now see if we can find the krb5 libs in standard paths -- # or as specified above -- AC_CHECK_LIB(krb5, krb5_mk_req_extended, [KRB5_LIBS="$LIBS -lkrb5"; -- KRB5_CFLAGS="$CFLAGS"; -- AC_DEFINE(HAVE_KRB5,1,[Whether KRB5 is available])]) -- -- ######################################################## -- # now see if we can find the gssapi libs in standard paths -- AC_CHECK_LIB(gssapi_krb5, gss_display_status, -- [KRB5_LIBS="$KRB5_LIBS -lgssapi_krb5"; -- AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available])]) -- -- CFLAGS="$ac_save_CFLAGS" -- LIBS="$ac_save_LIBS" --fi -- --######################################################## --# Compile with LDAP support? -- --LDAP_OBJ="" --with_ldap_support=yes --AC_MSG_CHECKING([whether to use LDAP]) -- --AC_ARG_WITH(ldap, --[ --with-ldap LDAP support (default yes)], --[ case "$withval" in -- no) -- with_ldap_support=no -- ;; -- esac ]) -- --AC_MSG_RESULT($with_ldap_support) -- --SMBLDAP="" --if test x"$with_ldap_support" = x"yes"; then -- ac_save_LIBS="$LIBS" -- LIBS="" -- -- ################################################################## -- # we might need the lber lib on some systems. To avoid link errors -- # this test must be before the libldap test -- AC_CHECK_LIB(lber, ber_scanf) -- -- ######################################################## -- # now see if we can find the ldap libs in standard paths -- if test x$have_ldap != xyes; then -- AC_CHECK_LIB(ldap, ldap_init, [ -- LIBS="$LIBS -lldap"; -- AC_CHECK_LIB(ldap, ldap_domain2hostlist, [ -- AC_DEFINE(HAVE_LDAP,1,[Whether ldap is available]) -- AC_CHECK_HEADERS([ldap.h lber.h], -- [default_static_modules="$default_static_modules pdb_ldap idmap_ldap"; -- SMBLDAP="lib/smbldap.o"]) -- ]) -- ]) -- -- ######################################################## -- # If we have LDAP, does it's rebind procedure take 2 or 3 arguments? -- # Check found in pam_ldap 145. -- AC_CHECK_FUNCS(ldap_set_rebind_proc) -- AC_CACHE_CHECK(whether ldap_set_rebind_proc takes 3 arguments, pam_ldap_cv_ldap_set_rebind_proc, [ -- AC_TRY_COMPILE([ -- #include -- #include ], [ldap_set_rebind_proc(0, 0, 0);], [pam_ldap_cv_ldap_set_rebind_proc=3], [pam_ldap_cv_ldap_set_rebind_proc=2]) ]) -- AC_DEFINE_UNQUOTED(LDAP_SET_REBIND_PROC_ARGS, $pam_ldap_cv_ldap_set_rebind_proc, [Number of arguments to ldap_set_rebind_proc]) -- AC_CHECK_FUNCS(ldap_initialize) -- fi -- -- AC_SUBST(SMBLDAP) -- LDAP_LIBS="$LIBS"; -- LIBS="$ac_save_LIBS"; --else -- # Can't have ADS support without LDAP -+ if test x"$ac_cv_lib_ext_krb5_krb5_mk_req_extended" = x"yes"; then -+ AC_DEFINE(HAVE_KRB5,1,[Whether to have KRB5 support]) -+ AC_DEFINE(WITH_ADS,1,[Whether to include Active Directory support]) -+ AC_MSG_CHECKING(whether Active Directory and krb5 support is used) -+ AC_MSG_RESULT(yes) -+ else - if test x"$with_ads_support" = x"yes"; then -- AC_MSG_ERROR(Active directory support requires LDAP) -+ AC_MSG_ERROR(libkrb5 is needed for Active Directory support) -+ else -+ AC_MSG_WARN(libkrb5 is needed for Active Directory support) - fi --fi -- --if test x"$with_ads_support" = x"yes"; then -- ADSLIBS="$LDAP_LIBS $KRB5_LIBS" -+ KRB5_LIBS="" -+ with_ads_support=no -+ fi -+ LIBS="$ac_save_LIBS" - fi - - ######################################################## diff --git a/packaging/Debian/debian/patches/pam_smbpass_linkage.patch b/packaging/Debian/debian/patches/pam_smbpass_linkage.patch deleted file mode 100644 index 022a3a0a282..00000000000 --- a/packaging/Debian/debian/patches/pam_smbpass_linkage.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -uNr samba-3.0.0beta2.orig/source/Makefile.in samba-3.0.0beta2/source/Makefile.in ---- samba-3.0.0beta2.orig/source/Makefile.in 2003-07-05 16:24:34.000000000 -0500 -+++ samba-3.0.0beta2/source/Makefile.in 2003-07-05 16:24:54.000000000 -0500 -@@ -579,8 +579,8 @@ - PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \ - pam_smbpass/pam_smb_acct.o pam_smbpass/support.o \ - libsmb/smbencrypt.o libsmb/smbdes.o libsmb/nterr.o \ -- $(PARAM_OBJ) $(LIB_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \ -- $(SECRETS_OBJ) $(UBIQX_OBJ) -+ $(LIBSAMBA_OBJ) $(PARAM_OBJ) $(LIB_OBJ) $(PASSDB_OBJ) \ -+ $(GROUPDB_OBJ) $(SECRETS_OBJ) $(UBIQX_OBJ) $(SMBLDAP_OBJ) - - PAM_SMBPASS_PICOOBJ = $(PAM_SMBPASS_OBJ_0:.o=.po) - -@@ -1076,7 +1076,8 @@ - - bin/pam_smbpass.@SHLIBEXT@: $(PAM_SMBPASS_PICOOBJ) - @echo "Linking shared library $@" -- @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(DYNEXP) $(LIBS) -lc -+ @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(DYNEXP) \ -+ $(PASSDBLIBS) $(LIBS) -lc - - bin/libmsrpc.a: $(LIBMSRPC_PICOBJ) - @-$(AR) -rc $@ $(LIBMSRPC_PICOBJ) diff --git a/packaging/Debian/debian/patches/smbadduser.patch b/packaging/Debian/debian/patches/smbadduser.patch deleted file mode 100644 index 36b74b3175a..00000000000 --- a/packaging/Debian/debian/patches/smbadduser.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -uNr samba-3.0alpha21.orig/source/smbadduser samba-3.0alpha21/source/smbadduser ---- samba-3.0alpha21.orig/source/smbadduser 2003-02-16 13:01:45.000000000 -0600 -+++ samba-3.0alpha21/source/smbadduser 2003-02-16 16:25:16.000000000 -0600 -@@ -2,13 +2,14 @@ - # - # smbadduser - Written by Mike Zakharoff - # -+# Customized for Debian by Eloy A. Paris -+# - unalias * --set path = ($path /usr/local/samba/bin) -+# No need to set a path in Debian -+#set path = ($path /usr/local/samba/bin) - --set smbpasswd = /usr/local/samba/private/smbpasswd --#set smbpasswd = /etc/samba/smbpasswd --set user_map = /usr/local/samba/lib/users.map --#set user_map = /etc/samba/smbusers -+set smbpasswd = /etc/samba/smbpasswd -+set user_map = /etc/samba/users.map - # - # Set to site specific passwd command - # diff --git a/packaging/Debian/debian/patches/smbclient-tar.patch b/packaging/Debian/debian/patches/smbclient-tar.patch deleted file mode 100644 index e6cdcafbf8c..00000000000 --- a/packaging/Debian/debian/patches/smbclient-tar.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -uNr samba-3.0.0beta2.orig/source/client/client.c samba-3.0.0beta2/source/client/client.c ---- samba-3.0.0beta2.orig/source/client/client.c 2003-07-01 22:36:24.000000000 -0500 -+++ samba-3.0.0beta2/source/client/client.c 2003-07-06 15:17:36.000000000 -0500 -@@ -2731,6 +2731,7 @@ - int opt; - pstring query_host; - BOOL message = False; -+ char* tar_args = NULL; - extern char tar_type; - pstring term_code; - static const char *new_name_resolve_order = NULL; -@@ -2816,7 +2817,7 @@ - max_protocol = interpret_protocol(poptGetOptArg(pc), max_protocol); - break; - case 'T': -- if (!tar_parseargs(argc, argv, poptGetOptArg(pc), optind)) { -+ if (!(tar_args = poptGetOptArg(pc))) { - poptPrintUsage(pc, stderr, 0); - exit(1); - } -@@ -2848,6 +2849,22 @@ - pstrcpy(cmdline_auth_info.password,poptGetArg(pc)); - } - -+ /* The tar command may take a number of string options; pass -+ everything we have left to tar_parseargs(). */ -+ if (tar_args) { -+ const char **argv2 = poptGetArgs(pc); -+ int argc2 = 0; -+ -+ if (argv2) { -+ while (argv2[argc2]) argc2++; -+ } -+ -+ if (!tar_parseargs(argc2, argv2, tar_args, 0)) { -+ poptPrintUsage(pc, stderr, 0); -+ exit(1); -+ } -+ } -+ - init_names(); - - if(new_name_resolve_order) diff --git a/packaging/Debian/debian/python2.2-samba.files b/packaging/Debian/debian/python2.2-samba.files deleted file mode 100644 index a24e2b98c80..00000000000 --- a/packaging/Debian/debian/python2.2-samba.files +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python2.2/site-packages/ diff --git a/packaging/Debian/debian/samba-common.conffiles b/packaging/Debian/debian/samba-common.conffiles deleted file mode 100644 index 4684ede3d1e..00000000000 --- a/packaging/Debian/debian/samba-common.conffiles +++ /dev/null @@ -1,3 +0,0 @@ -/etc/pam.d/samba -/etc/samba/gdbcommands -/etc/dhcp3/dhclient-enter-hooks.d/samba diff --git a/packaging/Debian/debian/samba.conffiles b/packaging/Debian/debian/samba.conffiles deleted file mode 100644 index 908a791a629..00000000000 --- a/packaging/Debian/debian/samba.conffiles +++ /dev/null @@ -1,3 +0,0 @@ -/etc/cron.daily/samba -/etc/init.d/samba -/etc/logrotate.d/samba diff --git a/packaging/Debian/debian/swat.docs b/packaging/Debian/debian/swat.docs deleted file mode 100644 index afbfcf0c612..00000000000 --- a/packaging/Debian/debian/swat.docs +++ /dev/null @@ -1 +0,0 @@ -swat/README diff --git a/packaging/Debian/debian/winbind.conffiles b/packaging/Debian/debian/winbind.conffiles deleted file mode 100644 index c9adbfff174..00000000000 --- a/packaging/Debian/debian/winbind.conffiles +++ /dev/null @@ -1,2 +0,0 @@ -/etc/init.d/winbind -/etc/logrotate.d/winbind diff --git a/packaging/Mandrake/samba-2.2.0-gawk.patch b/packaging/Mandrake/samba-2.2.0-gawk.patch deleted file mode 100644 index b77bc3a93cc..00000000000 --- a/packaging/Mandrake/samba-2.2.0-gawk.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- samba-2.2.0/source/script/convert_smbpasswd.gawk Thu Nov 5 04:50:17 1998 -+++ samba-2.2.0/source/script/convert_smbpasswd Thu Apr 19 08:43:44 2001 -@@ -7,7 +7,7 @@ - # with trying to work out how to get the seconds since 1970 - # in awk or the shell. JRA. - # --nawk 'BEGIN {FS=":"} -+gawk 'BEGIN {FS=":"} - { - if( $0 ~ "^#" ) { - print $0 diff --git a/packaging/Mandrake/samba-2.2.5-gp-reloc-fix.patch b/packaging/Mandrake/samba-2.2.5-gp-reloc-fix.patch deleted file mode 100644 index 8888d6622e5..00000000000 --- a/packaging/Mandrake/samba-2.2.5-gp-reloc-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur samba-2.2.5.orig/examples/VFS/Makefile.in samba-2.2.5/examples/VFS/Makefile.in ---- samba-2.2.5.orig/examples/VFS/Makefile.in 2002-06-17 20:35:09.000000000 +0200 -+++ samba-2.2.5/examples/VFS/Makefile.in 2002-06-30 16:43:15.000000000 +0200 -@@ -4,7 +4,7 @@ - - CC=@CC@ - LIBTOOL=@LIBTOOL@ --CFLAGS=@CFLAGS@ -+CFLAGS=@CFLAGS@ -DPIC -fPIC - LDFLAGS=@LDFLAGS@ - - VFS_OBJS=audit.so skel.so block/block.so recycle/recycle.so diff --git a/packaging/Mandrake/smbmount-sbin.patch b/packaging/Mandrake/smbmount-sbin.patch deleted file mode 100644 index b6387208134..00000000000 --- a/packaging/Mandrake/smbmount-sbin.patch +++ /dev/null @@ -1,15 +0,0 @@ -+++ samba-2.2.1/source/client/smbmount.c Sun Apr 15 01:03:46 2001 ---- samba-2.2.1/source/client/smbmount.c.seb Mon Jun 11 14:26:23 2001 -@@ -484,9 +484,9 @@ - } - - if (sys_fork() == 0) { -- if (file_exist(BINDIR "/smbmnt", NULL)) { -- execv(BINDIR "/smbmnt", args); -- fprintf(stderr,"execv of %s failed. Error was %s.", BINDIR "/smbmnt", strerror(errno)); -+ if (file_exist(SBINDIR "/smbmnt", NULL)) { -+ execv(SBINDIR "/smbmnt", args); -+ fprintf(stderr,"execv of %s failed. Error was %s.", SBINDIR "/smbmnt", strerror(errno)); - } else { - execvp("smbmnt", args); - fprintf(stderr,"execvp of smbmnt failed. Error was %s.", strerror(errno) ); diff --git a/packaging/Mandrake/swat_16.xpm.bz2 b/packaging/Mandrake/swat_16.xpm.bz2 deleted file mode 100644 index c17430c58900788b449d75410b53e1eac9d93783..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1003 zcmVUV(QHKAYPS_O7j;S;kl-q*|3Hr1PB1cVnS1J5x`gw zP{2801C|F4ne6SJp7hwBGIvNX;g<^H_6uMh2;iGsaa?a!8`q{1gJ>rkfQFFWa0ci{ zA|d4r(X|C;`pB$ANXpRWD+SHB6&e~EXbK_PhXWbRqmD*I4?&v=DG5!2AUOv)2#)GO z#0$F(Ols;hDLm#A!-FxnYXvyR5XSYL*CH>qNi+^k40u&2RvQh^6(Q|^=6gvsh~iWIwYWwGp)}Nt#T8u4%?+w zV-~f6ZpC%yHeVPc9Ag;ARhn(txo$IPN1K#Ta!$1uzb7f==1x_}j*L!%Xd`JVE0Vbm zQny33UlkfX^N{Aww!_P9)RSk~Ks#RUrmRN$knPN$ef*Cw6+z zd&NZx34o=3Sr9Yw=9KY|TGuv*~sWR?f?Q Zx+Y479j3wn0SNz#xgwk>NNcrNFn|D&yNUn+ diff --git a/packaging/Mandrake/swat_32.xpm.bz2 b/packaging/Mandrake/swat_32.xpm.bz2 deleted file mode 100644 index c8e4df6bff7329ce3eeeaf5f2b63992a0415326b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2727 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 diff --git a/packaging/README.UnixWare b/packaging/README.UnixWare deleted file mode 100644 index a4b08954ecc..00000000000 --- a/packaging/README.UnixWare +++ /dev/null @@ -1,6 +0,0 @@ -Date: January 9, 2001 -Maintainer: John H Terpstra -Subject: UnixWare Packaging Files -Modifications: Initial release 20010109 - -Note: The packaging build files for UnixWare are located under ~samba/packaging/Caldera/UnixWare. diff --git a/packaging/RedHat/samba2.spec.tmpl b/packaging/RedHat/samba2.spec.tmpl deleted file mode 100644 index 638df4f2cce..00000000000 --- a/packaging/RedHat/samba2.spec.tmpl +++ /dev/null @@ -1,429 +0,0 @@ -Summary: Samba SMB client and server -Name: samba -Version: PVERSION -Release: PRELEASE -Copyright: GNU GPL version 2 -Group: Networking -Source: http://download.samba.org/samba/ftp/samba-%{version}.tar.bz2 -Packager: Gerald Carter [Samba-Team] -Requires: pam >= 0.72 kernel >= 2.2.1 glibc >= 2.1.2 -Prereq: chkconfig fileutils -Provides: samba = %{version} -Obsoletes: samba-common, samba-client, samba-swat -BuildRoot: /var/tmp/samba -Prefix: /usr - -%description -Samba provides an SMB/CIFS server which can be used to provide -network file and print services to SMB/CIFS clients, including -various versions of MS Windows, OS/2, and other Linux machines. -Samba also provides some SMB clients, which complement the -built-in SMB filesystem in Linux. Samba uses NetBIOS over TCP/IP -(NetBT) protocols and does NOT need NetBEUI (Microsoft Raw NetBIOS -frame) protocol. - -Samba 3.0 also introduces UNICODE support and kerberos/ldap -integration as a member server in a Windows 2000 domain. - -Please refer to the WHATSNEW.txt document for fixup information. - -%changelog -* Mon Nov 18 2002 Gerald Carter - - removed change log entries since history - is being maintained in CVS - -%prep -%setup - -%build -## Build main Samba source -cd source - -%ifarch ia64 -libtoolize --copy --force # get it to recognize IA-64 -autoheader -autoconf -EXTRA="-D_LARGEFILE64_SOURCE" -%endif -NUMCPU=`grep processor /proc/cpuinfo | wc -l` -CFLAGS="$RPM_OPT_FLAGS $EXTRA" ./configure \ - --prefix=%{prefix} \ - --localstatedir=/var \ - --with-configdir=/etc/samba \ - --with-privatedir=/etc/samba \ - --with-fhs \ - --with-quotas \ - --with-smbmount \ - --with-pam \ - --with-pam_smbpass \ - --with-syslog \ - --with-utmp \ - --with-sambabook=%{prefix}/share/swat/using_samba \ - --with-swatdir=%{prefix}/share/swat \ - --with-libsmbclient -make -j${NUMCPU} proto -make -j${NUMCPU} all nsswitch/libnss_wins.so modules -make -j${NUMCPU} debug2html -make -j${NUMCPU} bin/smbspool - -# Remove some permission bits to avoid to many dependencies -find examples docs -type f | xargs -r chmod -x - -%install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/sbin -mkdir -p $RPM_BUILD_ROOT/etc/samba -mkdir -p $RPM_BUILD_ROOT/etc/{logrotate.d,pam.d,samba} -mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d -mkdir -p $RPM_BUILD_ROOT%{prefix}/{bin,sbin} -mkdir -p $RPM_BUILD_ROOT%{prefix}/share/swat/{images,help,include,using_samba} -mkdir -p $RPM_BUILD_ROOT%{prefix}/share/swat/using_samba/{figs,gifs} -mkdir -p $RPM_BUILD_ROOTMANDIR_MACRO -mkdir -p $RPM_BUILD_ROOT/var/cache/samba -mkdir -p $RPM_BUILD_ROOT/var/{log,run}/samba -mkdir -p $RPM_BUILD_ROOT/var/spool/samba -mkdir -p $RPM_BUILD_ROOT/lib/security -mkdir -p $RPM_BUILD_ROOT%{prefix}/lib/samba/vfs -mkdir -p $RPM_BUILD_ROOT%{prefix}/{lib,include} - -# Install standard binary files -for i in nmblookup smbclient smbpasswd smbstatus testparm testprns \ - rpcclient smbspool smbcacls smbcontrol wbinfo smbmnt net smbgroupedit \ - smbcacls pdbedit tdbbackup smbtree -do - install -m755 source/bin/$i $RPM_BUILD_ROOT%{prefix}/bin -done - -for i in mksmbpasswd.sh smbtar findsmb -do - install -m755 source/script/$i $RPM_BUILD_ROOT%{prefix}/bin -done - -# Install secure binary files -for i in smbd nmbd swat smbmount smbumount debug2html winbindd wrepld -do - install -m755 source/bin/$i $RPM_BUILD_ROOT%{prefix}/sbin -done - -# we need a symlink for mount to recognise the smb and smbfs filesystem types -ln -sf %{prefix}/sbin/smbmount $RPM_BUILD_ROOT/sbin/mount.smbfs -ln -sf %{prefix}/sbin/smbmount $RPM_BUILD_ROOT/sbin/mount.smb - -# This allows us to get away without duplicating code that -# sombody else can maintain for us. -cd source -make BASEDIR=$RPM_BUILD_ROOT/usr \ - CONFIGDIR=$RPM_BUILD_ROOT/etc/samba \ - LIBDIR=$RPM_BUILD_ROOT%{prefix}/lib/samba \ - VARDIR=$RPM_BUILD_ROOT/var \ - SBINDIR=$RPM_BUILD_ROOT%{prefix}/sbin \ - BINDIR=$RPM_BUILD_ROOT%{prefix}/bin \ - MANDIR=$RPM_BUILD_ROOTMANDIR_MACRO \ - SWATDIR=$RPM_BUILD_ROOT%{prefix}/share/swat \ - SAMBABOOK=$RPM_BUILD_ROOT%{prefix}/share/swat/using_samba \ - installman installswat installdat installmodules -cd .. - -# Install the nsswitch wins library -install -m755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/lib -( cd $RPM_BUILD_ROOT/lib; ln -sf libnss_wins.so libnss_wins.so.2; ) - -# Install winbind shared libraries -install -m755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/lib -( cd $RPM_BUILD_ROOT/lib; ln -sf libnss_winbind.so libnss_winbind.so.2; ) -install -m755 source/nsswitch/pam_winbind.so $RPM_BUILD_ROOT/lib/security - -# Install pam_smbpass.so -install -m755 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/lib/security - -# libsmbclient -install -m 755 source/bin/libsmbclient.so $RPM_BUILD_ROOT%{prefix}/lib/ -install -m 755 source/bin/libsmbclient.a $RPM_BUILD_ROOT%{prefix}/lib/ -install -m 644 source/include/libsmbclient.h $RPM_BUILD_ROOT%{prefix}/include/ - -# Install SWAT helper files -#for i in swat/help/*.html docs/htmldocs/*.html -#do -# install -m644 $i $RPM_BUILD_ROOT%{prefix}/share/swat/help -#done -#for i in swat/images/*.gif -#do -# install -m644 $i $RPM_BUILD_ROOT%{prefix}/share/swat/images -#done -#for i in swat/include/*.html -#do -# install -m644 $i $RPM_BUILD_ROOT%{prefix}/share/swat/include -#done - -# Install the miscellany -install -m755 packaging/RedHat/smbprint $RPM_BUILD_ROOT%{prefix}/bin -install -m755 packaging/RedHat/smb.init $RPM_BUILD_ROOT/etc/rc.d/init.d/smb -install -m755 packaging/RedHat/winbind.init $RPM_BUILD_ROOT/etc/rc.d/init.d/winbind -install -m755 packaging/RedHat/smb.init $RPM_BUILD_ROOT%{prefix}/sbin/samba -install -m644 packaging/RedHat/samba.log $RPM_BUILD_ROOT/etc/logrotate.d/samba -install -m644 packaging/RedHat/smb.conf $RPM_BUILD_ROOT/etc/samba/smb.conf -install -m644 packaging/RedHat/smbusers $RPM_BUILD_ROOT/etc/samba/smbusers -install -m644 packaging/RedHat/samba.pamd $RPM_BUILD_ROOT/etc/pam.d/samba -install -m644 packaging/RedHat/samba.pamd.stack $RPM_BUILD_ROOT/etc/samba/samba.stack -install -m644 packaging/RedHat/samba.xinetd $RPM_BUILD_ROOT/etc/samba/samba.xinetd -echo 127.0.0.1 localhost > $RPM_BUILD_ROOT/etc/samba/lmhosts - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -/sbin/chkconfig --add smb -/sbin/chkconfig --add winbind -/sbin/chkconfig smb off -/sbin/chkconfig winbind off - -echo "Looking for old /etc/smb.conf..." -if [ -f /etc/smb.conf -a ! -f /etc/samba/smb.conf ]; then - echo "Moving old /etc/smb.conf to /etc/samba/smb.conf" - mv /etc/smb.conf /etc/samba/smb.conf -fi - -echo "Looking for old /etc/smbusers..." -if [ -f /etc/smbusers -a ! -f /etc/samba/smbusers ]; then - echo "Moving old /etc/smbusers to /etc/samba/smbusers" - mv /etc/smbusers /etc/samba/smbusers -fi - -echo "Looking for old /etc/lmhosts..." -if [ -f /etc/lmhosts -a ! -f /etc/samba/lmhosts ]; then - echo "Moving old /etc/lmhosts to /etc/samba/lmhosts" - mv /etc/lmhosts /etc/samba/lmhosts -fi - -echo "Looking for old /etc/MACHINE.SID..." -if [ -f /etc/MACHINE.SID -a ! -f /etc/samba/MACHINE.SID ]; then - echo "Moving old /etc/MACHINE.SID to /etc/samba/MACHINE.SID" - mv /etc/MACHINE.SID /etc/samba/MACHINE.SID -fi - -echo "Looking for old /etc/smbpasswd..." -if [ -f /etc/smbpasswd -a ! -f /etc/samba/smbpasswd ]; then - echo "Moving old /etc/smbpasswd to /etc/samba/smbpasswd" - mv /etc/smbpasswd /etc/samba/smbpasswd -fi - -# -# For 2.2.1 we move the tdb files from /var/lock/samba to /var/cache/samba -# to preserve across reboots. -# -echo "Moving tdb files in /var/lock/samba/*.tdb to /var/cache/samba/*.tdb" -for i in /var/lock/samba/*.tdb -do -if [ -f $i ]; then - newname=`echo $i | sed -e's|var\/lock\/samba|var\/cache\/samba|'` - echo "Moving $i to $newname" - mv $i $newname -fi -done - -# Remove the transient tdb files. -if [ -e /var/cache/samba/brlock.tdb ]; then - rm -f /var/cache/samba/brlock.tdb -fi - -if [ -e /var/cache/samba/unexpected.tdb ]; then - rm -f /var/cache/samba/unexpected.tdb -fi - -if [ -e /var/cache/samba/connections.tdb ]; then - rm -f /var/cache/samba/connections.tdb -fi - -if [ -e /var/cache/samba/locking.tdb ]; then - rm -f /var/cache/samba/locking.tdb -fi - -if [ -e /var/cache/samba/messages.tdb ]; then - rm -f /var/cache/samba/messages.tdb -fi - -if [ -d /var/lock/samba ]; then - rm -rf /var/lock/samba -fi - -# Add swat entry to /etc/services if not already there. -if !( grep ^[:space:]*swat /etc/services > /dev/null ) then - echo 'swat 901/tcp # Add swat service used via inetd' >> /etc/services -fi - -# Add swat entry to /etc/inetd.conf if needed. -if [ -f /etc/inetd.conf ]; then - if !( grep ^[:space:]*swat /etc/inetd.conf > /dev/null ) then - echo 'swat stream tcp nowait.400 root %{prefix}/sbin/swat swat' >> /etc/inetd.conf - killall -1 inetd || : - fi -fi - -# Add swat entry to xinetd.d if needed. -if [ -d $RPM_BUILD_ROOT/etc/xinetd.d -a ! -f /etc/xinetd.d/swat ]; then - mv /etc/samba/samba.xinetd /etc/xinetd.d/swat -else - rm -f /etc/samba/samba.xinetd -fi - -# Install the correct version of the samba pam file, depending on pam version. -if [ -f /lib/security/pam_stack.so ]; then - echo "Installing stack version of /etc/pam.d/samba..." - mv /etc/samba/samba.stack /etc/pam.d/samba -else - echo "Installing non-stack version of /etc/pam.d/samba..." - rm -f /etc/samba/samba.stack -fi - -# Create winbind nss client symlink - -if [ -e /lib/libnss_winbind.so ]; then - ln -sf /lib/libnss_winbind.so /lib/libnss_winbind.so.2 -fi - -%preun -if [ $1 = 0 ] ; then - /sbin/chkconfig --del smb - - # We want to remove the browse.dat and wins.dat files so they can not interfer with a new version of samba! - if [ -e /var/cache/samba/browse.dat ]; then - rm -f /var/cache/samba/browse.dat - fi - if [ -e /var/cache/samba/wins.dat ]; then - rm -f /var/cache/samba/wins.dat - fi - - # Remove the transient tdb files. - if [ -e /var/cache/samba/brlock.tdb ]; then - rm -f /var/cache/samba/brlock.tdb - fi - - if [ -e /var/cache/samba/unexpected.tdb ]; then - rm -f /var/cache/samba/unexpected.tdb - fi - - if [ -e /var/cache/samba/connections.tdb ]; then - rm -f /var/cache/samba/connections.tdb - fi - - if [ -e /var/cache/samba/locking.tdb ]; then - rm -f /var/cache/samba/locking.tdb - fi - - if [ -e /var/cache/samba/messages.tdb ]; then - rm -f /var/cache/samba/messages.tdb - fi - - # Remove winbind nss client symlink - - if [ -L /lib/libnss_winbind.so.2 ]; then - rm -f /lib/libnss_winbind.so.2 - fi -fi - -%postun -# Only delete remnants of samba if this is the final deletion. -if [ $1 = 0 ] ; then - if [ -x /etc/pam.d/samba ]; then - rm -f /etc/pam.d/samba - fi - if [ -e /var/log/samba ]; then - rm -rf /var/log/samba - fi - if [ -e /var/cache/samba ]; then - rm -rf /var/cache/samba - fi - - # Remove swat entries from /etc/inetd.conf and /etc/services - cd /etc - tmpfile=/etc/tmp.$$ - if [ -f /etc/inetd.conf ]; then - # preserve inetd.conf permissions. - cp -p /etc/inetd.conf $tmpfile - sed -e '/^[:space:]*swat.*$/d' /etc/inetd.conf > $tmpfile - mv $tmpfile inetd.conf - fi - # preserve services permissions. - cp -p /etc/services $tmpfile - sed -e '/^[:space:]*swat.*$/d' /etc/services > $tmpfile - mv $tmpfile /etc/services - - # Remove swat entry from /etc/xinetd.d - if [ -f /etc/xinetd.d/swat ]; then - rm -r /etc/xinetd.d/swat - fi -fi - -%files -%defattr(-,root,root) -%doc README COPYING Manifest Read-Manifest-Now -%doc WHATSNEW.txt Roadmap -%doc docs -%doc swat/README -%doc examples -%{prefix}/sbin/smbd -%{prefix}/sbin/nmbd -%{prefix}/sbin/swat -%{prefix}/bin/smbmnt -%{prefix}/sbin/smbmount -%{prefix}/sbin/smbumount -%{prefix}/sbin/winbindd -%{prefix}/sbin/wrepld -%{prefix}/sbin/samba -%{prefix}/sbin/debug2html -/sbin/mount.smbfs -/sbin/mount.smb -%{prefix}/bin/mksmbpasswd.sh -%{prefix}/bin/smbclient -%{prefix}/bin/smbspool -%{prefix}/bin/rpcclient -%{prefix}/bin/testparm -%{prefix}/bin/testprns -%{prefix}/bin/findsmb -%{prefix}/bin/smbstatus -%{prefix}/bin/nmblookup -%{prefix}/bin/smbpasswd -%{prefix}/bin/smbtar -%{prefix}/bin/smbprint -%{prefix}/bin/smbcontrol -%{prefix}/bin/wbinfo -%{prefix}/bin/net -%{prefix}/bin/smbgroupedit -%{prefix}/bin/smbcacls -%{prefix}/bin/pdbedit -%{prefix}/bin/tdbbackup -%{prefix}/bin/smbtree -%attr(755,root,root) /lib/libnss_wins.s* -%attr(755,root,root) %{prefix}/lib/samba/vfs/*.so -%attr(755,root,root) %{prefix}/lib/samba/*.dat -%{prefix}/include/libsmbclient.h -%{prefix}/lib/libsmbclient.a -%{prefix}/lib/libsmbclient.so -%{prefix}/share/swat/help/* -%{prefix}/share/swat/images/* -%{prefix}/share/swat/include/*.html -%{prefix}/share/swat/lang/*/help/* -%{prefix}/share/swat/lang/*/images/* -%{prefix}/share/swat/lang/*/include/*.html -%{prefix}/share/swat/using_samba/* -%config(noreplace) /etc/samba/lmhosts -%config(noreplace) /etc/samba/smb.conf -%config(noreplace) /etc/samba/smbusers -/etc/samba/samba.stack -/etc/samba/samba.xinetd -/etc/rc.d/init.d/smb -/etc/rc.d/init.d/winbind -/etc/logrotate.d/samba -%config(noreplace) /etc/pam.d/samba -MANDIR_MACRO/man1/* -MANDIR_MACRO/man5/* -MANDIR_MACRO/man7/* -MANDIR_MACRO/man8/* -%attr(755,root,root) %dir /var/cache/samba -%dir /var/log/samba -%dir /var/run/samba -%attr(1777,root,root) %dir /var/spool/samba -%attr(-,root,root) /lib/libnss_winbind.so -%attr(-,root,root) /lib/security/pam_winbind.so -%attr(-,root,root) /lib/security/pam_smbpass.so diff --git a/packaging/SGI/relnotes.html b/packaging/SGI/relnotes.html index d055be6c1a3..afcf5796776 100644 --- a/packaging/SGI/relnotes.html +++ b/packaging/SGI/relnotes.html @@ -205,8 +205,17 @@ printer name to describe its location. of the docs directory from the Samba distribution; consult samba(7) for an introduction.

-

There is a mailing list for discussion of Samba. To subscribe and - for more information go to lists.samba.org. +

There is a mailing list for discussion of Samba. To subscribe send mail +to listproc@samba.org +with a body of "subscribe samba Your Name"

+ +

To send mail to everyone on the list mail to samba@samba.org. +

+ +

There is also an announcement mailing list where new versions are announced. +To subscribe send mail to listproc@samba.org +with a body of "subscribe samba-announce Your Name". All announcements +also go to the samba list.

You might also like to look at the Usenet news group comp.protocols.smb as it often contains lots of useful info and is frequented by lots of Samba @@ -214,10 +223,10 @@ users. The newsgroup was initially setup by people on the Samba mailing list. It is not, however, exclusive to Samba, it is a forum for discussing the SMB protocol (which Samba implements).

-

- A Samba WWW site has been setup with lots of useful info. Connect to: - http://samba.org/. You can - contact the webmaster at "webmaster at samba dot org". +

A Samba WWW site has been setup with lots of useful info. Connect to: +http://samba.org/pub/samba/. +It is maintained by Paul Blackman (thanks Paul!). You can contact him at +ictinus@lake.canberra.edu.au.

diff --git a/packaging/Solaris/makepkg.sh b/packaging/Solaris/makepkg.sh deleted file mode 100755 index bd370e9a624..00000000000 --- a/packaging/Solaris/makepkg.sh +++ /dev/null @@ -1,154 +0,0 @@ -#!/bin/sh -# -# Copyright (C) Shirish A Kalele 2000 -# -# Builds a Samba package from the samba distribution. -# By default, the package will be built to install samba in /usr/local -# Change the INSTALL_BASE variable to change this: will modify the pkginfo -# and samba.server files to point to the new INSTALL_BASE -# -INSTALL_BASE=/usr/local - -add_dynamic_entries() -{ - # Add the binaries, docs and SWAT files - - echo "#\n# Binaries \n#" - cd $DISTR_BASE/source/bin - for binfile in * - do - if [ -f $binfile ]; then - echo f none samba/bin/$binfile=source/bin/$binfile 0755 root other - fi - done - - # Add the scripts to bin/ - echo "#\n# Scripts \n#" - cd $DISTR_BASE/source/script - for shfile in * - do - if [ -f $shfile ]; then - echo f none samba/bin/$shfile=source/script/$shfile 0755 root other - fi - done - - # Add the manpages - echo "#\n# man pages \n#" - echo d none /usr ? ? ? - echo d none /usr/share ? ? ? - echo d none /usr/share/man ? ? ? - - # Create directories for man page sections if nonexistent - cd $DISTR_BASE/docs/manpages - for i in 1 2 3 4 5 6 7 8 9 - do - manpages=`ls *.$i 2>/dev/null` - if [ $? -eq 0 ] - then - echo d none /usr/share/man/man$i ? ? ? - for manpage in $manpages - do - echo f none /usr/share/man/man${i}/${manpage}=docs/manpages/$manpage 0644 root other - done - fi - done - - echo "#\n# HTML documentation \n#" - cd $DISTR_BASE - list=`find docs/htmldocs -type d | grep -v "/CVS$"` - for docdir in $list - do - if [ -d $docdir ]; then - echo d none samba/$docdir 0755 root other - fi - done - - list=`find docs/htmldocs -type f | grep -v /CVS/` - for htmldoc in $list - do - if [ -f $htmldoc ]; then - echo f none samba/$htmldoc=$htmldoc 0644 root other - fi - done - - # Create a symbolic link to the Samba book in docs/ for beginners - echo 's none samba/docs/samba_book=htmldocs/using_samba' - - echo "#\n# Text Docs \n#" - echo d none samba/docs/textdocs 0755 root other - cd $DISTR_BASE/docs/textdocs - for textdoc in * - do - if [ -f $textdoc ]; then - echo f none samba/docs/textdocs/$textdoc=docs/textdocs/$textdoc 0644 root other - fi - done - echo "#\n# SWAT \n#" - cd $DISTR_BASE - list=`find swat -type d | grep -v "/CVS$"` - for i in $list - do - echo "d none samba/$i 0755 root other" - done - list=`find swat -type f | grep -v /CVS/` - for i in $list - do - echo "f none samba/$i=$i 0644 root other" - done - echo "#\n# HTML documentation for SWAT\n#" - cd $DISTR_BASE/docs/htmldocs - for htmldoc in * - do - if [ -f $htmldoc ]; then - echo f none samba/swat/help/$htmldoc=docs/htmldocs/$htmldoc 0644 root other - fi - done - - echo "#\n# Using Samba Book files for SWAT\n#" - cd $DISTR_BASE/docs/htmldocs - -# set up a symbolic link instead of duplicating the book tree - echo 's none samba/swat/using_samba=../docs/htmldocs/using_samba' - -} - -if [ $# = 0 ] -then - # Try to guess the distribution base.. - CURR_DIR=`pwd` - DISTR_BASE=`echo $CURR_DIR | sed 's|\(.*\)/packaging.*|\1|'` - echo "Assuming Samba distribution is rooted at $DISTR_BASE.." -else - DISTR_BASE=$1 -fi - -# -if [ ! -d $DISTR_BASE ]; then - echo "Source build directory $DISTR_BASE does not exist." - exit 1 -fi - -# Set up the prototype file from prototype.master -if [ -f prototype ]; then - rm prototype -fi - -# Setup version from version.h -VERSION=`sed 's/#define VERSION \"\(.*\)\"$/\1/' ../../source/include/version.h` -sed -e "s|__VERSION__|$VERSION|" -e "s|__ARCH__|`uname -p`|" -e "s|__BASEDIR__|$INSTALL_BASE|g" pkginfo.master >pkginfo - -sed -e "s|__BASEDIR__|$INSTALL_BASE|g" inetd.conf.master >inetd.conf -sed -e "s|__BASEDIR__|$INSTALL_BASE|g" samba.server.master >samba.server - -cp prototype.master prototype - -# Add the dynamic part to the prototype file -(add_dynamic_entries >> prototype) - -# Create the package -pkgmk -o -d /tmp -b $DISTR_BASE -f prototype -if [ $? = 0 ] -then - pkgtrans /tmp samba.pkg samba -fi -echo The samba package is in /tmp diff --git a/swat/README b/swat/README deleted file mode 100644 index 588ecef769a..00000000000 --- a/swat/README +++ /dev/null @@ -1,77 +0,0 @@ -This is a brief description of how to install and use the Samba Web -Administration Tool on your machine. - -Installation ------------- - -After you compile SWAT you need to run "make install" to install the -swat binary and the various help files and images. A default install -would put these in: - -/usr/local/samba/bin/swat -/usr/local/samba/swat/images/* -/usr/local/samba/swat/help/* - -Running via inetd ------------------ - -You then need to edit your /etc/inetd.conf and /etc/services to enable -SWAT to be launched via inetd. - -In /etc/services you need to add a line like this: - -swat 901/tcp - -the choice of port number isn't really important except that it should -be less than 1024 and not currently used (using a number above 1024 -presents an obscure security hole depending on the implementation -details of your inetd daemon). - -In /etc/inetd.conf you should add a line like this: - -swat stream tcp nowait.400 root /usr/local/samba/bin/swat swat - -One you have edited /etc/services and /etc/inetd.conf you need to send -a HUP signal to inetd. On many systems "killall -1 inetd" will do this -on others you will need to use "kill -1 PID" where PID is the process -ID of the inetd daemon. - - - -Launching ---------- - -To launch SWAT just run your favourite web browser and point it at -http://localhost:901/ - -Note that you can attach to SWAT from any IP connected machine but -connecting from a remote machine leaves your connection open to -password sniffing as passwords will be sent in the clear over the -wire. - -You should be prompted for a username/password when you connect. You -will need to provide the username "root" and the correct root -password. - -Running -------- - -Just follow your nose! If you can't work out how to use it then maybe -you should use "vi smb.conf" instead. - - -WARNINGS --------- - -SWAT will rewrite your smb.conf file. It will rearrange the entries -and delete all comments, include= and copy= options. If you have a -carefully crafted smb.conf then back it up or don't use SWAT! - - -Development ------------ - -Please join the samba-technical mailing list if you want to discuss -the development of SWAT. Note that this list is for technical developer -discussions and is not a general help list. - diff --git a/swat/help/welcome.html b/swat/help/welcome.html index b3e9a81766e..8fc54ad5f29 100644 --- a/swat/help/welcome.html +++ b/swat/help/welcome.html @@ -22,9 +22,9 @@ Please choose a configuration action using one of the above buttons
  • smbcontrol - send control messages to Samba daemons
  • smbpasswd - managing SMB passwords
  • SWAT - web configuration tool -
  • make_smbcodepage - codepage creation -
  • make_unicodemap - unicode map file creation -
  • smbrun - internal smbd utility +
  • net - tool for administration of Samba and remote CIFS servers +
  • pdbedit - Samba user account management tool +
  • tdbbackup - Tool for backing up TDB databases
  • Client Tools
      @@ -35,6 +35,11 @@ Please choose a configuration action using one of the above buttons
    • smbmount - user space tool for mounting SMB filesystems under Linux
    • smbspool - command line SMB print client
    • smbumount - user space tool for umounting SMB filesystems under Linux +
    • ntlm_auth - allow external programs to use NTLM authentication +
    • smbcquotas - get or set quotas on NTFS 5 shares +
    • smbsh - Allow access to remote SMB shares using a UNIX shell +
    • smbtree - Text-based SMB network browsing +
    • smbspool - Send a print job to an SMB printer
  • Diagnostic Utilities
      @@ -42,10 +47,17 @@ Please choose a configuration action using one of the above buttons
    • testparm - validating your config file
    • testprns - testing printer configuration
    • nmblookup - NetBIOS name query tool +
    • wbinfo - Tool for getting winbind information +
    +
  • Misc. Utilities +
      +
    • profiles - migrating profiles from one domain to another +
    • editreg - editing windows registry files +
    • log2pcap - generate pcap files from samba log files
  • Books diff --git a/swat/images/globals.gif b/swat/images/globals.gif index 75e874f380ce7d7f1f77209ee79592401ad813c2..7a9a8510d777ad167c0a307f821c5ff7a82a1d04 100644 GIT binary patch literal 2004 zcmd7P`#;kQ1Hkd`>}s=(ndQjDbeN*#77fj%B!{SnQqs)*zLRS?YKED)oDnt0rHv7# zR7yf@l$A@=Ipk7I3rp^j^g8Kz`Y)dMKk)hCqz5U@#a8g~H)*YHDhDJYH2*RYOAqgTd(Q>swe@P$-mx2M zIy*aMGTGA7(&FOc%F4>x+S-pFKXiCM%=*nguwy zvl9x1F)=YlMn?Zj{9n=A!ng+n1?wh-$A{^bMHY@b4y#} z!$*%>pF9;yyE?i%+n-6E=%93*A?XODsv1rmFT-o#33BzxDfu*hcIy3y8HH?aW%2X; z>e8nL!^4MMpd8I3z?2eOMav>eCJvZlqlpK0`i|Xs)Hi2x(0DB}ofZJj)+lny(J{FQRmR{ojp@|1E(Ado*qh%^ zheW`0buW-XC@_5{t}U$v@&|8Xv8xBv~yT%=M8P(bN>c0b%JO;88kP||7aEl^{?*to{{2qfFWU=D#tcQ30jrzU z1x?jHXCp@vl=b<11H=tpdvVf){@lIU2_bh^tznJv`P0*vzJGUdV6qEmYS=Nu-vZ-! z_L_Pib)V5xuHx1!HoK&2aE1gjtVuRw_q`CT5C7&= z{_deQK~OayU!eF0PGb@m3+E~p5`)(0b<;}G}yLU`Y&e(lHaY##Nj-OBDT1*0uYzt{u`2E>|*S_-U1A-vVz5{Pk3 ze$bFVL`#p`PiA*DTYebS#*Eoqb3*6zi~T0{lH*vaLD%5?6T=4e(n(c=sl+c1h42 zDZhCr(v1M2e!3Le+5NR49k>fp0M_>Egh5z~{2iJhqo@|bX*XYOmujYqb=rY6@!BK` zAXC>t0_H-X=k0GNZ@+Q(V&`s_mg~;&$EWwCz>40Z+FaU}*9V!$K2K~*09w|kJ-BaB zbd7Vg<~(%Ng-3xqFqH~}`OW-PNt}m5vzDm4=uu#9y)&+?RQ4EKI^$9?RZwS z7+)47+@^<+c(PUFjf46=P`w{FosF?A8TTD%UhkQI8gmlG6JwHP#gApxd)hzb_$yvt zYeoFMC*=joEc*gMW0?lWiC?*0l%?+wF^zsbf>i$F_?0N7%u@a35HGQjM>+3A>FmED z$F2@S3{M>b;K_h0OE*I=OqYbMJK}_69m@*KxK4a-c*qLyOxs$k0Ikp3t3?cECeq-$ zK%HQWDnPOpAndFiD7$EBNg07vM55HCL*n%(3oJ5tmSycYhbiKI7OB%5u@wvmNks{V zO=c<+1OU8`1;R3zdz0t>_JbtU+I|1%73uJwYGiSptL5B@1T_be;4>qL-r l0etmWh>`6+t_SBmUT6wE^@2Nm_o{{(hzclasUZN$e*v?@+BX0I delta 605 zcmV-j0;2uY5A*~yM@dFFIbl!$Kmg+a000009+3Ys%`(!ojQ{`t$H&K2RaN8T<8pFx zs;a6T9UVD2IgXBwlY{{!e+2%J$VsccIP1;3|6nMNWNDsgs;+G7zHlthbZy@_2<$wN zx4Zx#AP@?7ztgU06gY_iA~GogJe|cSG3)eEKUOR@%oBINov?T)jcNsCv_`#-8l&tc zT#lhX^Fv~GaeNhiMR`JIi+hC=WMw@|j9EgCkBD}6Zj@SHj)8ERe~E{SmY{B=qg#}C zmw8;9vWKpqJ!_JZW<9TVjDxF!wS}<1v#f!q#Dm79YfPWZdRV~BV~Cd$x?{OzUA)Q?%^oFV$pNr(0WhVDFsuZXX$c(g`{AkA32y5FV7nE`f71k9t=`ld`4IrZ2*w&9 z48ko|r&BEZ^(@JN*31m<0^o_aC(|CBI~Y!hw(hwdj0te{@i+logbWhY{(9L$0R}VU zRxwKeu!QpTOQvw!?rL3cD-n`kJ>AuBli`P~!&n=!? zSz7~k1jHr8rC&(r=kRj`Il02z?A&Z4BO@m#C&_I|b6d0KiRMY~lkT4G&hAdU37+Y} z%;07`Qau`aGc=>0nVy~2&FSTb2RK1Xlk8!NQ1~-a{vfmT7{J zZa$-;szR+%ztO(gyKgUvOgeG$gd4*x?^53RjPtF^R%d7Dgro$qL~KK~2?`EMJdp^4 z!KgH4t2axEZWRA~{aV@1od5*JgCmeA6dHrZ8lllBZ2g0V zrj|Cv!^Y;;N1dv!j$a?Em74ZPmMF`ekSsV7XN)%?X#YoOHeoV0J~2s{9)J68YDTMD zoLka=oS*$b4G!7`y+#ZG#z8q~3+Du_iZh;rAv3KHzLu}`6CzhJ+ZcOpYXsztUXao~ z*4r_(B5UuDeq6xFiq3_vjpD=cuG>X4j$*3!rbpUPXZYqSc)8!%kDg4zOsH&Eb`Do6 z6Tm>=pqs1$9}UvXUfIH~mqP!z#|gh=pJrAQc7NsA0ZIDP{dGS*OdhU0wEFLOf~{{Q zJ>Y>vorAZJq($~L)lYPZ*6kG6G-V4g1PfXen*$b_7WrPZv_A($U zQ8@44t1^zqmJ8#@l*;s^fz@_ZuKirKp|S8t@}(B0;(c3H zJe))h(Xy;jL6S_kWU^9%2ApR`(kN%>nV?)6-5W-{dtjJncdGmC#Z64O)X>C^D>zGD zQ?e!z=+RE_ynbi-ihNdx;?#AqDMZpijeFHzNda6$r8WgI;$|CkUp{sGL_5ZfT86s*pXnmsyPr7; z&kzA`fS1iScS?Zd*y%Dq>8f|)fWnx_`1e8t7;tTZPgGYO`)r9=>^(4+{`o^dT=mu8 z*t4}wQ*q!s-=Pe4CV|9wAG>ibt_IU>^Nap|s{_-5j}MLIUs3>1c5i>5>$TCX{bmh0Vr}I(?nTk$ksM(S%$#)$h=-@Y~M$x)G4P zPUYrV@~+U3kP=oSTe0`t*udyVu^!LqwDqm%F;T~b;-d}WF}J2{7BqAB1@Z9<5cZVLM=7=WZB78%`VJCXHWj6 zKRu}MudR9Q(-*Y#0-L5=U-kZS$|v>XyhPu@Q^lB%YX6@N%gBumP2Q-ylH?tS#ns(E{k>`Iu#o43SecMH;^Nqxl+X~I=AFVUuD=8 zk0>EEboH<bk?VjNd8!u}2IT{*jCC6);+8Z; z=J#clKL?%lu}9VmNPbd$qrlHO0 zJ}A#B)@vOLs(Z|1=~t~Fw?@M>ZeNJ~=MW=fATrFIdvx!Ge*7DdH621pJ?fBJjbeV5 znzt-XI_Mufjr>U2{crI$s2`CBNmweR5Xa%R>_9}J52$=FTEcRif#V_w*-rbY*!8h~ zCPOB+A-9nGja3GgT)s7p1Gf-#`)+tH;tK}XS~wnu`3DwYs){OXG4BKSM1+>AA5@Zw zyg<^@Z7L4%rF>` z_$Y`_$b>lf`1k+-00000EC2ui08jux000F35XecZy*TU5yZ>M)j$~<`XsWJk>%MR- z&-4}Cc&_6$x#xm_ASfj2dY>O|D7+b+JLE>Wq*|pIYg4Pl+Ngst_viio286-*ShncG z@HBirC$}r_f z0iB)!VU(4NqKSW+Y^aiHp`w78eWs`Yh6r+W!o!cWk_fuxYNw`Qcg8eu5z{sQ~c?wSWHY|X?2YOu~>~?U*35XR-o=my2 z<;$2eYu?OxLxT-)I)|1p8o;m#rA>!HO$SNo(XUsl9zY@X9M`gElcrsp_wCudRhJni zJNNG0#99BYLELxn7q^bRhi&A_p>JnBe7gD8&?Piza6a{n@5+rE SPfxwG{rmXy>)&4^0suSIKOxcp diff --git a/swat/images/passwd.gif b/swat/images/passwd.gif index 2fc88fb182ee106d4e8576179a9bb931a65d737a..17393a140203ff50e9dbe544314096d7320cfd48 100644 GIT binary patch literal 1993 zcmc(f`#;kQ1INF+&u(tBO>Ud}6vt&|(Dl3V3DNS!qmCf5jYytbBHH{>L_%!u4x zYDqKKGouL+ol_ANrs-6oLpSI3c%IYwC!Y5Y?_WPZykD=+eqSHP?vp_P6Ho%*0f9ge z2m}s?BauiH3I&6~G&D58U@#hu#$YfyIy!hfURzsRPft%vOACj?nVXwCI5@bwyL)+g zd3bm*nM_YlPd`7uxVX5B7cUkR6y)dU=jG)U78W892pWwRA0OY?*r-q_CMPGy#>O5! zdNe*hzI*p>9*;LTIH*#o*4EZOe*F01!-tKHjsJcJXl-pB85uD$G71R^Nls1{3Wd75 zx^lUEX=%yD#ihBqxxc^P+S>Z?;ll|D34A_ZUtizG#)iRQxVgDOp-=*Wz~yoi6BGUY z{Tmt@78e%>1_p9+a_Drrv$Jz>a4?lhb#-+mkx2i{{Xa$7#`&K-b()+OlM+qd@9Q4~ z?E2p1dmR9=%>_VU2mpnGVQ@GM3`GElyn-TO$(8&{7b zBt!#+#$a)1EJhQ9)53I0Wj%cZ_qw`!`+rp`M(+hM}E!M+kiR>YvZ6>`vv}60saWU+# z^7e?XSk+_*y301y(w~OUATMwsXyZdN?x5_BYNW)>Pjsl;F_LJ>2u%#)0+3kZmbhRI{8M8gbUpJ!H)$)ae3 z)Tbw#jM5JKkix|K%hOI=co#NhoL6ASS<1O8=MnRbV%{+vqOdN&Vi?k7Q zg>R!STZ%`3T;q;!)orq^Z>ZN1 z(h@J}oVBk%0-3RI&}yqr{rOJ(`8!Rv4_MOK;tBE)s<`F_{dv)-JtUHI7t5a)wAk_^ zFZ3FHnLTIr)q&sAVQ-2(Kg5Ip&NQiFX=+;XMK$d!GRGD@0pu?o?L`@{&&S%CsyCmq z9NVdx*)9Nms=rNr?hyc}B|~J_RX~D0u5vkx<70t&U`W*v`?5lv+4izmcc=8Lqombp z_Ul^FU$}j%(ltT<^S0X)dr;fY3}oPU83>c?$bKu&{-wap=#35&F!$nYCA!uerQ#=K zE<4Z5rSI>)GnrFH@h4LQk`|oAiXBbeI~YN!)4xTWX@yy6UOMxy_G2~cw5Tq}u ztOnu5a8-)sJi%P`H$2G(?syAsZC|@7L;wkK)QFCJW30Ein{1H$v&SKmPeEii{BUAC zbk{3*DSjWby%-+E2(Ns)3^u|AW=EBoVA!&*^$BiaZJ|+0=Z|}pKteLj+W1P5%a93J zu3;%7it5jJQ?lb>PF%y3@N4_EPp=2I9sB94DY3^{eJdrz>G#1t{JPK)|fG1`e20K6cd-SKpdDk{X^3heLURXcDfxoVN z>4u_L$sq=;(`1eHK~1g}v><(%f(<+1V+jt#J#e!4)VJd5suh^_xUBZ`<_i2z{Zg_y z1$8(G0DFi53WkUD7IWPuLB*&8M-B0|x!zVBVZjNSvGHqbPkO<$kaM*D$P5qPTmpbG zOm{6g&yECu5QaBE=tRISnsem%!qKLI=0E(;^&F|&`lZ=xm1P__DpO0ag oLP1$%gC=ASl^I+RSfbFq!OXGlc>YAfdD2!wmfH}tk$~&}0C};dW&i*H delta 599 zcmV-d0;v7T59I_sM@dFFIbl!$KmhXq0RR9000030{{U50RgR91M)j$~<`XsWJk>%MR- z&vb3yxEkzx4)20su;*I^gvepBL_8*wf#v8Jbv}hrDTT-F0)bbaQVXzN&(E$Pt2LwF z>j{-Cal^y%IKAxcgVSJabWUPeb9PXBTWnl>b#Q`;9*AR-AccmJmKThEjhh--o`0Wv zqo$2Kil?h`L~X05t(rx!rn0KFo_w=Xsa0Nev6hilWwN87lgP=+eas@M&(hP>)z;V8 z+1lIO-QFex;o$@n1>pwe1_wI`=l}@=JOc{w0|gQW0}1#8 zOH#o)pLf?Om5{)oK$`*LH4NZ4ZqW&C;~luD5OUPI3d9Np)_IWv0uCdadOmxs&9;irFLQ@Ly5SY_^AmP8p lSSK`H>6`*Uf$rQ&Xc-%#`w(vc1_~(PfCLt3pcD}R06Txv39|qI diff --git a/swat/images/printers.gif b/swat/images/printers.gif index 212a70c6640f80f74d0f9fff48044689b311dd98..db9ec3f0e0a5870b4b43d1844cd78089527e24dd 100644 GIT binary patch literal 2077 zcmciCk3Z9i1IO`?{r+V(+mME#GI3gdlOIE0;^tSU8c9q^Qtjl_aWo&pW-N7Lru@#Y z%F&_emzf`-a_O#=3qwkNPCq1_b=N=fef+R?i6$CJWUf^3A8X5=$0);}M z(P$_Xiosyua5xf))Y8(@*4D=3@nkZYNF-7y6as;O!{H1J47P7)?AYP#=H|*|x_fvq z-QC@&RH~Pk=dojP85y8ZD9FhX3Iy5N*;#RMM{8?qIy>b91O0=8j~+dG*x%nLmv@Yh zkG^}ST3DD{T%1>_7S-y1AP|^B(amPF6A}`~#$JLT9|U1)HLRiG8bl4NtgIG`bL;Et zdV6~&CzS~aKknHR;^gF*mzN8I>38qmad5Eba!;C@n+FF6rKj^C5Qv_ho~x@17K7Ufv8O) zQ*_33bt$hXV@k^8^y~47sp&V1bIWg+UVWHVQTze|gAfn^CC~ThLf{P?xhmyE7m|-A zS;en5dF{-^8F=m#oS*a-Zm@{BR5xUzpzo}9XgwV9UHp0ki+pKZ)TBQ>*P@|k&b|55%EygJas?c)HEU(%zz`HI7Xc+ zosa1+_Y&bBDPTy9CWaczo#+x!s-ho=uY>$-3|`M%rkwZ~-)9AWHN4B=XJau`r#fZl zdsVMh*qt*(m$g%UJ?`PL+;S!qLuFC#l|Enl@cwDPP2+k6&5*22Fw?J2s!V~A8SJR3 zbwpKe&UQVo4C}{CFAjt46Mnepa9ijRt3mteXxw0V4DP!__0!o02KJ5|t-t&h?IF6+u7cp7jOaznyb~}Zd!JcM0zE!3a@TL z(;NCK!K$A{UYsRxZuaUf{INr=m2c04om)QsAiiVJ1hGvvYOp2dlcXQnc~H!M-O ztj#b+^Y#g+QuR-*FH{B@+De=(DLS&hxzIc(pU_St>_)Q|`JlR`wfI>-DLn z^_2;mELo<=VoTpTvFYsBb=MXp6c7-*zo>`7b+iHrw~buIp?K$91fZUi2TrPLyj6qtlNw`aONZu5Xd=>_nV9sSeXV7jX7z6C!j+B znXwZe0j{U!$R7fi_=ztAwUQ@JZxdw@xmMGs4qESHq?ivmd(#0qsD&07rKo%M)j$~<`XsWJk>%MR-&vb2j zLVnjmFbuig?j`&ggF}{pK$sYR$fRk>tU8}jDQHDARYJg0Sk3L2Sm5Fg&j|LZk zou3H_KLJdmT17vQrmdxtp0q{xV*Uuk=b^sCn;OEVn zx_jY%yn7fB+q{Mjokb_lgGkFaU{@8GDJRI3 zwysYK} zzG(sfZOeBrT)S#1p9O7r@#oB*-KNH@`mtWpsbk0eJiD}O&$lBR4xL+ZTA}uJ+CB{_qyOo_;~?|F5^*nEdFA=q7s_Y zNtvyibDOkvvpy;J`h&%~UX}TLMY6*tDjW@GM#EqJ Oeu{NVU`Sdy5db>~f;-{> diff --git a/swat/images/shares.gif b/swat/images/shares.gif index 2c04ca8b9c790ccc89948e58c9fed4943a5fe61c..b3af15e35d66e3ef23d7b0f4e2d0d1e10f0c4378 100644 GIT binary patch literal 2006 zcmc(g>m$<(1Au?KUu_uP(U!T75Hfd~5-FGIq;$f;dS#Up5;;`cBy72*Lc&NaIbN5F z5F0{Bx;VKMn}u4gISSRB(_isE|G@L%`S5sny4%@@G5|Wz4g3TQ21B7x6bc1_K#)iz z8jXg*U@9sqcsyQBO-)^09f!lIs;Vk0E5qS%Jv}{ZYimbGM>?JE;^N}!>bi61PAnFy zudlyv-@eGmNDha?=ks|yUV3_ZT3VWtl9H8`Re5>2NF*8@9DM%#d4GR@Utgb-lM|cG z?&#={N~Md7iwg@2D=RC@%gdXan^ElS%}t=Kt*xi0r>d$-CX@O5`^Ut@kjZ3wd;84H zOag)6?Ci|ta=W^^BoYaYMvIDyDlILgQmMYaz8V@Dc6N5g#>PY<5re@X5QyaD{}(z6oOkH4|5D;vu@MvxPj3cb`m@Q; zIsih!20$P%1PX%y5EvAWK)_Se`59R`X}l|$*;fm$-^#yMn3sF=MiB%L%Hn1tQD_Vn zjYeXWkZ4?8!-K|0E%o;wHZ`|)ws&{5JrO_d64g_8$^_Yz!1Z|^k=KWGnm@6-4~{{jN%RnDGD^cjbzAU2Q=P0QTW`P5T!$M1jRi;%A>vNyQ^9UN?p+x) z6@`Wq11!Y5(=~20`!k<$-BQsU6h$y3?c$GE0?;hi)~01yZz?4J&$TD%{Yad#aEJq) zdeN7A($_r6{tWSsvsXY!2%C!{1w$5bg2&&!F3B443Njo+*lKER2e3h>3Fg&}@7QmL z<0laslqeBUeFw26u0w^Y6Fp&hcnl%bWQY<-0Y-u(%H_S2@!JDzI1s3^L33nEqX1hU#1Gh&uRk;*zTH! z1;?#sNwF{eW=pentg#Gon0*=(=cc1a^hyA0xe!}$LjJK*;9xR-etrJUNoz5Uuq_K8PH<{Yh%6bM8LKX#Z2VEql9_qthrS6NGfDa1%%{1CBViSq z$BTy(YZ7mk-8(Iu^tlm!;@*SsZ4n_4^G?<4D4HFsiXKgWEM#||ZC(&(7@Cfjs<}0m zmVtMZLVL!!1AmqqqRV1gY)0Kxwyeo<%=Ady9=#-+m*~!W`ni8! zB{$ZeVX_L^1L4*2ufshuYzFLVKGwckrCnH#)LeO3C%e|~UjOu!e_qV=Ef1TI12?QD z)<0ay*;u)|E4QYZx$o6j>@n-tjASL=Fn#xY%q7ZL#CzSGSogKuIMzV;c_)*k@}kX-(pdk>iHsHS>!D zx5+?kc87WmKE)XuJRduo3Mpk91^f^t_z)aPoWA0Z*;nJVxTUS2TmGmqR@I4j3fS-4BconI4jj<}UGm7jGv z6QMC_#H6qR>Yg14u}_?$fxLiJL_C(xo5%4=b&Zk_w@%nEUv$~wKLp%wK4emH)~lg> z+tGwp@R9)GvIbKA9Fx~PU|`<*785+D>-C#F#XQE|(BijRuI3s5Ls94eQ5mX(l_Kl{3q!MRYtj1g2*S0-#hkusNL{L=k{6y(wT~Ex`P4Exb>u^5d8syt8rb zuBVy&mmG)f2k-s`uJWh3gXtDLz)1iU6JaJ^Al`u_u3D(`9%?V|ke_h4I#XGs3TCkX HeTCyc_-(>I literal 569 zcmV-90>=GENk%w1VNd`-0KxzO00030|Nn4+kpKSxzP`Ty|NsC0|NsC0A^r|cVPs_> zcWHEJAV*0}PyiwM1ON&E{{Soi0000`06+i$1O6Dg-2O1iNvpj$>&?6WU?`4cX`X1R zu59Zn0uT#yZQu9|yp*2*IoXaU(E*Ogq;h$T5sNaQ6gPZ6X45RKYHb*qV5YO{_=e9- zE*U0F1_tjpI=%L`k8!x(t&a=q3`Told4+g@Y%x21jD-VWh=~9Mi;j)}jgM+%Is}w{ zbA)xBo{N*7sHv)|n@>ilJEyC&tbj%Wu(G*KwWC4=G_b3!x}Ux=p23vE55=uSq`-l$FyPdzI)rsKzu zBTJraA^`v)`2+z900#gp3;;0zHUJ3#00U2W2i(f)#Rp@n_JZt|-X1q~lvZA+gN>lq znp9R!F73AQ9Ai~SrYzW}2janQzT+uZ3pGC?+mc3%4s%AF6moUeNYy8FxPdZNIJBq> HO8@{n71IX{ diff --git a/swat/images/status.gif b/swat/images/status.gif index 48e2f07fcd780f63feb19d50daf5aceb96d16cce..81ef0bcf16ffda63793bb77f5614d98a987c9b72 100644 GIT binary patch delta 2042 zcmVhSRG?(XaI^6!xlB!9=p$EvET7=sRdRB2IXO8U9UYF2jy*j*!otAd z;N9`@@$T;K@9*#P^Yb+|G;nZkqobkE&(F)t%gV~i&d$ya4GkwJCQeRGfq{UEii(Si zi-?GbiHV5^2L~1w7APnuHa0apJUc)@KtDe}K0ZD{K|vD}6B!v9f zDZs$KsHmnmI5*+p-n_iJgM)&AfPbf_rEzg@Q&UnaD=Hiu9RL6S|NsC0|NsC0|NsC0 z|NsAyF&=*`00000Pyj#x00;hn009940|W&I2M7QN2L=TMhlz`gkCBLqjE<0!nU$QF zl$)26nwFgh09yhE0SN>O3k(gj4hszp4-OCyv<;^gM&;p62M=jng%?DOmK?cntI;6+|tWeN-skU@fm z4IDan`0!z&2M-`XbWq69Aw-E38#cT+aiPYC5j$4g7&4>9k{-;QL6c^|fB_3ah!{bl zgozV2OPoMq(}Yc&K6m!~nNz3a0M9W-ii!NUm`rDMyE{lbI?3kw)EsPG~2 zY|1ej#~A*5^6AVC7A^2>;zjYu!HEZ7O#FYjC`2YFMb+C1qX;2RPbOTw0rn4#2~|f1j;ZTfU>z@0tgsDaL8^Q_y!(;0?uIJ zg#$h|Uug<`5=Ae4Bba48xHgA6&2_gjAp zwpGADVTVch8;U*d{-~mk0Ty=|a-4YvT5(9KXyt|R(TCc7tF_kNY!uRP<(M+f9o|~+7PihwBXZ{`On7m`!>)xHJ9l)Av(Sm=8YrFto zNW;0>x>wt6x&9%r-miS3%dia`cWlF}?k#p_asVvH-<~IG4Bf)+6}law?@k!Qy^et# z@?w=*kex6&>6pSt4(m12Bj5FSt%ZCoGxNMDAz5`=9@4Q~7kXi0|#&=?^@39ON;SqXG!6s+%mWa_4$C*seB*yXOwV}q(nAk` z^4n|Q{PX^!56`UE(1yN456vJy;Gu_xPj#{QB*OPqw#a16SIT z$2k2l&UV4u!TneVzXdkVfy>KZ`qcNj@Ud-3ZYvVu z!TdZ3!q3eON_LY{(iVT?xgG$4efo)CRNTq6-XIE3H{l81jKRN~yS^D@Z+vU0LZ z;_VLpxXH$K@_b2@o#iqqJQ!r|QtTNZ0ZqrsR=P5LOSDhXj>f9Uyz-W~ETv_L$EyYu zAq7S_!d>d(0wg3s2}(!;5|X)uV;U2g%4DW9kD1J6CZU;1cxE-FnN4a&^O|;X!3szK zhaxZ_5)oiR6P$lg6Q-abDkm_(6QBTvCqzLC^L&C7>Pb&~;7ifggVsxPUssA&;br0}N0FLm0vU zc?L0zp{nUAbU+oImzS5Pja24!f@A?2TOhEySH~;}uv4vBF!W5t=#V1JNiBWVy Y6qePjXD<%BSppy+0Rj*J00IF3J2~~CdjJ3c delta 531 zcmV+u0_^>u5W)lyM@dFFIbl!$Kmg+a00000k)0%ygaI3WA^8LV3IP8AEC2ui08jux z000F3Fvv-(y*TU5yZ>M)j$~<`XsWJk>%MR-&vb2n0wwG>obx#eueS;cEkmNo7+_YC z$`Dg9s9Fb4XLK_i5We6lQoBX!!07OWTs}?&Xl%f%*0nLyw47dV-q&Yof@p4kc5elP ziUb2}ZBqe%f)sp&P1VFN6fRZRFn4ExeB}tY5RHkIn@@37J5?1D{xfABjmMw5z5c-qoNuok=8V#yb zW(AuuWk&5u6{w4wPMtR0IyI@)t6ZfXojNw_(Wf(CASH_xCflx2-;zbqma1KyT&>ns z!PBgEQLl5q_7zFEu;IgqS402+A^8LW3IGoPEDr!N05t#!000C~@I655tX5v2HI4DrHtU`rGnzY8+a<4fr Vr+X~haK|k9sZ9cxrsyaF06U|o>rnsz diff --git a/swat/images/viewconfig.gif b/swat/images/viewconfig.gif index 5dee51566907ca574c8cfe98aad995f85a9ad595..bdeac1cf967fede4e16889fccf9d4879c0ff199c 100644 GIT binary patch literal 1939 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 diff --git a/swat/images/wizard.gif b/swat/images/wizard.gif index a2474e0f008e36b1fe6be77d7a343869ee1dfd73..a4614e936bb777c2aee3ee0021121d537cc0c4da 100644 GIT binary patch literal 2554 zcmeH``#;l-0>{7GYKH@G}qy z1c5*xkw_Q}hDM{|a5xHuA`*!t5^2SX6%-1EOeW*;cqkN##bT*cDvQP1xN)PqyE_Pi z9v&W^o}T*p`X(kOK0ZE4Nl8MXFh4(EB9Y|f<()cpia;PFCnwj{)wQ*?b#-+;d-klm zySt~S$H2hA&CN}zR1ORbeE$4-dV2cf$B#2JGt0}%hk(L`8NF}czKxBIJ%0Q+Dk>^F zJ9}hg7+KR@5t*l1>E#%8nMzkmPw^=mILFB==1_V)Ivsj2w*c$rLAP*8xu zU{X?2LPA2`y?YlB5YXJ*oR*fhYuB!ciHYj!>P?$A_4oJd>FHTnSeZ{**jRsm|NHmvFD)(A*Vk{~zP+%p@bKZoIXOA4t*wKDgBvz%NKa2^Fc?8W zL3}>n(9qDy$!YWE&Fj~%x3;!UO-&6B4qmfnjY6TQs;W|{RC2lezyJKd{)YtUI(!f} zE}nKYDI<}#B_N0m(3kWeXkZzz{ki(n5&)?KAOI2o6#x{DHD-Vu1q9H?TSaR=aeYMS zUp9&utXSVd<29-GT|#R*3KI}6_A~bX(F#doMAFVcpa{%Ldyf6h(Wez|nal=BxOK>R z?-MI2f#mVfN?)NJ8>nuBI|5W951{9WP-JF=94v!IVmKXT>$gG;hkb-fwibH*s8_3f_N z{ZCB3V$CCvA^=7+7ZF)GJ}3jL)XL^PL!yIk?;ZQrdhv~F`fa;lm65Jx@$9|>CbcEOGZQOMe9zuKj3{C-7P;_WtyG&^`o}?=tFni_fIwv z&-H0oG62F1(m6_uz0>%Bkm$!46p?o%a)ox~y`FHCak>IZ{yWD zC4(q4z?Ba{M+^v1>ywkJWm_Gzv1c(<4hW@WfLG30RtJn>LV|k%0M6G4N;7ukC7d^a zvWL!trXU}Rl5yhX2Kc~nNv`|25=D(vC;(QJ0&-d!$VifuMya7F>NYt5(N{CfCAz9= zmt@gpLngP#gx$awAem~;^?;t^+#5E@>Z+5pRnUb&Zi zjs7Sz4m;QPW=d>BlC$r=$Ct;3?X_0^dIU3w4JRnz1UJ7atBS+S zw84(EZUnB;-ijX`W6p)wtt+#SXH{Lw_0F;}M%pSM#4YCeGu5ZhXPYm4xPyfeP1y=S zNkgor2ZdL}@M{~ymZL8ZdU+Vb^sr#AgY=`{u5ik==*#Yu&1+)`U7olCPOc+au+Lvv z`VSuE&OZ7?I;q;z_;-G;ld6aR2p!$DQ3Eb)MyBa-y*VqR^V$u4r=wnfJO792?+8*; z6)pjNu{kf|o^UAyoyvnz*}TizyO_Q0EwbgIUa_4@5ZtlK_zUy)b?2zG7;Q=omCI?B zU0zp!uNP2Ps$i}!STa^G*{Jcio@4J&Q(te{@D;z|QTV>rb&N;359BM@~+hQCfmVtHU!c-i4n`#J%` zMAf+&Eh{;vw;G}0Fe8$rDP70QthH=?V0HzNIU8?xNGnfH=qv9Sv2fVBJt(s2=|S7s zQn7{)IYGHuq5HC$c?$(Nf0CVhtcz=>j`9UNM`h)j>%IRjv}{fc%foA&Ubv6(pM`(v ztDI5ATU~t|kd;8H?5wC|S?jr`1oe0+<6w>x3IyFZKeWjx%?3EjQ8%Flj6`i84W^T~>d;GbgEYa7-Vj0=#6(|dORTD`XevSqu{dwii4PbhDohvUC*8N@Iu<8Ai79OP z1<$wxd-CAPk(vw91lyeseYfl~8h8IOY3E50X}n5arJzGUtQ(gRn50>4T zT8!aBA-r|2^kddUOWD$+1-nVO%4~k%B&56zNMI;nsSad>69?iG3PP_mozdUIQ{ryh z3t7=zWLmirKW`u6LLI_{8^gU4LCBL{qJFgRYHO4v01T5ANmUjW6Uc(3f??xV<>7#_ Lf`cX!0k^*Zh4;N? literal 853 zcmZ?wbhEHb3}A3zSjxcg|Nnmm28II%4uF^p46A@tXy_{k2MZvhsA$20CI45g`rp@A z2;|Dj*0{L*fBg6u14AzZ!%JnA4_aEQ`X=tr%Kd-*xCO)U&{eDMo0>&LM0^nv`fq6| z!@y9;&=<l)L(J;JQW$8<>&W^K^Eu?@_^z$ zKHtQYRE6@)k_-iRPu~Cr#h)yUTnzRMIzWFhfPBfo_RpcAz(Yr>|HP7_lQ~xNFRUo> zS{t?g#+tIzZ>#n{*ihl4H~V}>a>CiX-S-Gj0CFNsEh?b9i$0H`F(Bakud_JMpyf zdh+%0cQ4>tF0hM1piR)@RG(0`3nSM77QPcsS6MuGTZP$MMRFF1wsGEI*x1UQ#oEfV zrs0OJ|9gY9eyT{~t$<%3VQ$je#EQEzWKo zUxW*VT)UOHL^WoudnQm|na&&Fp3uuQM`6XgY)@|G#tqI1N;B9lGlwz+a%QjyY?yFe zaqqQ)R|*-61N<2t`BogB-VUy1(ou~&j5k@_ z;=1YL$C9onC^}ob_wZDPZh!Yh;uWiGA4;*XUJ}n>X!m9Q$|?|W&aURM$>krPUz_hu zbFTaxcEPc~@~!BPHh~>`mp*9XF?;c#dEQ&a1nI9k8Wn8C!YmRbcO