Merge branch 'v3-3-test' of git://git.samba.org/samba into 3-3
authorSteve French <stevef@smfhomehp.(none)>
Tue, 24 Feb 2009 17:26:56 +0000 (11:26 -0600)
committerSteve French <stevef@smfhomehp.(none)>
Tue, 24 Feb 2009 17:26:56 +0000 (11:26 -0600)
443 files changed:
.gitignore
WHATSNEW.txt
docs-xml/Makefile
docs-xml/Samba3-ByExample/SBE-DomainAppsSupport.xml
docs-xml/Samba3-ByExample/SBE-SecureOfficeServer.xml
docs-xml/Samba3-ByExample/SBE-TheSmallOffice.xml
docs-xml/Samba3-HOWTO/TOSHARG-Compiling.xml
docs-xml/Samba3-HOWTO/TOSHARG-TheNetCommand.xml
docs-xml/Samba3-HOWTO/TOSHARG-Winbind.xml
docs-xml/archives/THANKS
docs-xml/htmldocs.html
docs-xml/manpages-3/cifs.upcall.8.xml
docs-xml/manpages-3/eventlogadm.8.xml
docs-xml/manpages-3/findsmb.1.xml
docs-xml/manpages-3/idmap_ad.8.xml
docs-xml/manpages-3/idmap_adex.8.xml
docs-xml/manpages-3/idmap_hash.8.xml
docs-xml/manpages-3/idmap_ldap.8.xml
docs-xml/manpages-3/idmap_nss.8.xml
docs-xml/manpages-3/idmap_rid.8.xml
docs-xml/manpages-3/idmap_tdb.8.xml
docs-xml/manpages-3/idmap_tdb2.8.xml [new file with mode: 0644]
docs-xml/manpages-3/ldb.3.xml
docs-xml/manpages-3/ldbadd.1.xml
docs-xml/manpages-3/ldbdel.1.xml
docs-xml/manpages-3/ldbedit.1.xml
docs-xml/manpages-3/ldbmodify.1.xml
docs-xml/manpages-3/ldbrename.1.xml [new file with mode: 0644]
docs-xml/manpages-3/ldbsearch.1.xml
docs-xml/manpages-3/libsmbclient.7.xml
docs-xml/manpages-3/lmhosts.5.xml
docs-xml/manpages-3/log2pcap.1.xml
docs-xml/manpages-3/mount.cifs.8.xml
docs-xml/manpages-3/net.8.xml
docs-xml/manpages-3/nmbd.8.xml
docs-xml/manpages-3/nmblookup.1.xml
docs-xml/manpages-3/ntlm_auth.1.xml
docs-xml/manpages-3/pam_winbind.7.xml
docs-xml/manpages-3/pdbedit.8.xml
docs-xml/manpages-3/profiles.1.xml
docs-xml/manpages-3/rpcclient.1.xml
docs-xml/manpages-3/samba.7.xml
docs-xml/manpages-3/sharesec.1.xml [new file with mode: 0644]
docs-xml/manpages-3/smb.conf.5.xml
docs-xml/manpages-3/smbcacls.1.xml
docs-xml/manpages-3/smbclient.1.xml
docs-xml/manpages-3/smbcontrol.1.xml
docs-xml/manpages-3/smbcquotas.1.xml
docs-xml/manpages-3/smbd.8.xml
docs-xml/manpages-3/smbget.1.xml
docs-xml/manpages-3/smbgetrc.5.xml
docs-xml/manpages-3/smbpasswd.5.xml
docs-xml/manpages-3/smbpasswd.8.xml
docs-xml/manpages-3/smbspool.8.xml
docs-xml/manpages-3/smbstatus.1.xml
docs-xml/manpages-3/smbtar.1.xml
docs-xml/manpages-3/smbtree.1.xml
docs-xml/manpages-3/swat.8.xml
docs-xml/manpages-3/tdbbackup.8.xml
docs-xml/manpages-3/tdbdump.8.xml
docs-xml/manpages-3/tdbtool.8.xml
docs-xml/manpages-3/testparm.1.xml
docs-xml/manpages-3/umount.cifs.8.xml
docs-xml/manpages-3/vfs_acl_tdb.8.xml [new file with mode: 0644]
docs-xml/manpages-3/vfs_acl_xattr.8.xml [new file with mode: 0644]
docs-xml/manpages-3/vfs_audit.8.xml
docs-xml/manpages-3/vfs_cacheprime.8.xml
docs-xml/manpages-3/vfs_cap.8.xml
docs-xml/manpages-3/vfs_catia.8.xml
docs-xml/manpages-3/vfs_commit.8.xml
docs-xml/manpages-3/vfs_default_quota.8.xml
docs-xml/manpages-3/vfs_extd_audit.8.xml
docs-xml/manpages-3/vfs_fake_perms.8.xml
docs-xml/manpages-3/vfs_fileid.8.xml [new file with mode: 0644]
docs-xml/manpages-3/vfs_full_audit.8.xml
docs-xml/manpages-3/vfs_gpfs.8.xml
docs-xml/manpages-3/vfs_netatalk.8.xml
docs-xml/manpages-3/vfs_notify_fam.8.xml
docs-xml/manpages-3/vfs_prealloc.8.xml
docs-xml/manpages-3/vfs_readahead.8.xml
docs-xml/manpages-3/vfs_readonly.8.xml
docs-xml/manpages-3/vfs_recycle.8.xml
docs-xml/manpages-3/vfs_shadow_copy.8.xml
docs-xml/manpages-3/vfs_shadow_copy2.8.xml [new file with mode: 0644]
docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
docs-xml/manpages-3/vfs_streams_depot.8.xml
docs-xml/manpages-3/vfs_streams_xattr.8.xml
docs-xml/manpages-3/vfs_xattr_tdb.8.xml
docs-xml/manpages-3/vfstest.1.xml
docs-xml/manpages-3/wbinfo.1.xml
docs-xml/manpages-3/winbindd.8.xml
docs-xml/smbdotconf/browse/enhancedbrowsing.xml
docs-xml/smbdotconf/ldap/ldapssl.xml
docs-xml/smbdotconf/ldap/ldapsslads.xml [new file with mode: 0644]
docs-xml/smbdotconf/ldap/ldaptimeout.xml
docs-xml/smbdotconf/locking/sharemodes.xml
docs-xml/smbdotconf/locking/strictlocking.xml
docs-xml/smbdotconf/misc/addsharecommand.xml
docs-xml/smbdotconf/misc/changesharecommand.xml
docs-xml/smbdotconf/misc/deletesharecommand.xml
docs-xml/smbdotconf/misc/remoteannounce.xml
docs-xml/smbdotconf/misc/socketaddress.xml
docs-xml/smbdotconf/misc/usershareallowguests.xml
docs-xml/smbdotconf/misc/usershareprefixallowlist.xml
docs-xml/smbdotconf/misc/usersharetemplateshare.xml
docs-xml/smbdotconf/printing/printing.xml
docs-xml/smbdotconf/printing/useclientdriver.xml
docs-xml/smbdotconf/protocol/aclcheckpermissions.xml
docs-xml/smbdotconf/protocol/enableasusupport.xml
docs-xml/smbdotconf/security/clientlanmanauth.xml
docs-xml/smbdotconf/security/clientsigning.xml
docs-xml/smbdotconf/security/lanmanauth.xml
docs-xml/smbdotconf/security/passwordserver.xml
docs-xml/smbdotconf/security/security.xml
docs-xml/smbdotconf/security/serverschannel.xml
docs-xml/smbdotconf/security/serversigning.xml
docs-xml/smbdotconf/security/smbencrypt.xml
docs-xml/smbdotconf/security/updateencrypted.xml
docs-xml/smbdotconf/vfs/aclcompatibility.xml
examples/libsmbclient/Makefile
examples/libsmbclient/testfstatvfs.c [new file with mode: 0644]
examples/libsmbclient/teststatvfs.c [new file with mode: 0644]
examples/perfcounter/perfcountd.init
packaging/RHEL-CTDB/configure.rpm
packaging/RHEL-CTDB/makerpms.sh
packaging/RHEL-CTDB/makespec.sh [new file with mode: 0755]
packaging/RHEL-CTDB/samba.spec.tmpl
packaging/RHEL/samba.spec.tmpl
packaging/bin/fill-templates [new file with mode: 0755]
packaging/bin/update-pkginfo
release-scripts/build-docs
release-scripts/create-tarball
source/Makefile.in
source/VERSION
source/auth/auth_util.c
source/auth/pampass.c
source/client/client.c
source/client/clitar.c
source/client/mount.cifs.c
source/client/umount.cifs.c
source/configure.in
source/include/ads.h
source/include/ctdbd_conn.h
source/include/event.h
source/include/includes.h
source/include/libsmb_internal.h
source/include/libsmbclient.h
source/include/local.h
source/include/messages.h
source/include/passdb.h
source/include/proto.h
source/include/rpc_client.h
source/include/rpc_secdes.h
source/include/smb.h
source/include/vfs.h
source/include/vfs_macros.h
source/lib/async_req.c
source/lib/charcnv.c
source/lib/ctdbd_conn.c
source/lib/dbwrap_ctdb.c
source/lib/dbwrap_util.c
source/lib/debug.c
source/lib/dprintf.c
source/lib/dummysmbd.c
source/lib/events.c
source/lib/fault.c
source/lib/interface.c
source/lib/ldap_debug_handler.c
source/lib/ldb/include/ldb.h
source/lib/netapi/user.c
source/lib/popt_common.c
source/lib/replace/getifaddrs.c
source/lib/replace/libreplace_ld.m4
source/lib/replace/libreplace_network.m4
source/lib/replace/replace.h
source/lib/replace/test/os2_delete.c
source/lib/sendfile.c
source/lib/smbldap.c
source/lib/socket_wrapper/socket_wrapper.c
source/lib/system.c
source/lib/tdb/tools/tdbtool.c
source/lib/time.c
source/lib/util.c
source/lib/util_file.c
source/lib/util_seaccess.c
source/lib/util_sock.c
source/lib/util_tdb.c
source/lib/xfile.c
source/libaddns/dns.h
source/libads/ads_struct.c
source/libads/kerberos_keytab.c
source/libads/kerberos_verify.c
source/libads/krb5_setpw.c
source/libads/ldap.c
source/libads/ldap_printer.c
source/libads/ldap_user.c
source/libads/ndr.c
source/libads/util.c
source/libgpo/gpo_reg.c
source/libnet/libnet_join.c
source/libnet/libnet_keytab.c
source/libnet/libnet_samsync.c
source/libnet/libnet_samsync_display.c
source/libnet/libnet_samsync_keytab.c
source/libnet/libnet_samsync_ldif.c
source/librpc/gen_ndr/cli_netlogon.c
source/librpc/gen_ndr/cli_netlogon.h
source/librpc/gen_ndr/cli_samr.c
source/librpc/gen_ndr/cli_samr.h
source/librpc/gen_ndr/messaging.h
source/librpc/gen_ndr/ndr_dfs.c
source/librpc/gen_ndr/ndr_epmapper.c
source/librpc/gen_ndr/ndr_eventlog.c
source/librpc/gen_ndr/ndr_lsa.c
source/librpc/gen_ndr/ndr_messaging.c
source/librpc/gen_ndr/ndr_messaging.h
source/librpc/gen_ndr/ndr_netlogon.c
source/librpc/gen_ndr/ndr_netlogon.h
source/librpc/gen_ndr/ndr_samr.c
source/librpc/gen_ndr/ndr_srvsvc.c
source/librpc/gen_ndr/ndr_svcctl.c
source/librpc/gen_ndr/ndr_winreg.c
source/librpc/gen_ndr/netlogon.h
source/librpc/gen_ndr/samr.h
source/librpc/gen_ndr/security.h
source/librpc/gen_ndr/srv_netlogon.c
source/librpc/gen_ndr/srv_netlogon.h
source/librpc/gen_ndr/srv_samr.c
source/librpc/idl/messaging.idl
source/librpc/idl/netlogon.idl
source/librpc/idl/samr.idl
source/librpc/ndr/ndr_sec_helper.c
source/libsmb/async_smb.c
source/libsmb/cliconnect.c
source/libsmb/clidfs.c
source/libsmb/clientgen.c
source/libsmb/clifsinfo.c
source/libsmb/clikrb5.c
source/libsmb/clilist.c
source/libsmb/dsgetdcname.c
source/libsmb/libsmb_compat.c
source/libsmb/libsmb_context.c
source/libsmb/libsmb_dir.c
source/libsmb/libsmb_file.c
source/libsmb/libsmb_path.c
source/libsmb/libsmb_server.c
source/libsmb/libsmb_setget.c
source/libsmb/libsmb_stat.c
source/libsmb/libsmb_xattr.c
source/libsmb/namequery.c
source/libsmb/passchange.c
source/libsmb/smb_seal.c
source/locking/locking.c
source/locking/posix.c
source/m4/check_path.m4
source/modules/gpfs.c
source/modules/nfs4_acls.c
source/modules/nfs4_acls.h
source/modules/vfs_acl_tdb.c
source/modules/vfs_acl_xattr.c
source/modules/vfs_aio_fork.c
source/modules/vfs_aixacl2.c
source/modules/vfs_default.c
source/modules/vfs_extd_audit.c
source/modules/vfs_fileid.c
source/modules/vfs_full_audit.c
source/modules/vfs_gpfs.c
source/modules/vfs_gpfs.h
source/modules/vfs_netatalk.c
source/modules/vfs_recycle.c
source/modules/vfs_smb_traffic_analyzer.c
source/modules/vfs_solarisacl.c
source/modules/vfs_streams_depot.c
source/modules/vfs_streams_xattr.c
source/nmbd/asyncdns.c
source/nmbd/nmbd.c
source/nmbd/nmbd_become_dmb.c
source/nmbd/nmbd_incomingrequests.c
source/nmbd/nmbd_processlogon.c
source/nmbd/nmbd_serverlistdb.c
source/nmbd/nmbd_subnetdb.c
source/nsswitch/pam_winbind.c
source/nsswitch/pam_winbind.h
source/nsswitch/wbinfo.c
source/nsswitch/winbind_nss_solaris.c
source/nsswitch/winbind_nss_solaris.h
source/nsswitch/winbind_struct_protocol.h
source/param/loadparm.c
source/passdb/login_cache.c
source/passdb/passdb.c
source/passdb/pdb_interface.c
source/passdb/pdb_ldap.c
source/passdb/pdb_smbpasswd.c
source/passdb/pdb_tdb.c
source/pidl/MANIFEST [new file with mode: 0644]
source/pidl/META.yml [new file with mode: 0644]
source/pidl/Makefile.PL [new file with mode: 0755]
source/pidl/README [new file with mode: 0644]
source/pidl/TODO [new file with mode: 0644]
source/pidl/config.m4 [new file with mode: 0644]
source/pidl/config.mk [new file with mode: 0644]
source/pidl/expr.yp [new file with mode: 0644]
source/pidl/idl.yp [new file with mode: 0644]
source/pidl/lib/Parse/Pidl.pm [new file with mode: 0644]
source/pidl/lib/Parse/Pidl/CUtil.pm [new file with mode: 0644]
source/pidl/lib/Parse/Pidl/Compat.pm [new file with mode: 0644]
source/pidl/lib/Parse/Pidl/Dump.pm [new file with mode: 0644]
source/pidl/lib/Parse/Pidl/Expr.pm [new file with mode: 0644]
source/pidl/lib/Parse/Pidl/IDL.pm [new file with mode: 0644]
source/pidl/lib/Parse/Pidl/NDR.pm [new file with mode: 0644]
source/pidl/lib/Parse/Pidl/ODL.pm [new file with mode: 0644]
source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm [new file with mode: 0644]
source/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm [new file with mode: 0644]
source/pidl/lib/Parse/Pidl/Samba4.pm [new file with mode: 0644]
source/pidl/lib/Parse/Pidl/Samba4/COM/Header.pm [new file with mode: 0644]
source/pidl/lib/Parse/Pidl/Samba4/COM/Proxy.pm [new file with mode: 0644]
source/pidl/lib/Parse/Pidl/Samba4/COM/Stub.pm [new file with mode: 0644]
source/pidl/lib/Parse/Pidl/Samba4/EJS.pm [new file with mode: 0644]
source/pidl/lib/Parse/Pidl/Samba4/Header.pm [new file with mode: 0644]
source/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm [new file with mode: 0644]
source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm [new file with mode: 0644]
source/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm [new file with mode: 0644]
source/pidl/lib/Parse/Pidl/Samba4/Python.pm [new file with mode: 0644]
source/pidl/lib/Parse/Pidl/Samba4/SWIG.pm [new file with mode: 0644]
source/pidl/lib/Parse/Pidl/Samba4/TDR.pm [new file with mode: 0644]
source/pidl/lib/Parse/Pidl/Samba4/Template.pm [new file with mode: 0644]
source/pidl/lib/Parse/Pidl/Typelist.pm [new file with mode: 0644]
source/pidl/lib/Parse/Pidl/Util.pm [new file with mode: 0644]
source/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm [new file with mode: 0644]
source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm [new file with mode: 0644]
source/pidl/lib/Parse/Yapp/Driver.pm [new file with mode: 0644]
source/pidl/pidl [new file with mode: 0755]
source/pidl/tests/Util.pm [new file with mode: 0644]
source/pidl/tests/cutil.pl [new file with mode: 0755]
source/pidl/tests/dump.pl [new file with mode: 0755]
source/pidl/tests/header.pl [new file with mode: 0755]
source/pidl/tests/ndr.pl [new file with mode: 0755]
source/pidl/tests/ndr_align.pl [new file with mode: 0755]
source/pidl/tests/ndr_alloc.pl [new file with mode: 0755]
source/pidl/tests/ndr_array.pl [new file with mode: 0755]
source/pidl/tests/ndr_compat.pl [new file with mode: 0755]
source/pidl/tests/ndr_deprecations.pl [new file with mode: 0755]
source/pidl/tests/ndr_fullptr.pl [new file with mode: 0755]
source/pidl/tests/ndr_refptr.pl [new file with mode: 0755]
source/pidl/tests/ndr_represent.pl [new file with mode: 0755]
source/pidl/tests/ndr_simple.pl [new file with mode: 0755]
source/pidl/tests/ndr_string.pl [new file with mode: 0755]
source/pidl/tests/ndr_tagtype.pl [new file with mode: 0755]
source/pidl/tests/parse_idl.pl [new file with mode: 0755]
source/pidl/tests/samba-ejs.pl [new file with mode: 0755]
source/pidl/tests/samba-ndr.pl [new file with mode: 0755]
source/pidl/tests/samba3-cli.pl [new file with mode: 0755]
source/pidl/tests/samba3-srv.pl [new file with mode: 0644]
source/pidl/tests/tdr.pl [new file with mode: 0755]
source/pidl/tests/test_util.pl [new file with mode: 0755]
source/pidl/tests/typelist.pl [new file with mode: 0755]
source/pidl/tests/util.pl [new file with mode: 0755]
source/pidl/tests/wireshark-conf.pl [new file with mode: 0755]
source/pidl/tests/wireshark-ndr.pl [new file with mode: 0755]
source/printing/notify.c
source/printing/nt_printing.c
source/printing/print_cups.c
source/printing/print_generic.c
source/printing/printfsp.c
source/printing/printing.c
source/registry/reg_backend_db.c
source/registry/reg_dispatcher.c
source/rpc_client/cli_spoolss.c
source/rpc_client/init_samr.c
source/rpc_parse/parse_buffer.c
source/rpc_parse/parse_eventlog.c
source/rpc_server/srv_eventlog_nt.c
source/rpc_server/srv_lsa_hnd.c
source/rpc_server/srv_netlog_nt.c
source/rpc_server/srv_pipe.c
source/rpc_server/srv_pipe_hnd.c
source/rpc_server/srv_samr_nt.c
source/rpc_server/srv_spoolss_nt.c
source/rpc_server/srv_srvsvc_nt.c
source/rpc_server/srv_svcctl_nt.c
source/rpcclient/cmd_samr.c
source/rpcclient/cmd_spoolss.c
source/script/installman.sh
source/script/installmo.sh [changed mode: 0644->0755]
source/script/mkbuildoptions.awk
source/services/services_db.c
source/smbd/blocking.c
source/smbd/close.c
source/smbd/connection.c
source/smbd/dnsregister.c
source/smbd/dosmode.c
source/smbd/file_access.c
source/smbd/fileio.c
source/smbd/filename.c
source/smbd/nttrans.c
source/smbd/open.c
source/smbd/oplock.c
source/smbd/password.c
source/smbd/posix_acls.c
source/smbd/process.c
source/smbd/reply.c
source/smbd/seal.c
source/smbd/server.c
source/smbd/service.c
source/smbd/sesssetup.c
source/smbd/trans2.c
source/torture/nbio.c
source/torture/torture.c
source/torture/utable.c
source/utils/eventlogadm.c
source/utils/net_ads.c
source/utils/net_cache.c
source/utils/net_conf.c
source/utils/net_lookup.c
source/utils/net_rpc.c
source/utils/net_rpc_join.c
source/utils/net_status.c
source/utils/net_time.c
source/utils/net_util.c
source/utils/ntlm_auth.c
source/utils/profiles.c
source/utils/sharesec.c
source/utils/smbcacls.c
source/utils/smbcontrol.c
source/utils/smbget.c
source/utils/smbpasswd.c
source/web/cgi.c
source/web/neg_lang.c
source/web/statuspage.c
source/web/swat.c
source/winbindd/idmap.c
source/winbindd/winbindd.c
source/winbindd/winbindd.h
source/winbindd/winbindd_ads.c
source/winbindd/winbindd_cache.c
source/winbindd/winbindd_cm.c
source/winbindd/winbindd_cred_cache.c
source/winbindd/winbindd_dual.c
source/winbindd/winbindd_group.c
source/winbindd/winbindd_proto.h
source/winbindd/winbindd_user.c
source/winbindd/winbindd_util.c
source/winbindd/winbindd_wins.c

index edb1b3d6d83b6afd32544589ecf8bf54b899e4f5..acaf24efe598b53981a64e8d164f29cad7ae1027 100644 (file)
@@ -64,6 +64,8 @@ examples/libsmbclient/teststat3
 examples/libsmbclient/testutime
 examples/libsmbclient/testwrite
 examples/libsmbclient/testtruncate
+examples/libsmbclient/testfstatvfs
+examples/libsmbclient/teststatvfs
 examples/libsmbclient/tree
 examples/libsmbclient/Makefile.internal
 source/librpc/gen_ndr/cli_krb5pac.*
index 2530e741af35e8961b0324fb477870b6b6287abc..141d76bd3d381a15fefa2ec5138f8892781b11b3 100644 (file)
-                   ================================
-                   Release Notes for Samba 3.3.0rc1
-                         November, 27 2008
-                   ================================
+                   =============================
+                   Release Notes for Samba 3.3.1
+                         February, 24 2009
+                   =============================
 
-This is the first release candidate of Samba 3.3.0.  This is *not*
-intended for production environments and is designed for testing
-purposes only.  Please report any defects via the Samba bug reporting
-system at https://bugzilla.samba.org/.
+This is the latest bugfix release release of the Samba 3.3 series.
 
-Major enhancements in Samba 3.3.0 include:
+Major enhancements in Samba 3.3.1 include:
 
- Configuration/installation:
- o Splitting of library directory into library directory and separate
-   modules directory.
-
- File Serving:
- o Extended Cluster support.
-
- Winbind:
- o Simplified idmap configuration.
- o New idmap backends "adex" and "hash".
- o Added new parameter "winbind reconnect delay".
- o Added support for user and group aliasing.
-
- Administrative tools:
- o The destination "all" of smbcontrol does now affect all running
-   daemons including nmbd and winbindd.
- o New 'net rpc vampire keytab' and 'net rpc vampire ldif' commands.
- o The 'net' utility can now use kerberos for joining and authentication.
- o The 'wbinfo' utility can now add, modify and remove identity mapping entries.
-
- Libraries:
- o NetApi library implements various new calls for User- and Group
-   Account Management.
-
-
-Configure changes
-=================
-
-The configure option "--with-libdir" has been removed. The library
-directory can still be specified by using the existing "--libdir" option.
-A new option "--with-modulesdir" has been added to allow the specification
-of a separate directory for the shared modules.
-
-
-Winbind idmap backend changes
-=============================
-
-The idmap configuration has changed with version 3.3 to something that
-allows a smoother upgrade path from pre-3.0.25 configurations that use
-"idmap backend". The reason for this change is that to many, also to Samba
-developers, the 3.0.25 style configuration with "idmap config" turned out
-to be very complex. Version 3.3 no longer deprecates the "idmap backend"
-parameter, instead with "idmap backend" the default idmap backend is
-specified.
-
-Accordingly, the "idmap config <domain> : default = yes" setting is no
-longer being looked at.
-
-The alloc backend defaults to the default backend, which should be able to
-allocate IDs. In the default distribution the tdb and ldap backends can
-allocate, the ad and rid backends can not. The idmap alloc range is now
-being set with the "old" parameters "idmap uid" and "idmap gid".
-
-The "idmap domains" parameter has been removed.
-
-
-winbind reconnect delay
-=======================
-
-This is a new parameter which specifies the number of seconds the Winbind
-daemon will wait between attempts to contact a Domain controller for a domain
-that is determined to be down or not contactable.
-
-
-Winbind's Name Aliasing
-=======================
-
-Name aliasing in Winbind is a feature that allows an administrator to
-map a fully qualified user or group name from a Windows domain to a
-convenient short name for Unix access.  This is similar to the username
-map functionality supported by smbd but is primary intended for
-clients and servers making use of Winbind's PAM and NSS libraries.
-
-For example, the user "DOMAIN\fred" has been mapped to the Unix name
-"freddie".
-
-   $ getent passwd "DOMAIN\fred"
-   freddie:x:1000:1001:Fred Jones:/home/freddie:/bin/bash
-
-   $ getent passwd freddie
-   freddie:x:1000:1001:Fred Jones:/home/freddie:/bin/bash
-
-The name aliasing support is provided by individual nss_info plugins.
-For example, the new "adex" plugin reads the uid attribute from Active
-Directory to make a short login name to the fully qualified name.
-While the new "hash" module utilizes a local file to map "short_name
-= QUALIFIED\name".  Both user and group name mapping is supported.
-Please refer to the "winbind nss info" option in smb.conf(5) and
-to individual plugin man pages for further details.
-
-
-idmap_hash
-==========
-
-The idmap_hash plugin provides similar support as the idmap_rid
-module.  However, uids and gids are generated from the full domain
-SID using a hashing algorithm that maps the lower 19 bits from the user
-or group RID to bits 0 - 19 in the Unix id and hashes 96 bits from
-the domain SID to bits 20 - 30 in the Unix id.  The result is a 31 bit
-uid or gid that is consistent across machines and provides support for
-trusted domains.
-
-Please refer to the idmap_hash(8) man page for more details.
-
-
-idmap_adex
-==========
-
-The adex idmap/nss_info plugin is an adaptation of the Likewise
-Enterprise plugin with support for OU based cells removed
-(since the Windows pieces to manage the cells are not available).
-
-This plugin supports
-
-      * The RFC2307 schema for users and groups.
-      * Connections to trusted domains
-      * Global catalog searches
-      * Cross forest trusts
-      * User and group aliases
-
-Prerequisite: Add the following attributes to the Partial Attribute
-Set in global catalog:
-
-      * uidNumber
-      * uid
-      * gidNumber
-
-A basic config using the current trunk code would look like:
-
-[global]
-       idmap backend = adex
-       idmap uid = 10000 - 29999
-       idmap gid = 10000 - 29999
-       winbind nss info = adex
-
-       winbind normalize names = yes
-       winbind refresh tickets = yes
-       template homedir = /home/%D/%U
-       template shell = /bin/bash
-
-Please refer to the idmap_adex(8) man page for more details.
+     * Fix net ads join when "ldap ssl = start tls" (bug #6073).
+     * Fix renaming/deleting of files using Windows clients (bug #6082).
+     * Fix renaming/deleting a "not matching/resolving" symlink (bug #6090).
+     * Fix remotely adding a share via the Windows MMC.
 
 
 ######################################################################
@@ -162,219 +22,149 @@ smb.conf changes
 
     Parameter Name                      Description     Default
     --------------                      -----------     -------
-    cups connection timeout            New             30
-    idmap domains                      Removed
-    init logon delayed hosts           New             ""
-    init logon delay                   New             100
-    winbind reconnect delay            New             30
+    ldap ssl ads                       New             No
 
 
-Changes since 3.3.0pre2:
-------------------------
-
-o   Michael Adam <obnox@samba.org>
-    * Fix eventlog crash.
-    * Make keytab filename argument mandatory to "net rpc vampire keytab".
-    * Add domain prefix to username in lookup_groupmem().
-    * Honour "winbind use default domain" in lookup_groupmem().
-    * Sanely handle NULL domain in add_member().
-    * Don't list the domain twice when expanding internal aliases.
-    * Prevent negative GM/ cache entries due to broken connections.
-    * Use the reconnect methods instead of the rpc methods directly.
+Changes since 3.3.0:
+--------------------
 
 
 o   Jeremy Allison <jra@samba.org>
-    * BUG 5080: Fix access to cups-printers with cups 1.3.4.
-    * BUG 5814: Fix Winbind crash bug while doing "rescan_trusted_domain".
-    * BUG 5818: Sort ACEs in smbcacl output properly and honor inheritance.
-    * BUG 5825: Fix account locking with an LDAP backend.
-    * BUG 5826: Fix truncated filenames when accessing old servers.
-    * BUG 5873: Fix ACL inheritance.
-    * BUG 5889: Fix "delete veto files = no".
-    * BUG 5891: Fix smbd crash when viewing the eventlog exported by "eventlog
-      list".
-    * BUG 5900: Fix vfs_readonly.
-    * BUG 5903: Fix breaking of file contents in vfs_streams_xattr.
-    * BUG 5904: Fix SIGABRT while servicing getaddrinfo() request caused by
-      libnss_wins.
-    * BUG 5914: Fix redefinition of struct name_list.
-    * Correctly fix smbclient to terminate on eof from server.
-    * Fix client timeout when searching for a large number of cups printers.
-    * Unify access checks for lsa server functions.
-    * Remove the requirement for ldap call made as root.
-    * Cope with MAXIMUM_ALLOWED_ACCESS requests when opening handles.
-    * Fix net rpc vampire, based on an *amazing* piece of debugging work by
-      "Cooper S. Blake" <the_analogkid@yahoo.com>.
-    * Fix memory leak in error path, spotted by Martin Zielinski <mz@seh.de>.
-    * Add vfs_acl_tdb.c module to do ACLs completely in userspace.
-    * Use fxattr calls whenever possible (trying to work around the strange
-      Linux kernel oplock bug).
-
-
-o   Kai Blin <kai@samba.org>
-    * BUG 5892: Fix net rap printq info documentation.
-    * Add placeholder functions to libwbclient.
-
-
-o   Gerald (Jerry) Carter <jerry@samba.org>
-    * Use the same prerequisite for DDNS update as Windows XP.
-    * Make "lwinet ads dns register" honor the "interfaces" parameter.
-
-
-o   Steven Danneman <steven.danneman@isilon.com>
-    * Add options to manage identity mapping entries to wbinfo and Winbind.
-    * Fix to allow setting of NULL DACL/SACL.
-
-
-o   G√ľnther Deschner <gd@samba.org>
-    * BUG 5888: Fix remote rpc service management.
-    * Ensure consistency when reporting password complexity.
-    * Fix _lsa_GetUserName.
-    * Fix access check in _samr_QuerySecurity().
-    * _samr_DeleteUser needs to wipe out the user_handle on success.
-    * NetGroupEnum_r needs to handle servers with no groups.
-    * Fix numerous netapi issues.
-    * Add support for partial and delta netlogon replication in
-      "net rpc vampire".
-    * Add automatic machine password update in Winbind for member servers.
-    * Add German internalization for pam_winbind.
-    * Add Winbind krb5 locator plugin manpage.
-    * Add new wbclient wbcLookupDomainControllerEx call.
-    * Use autogenerated DCE/RPC routines for one more call on SVCCTL
-      named pipe.
-    * Use autogenerated NBT routines from Samba4 for Mailslot/CLDAP
-      parsing.
-    * Fix Winbind password change code for Windows 2000 DCs.
-    * Fix PNP_HwProfInfo NDR parsing.
-    * Add wbclient wbcLogonUser and wbcLogoffUserEx functions.
-    * Add automatic home directory creation for pam_winbind.
-
-
-o   Mathias Dietz <MDIETZ@de.ibm.com>
-    * Search for gpfs functions in both libgpfs_gpl.so an libgpfs.so.
-
-
-o   Dina Fine <dina@exanet.com>
-    * BUG 5908: Fix internal change notify on share directories.
-
-
-o   Nils Goroll <nils.goroll@hamburg.de>
-    * BUG 5135: Prevent calling POSIX ACL vfs methods on zfs share.
-    * BUG 5446: Prevent calling POSIX ACL vfs methods on zfs share.
+    * BUG 6082: Fix renaming/deleting of files using Windows clients.
+    * BUG 6069: Fix build with too many arguments.
+    * BUG 6090: Fix renaming/deleting a "not matching/resolving" symlink.
+    * BUG 6099: Try to fix domain join of Win7 Beta.
+    * BUG 6117: Fix core dump of pdbedit -a.
+    * BUG 6133: Fix deletion of non-ACL files on Solaris/ZFS/NFSv4 ACL
+      filesystem.
+    * Fix Coverity IDs 115, 116, 117, 602.
+    * Fix warning (bad handler prototype).
+    * Unify the detection of the timespec code in configure.in, and the
+      application of it in time.c.
+    * Correctly use chroot().
+    * Parameterize in local.h the MAX_RPC_DATA_SIZE, and ensure that "offered"
+      read from the rpc packet in spoolss is under that size.
+    * Backport the semantics of when to delete alternate data streams on a file
+      truncate.
+    * Fix printf warnings.
+    * Fix warnings on Solaris.
 
 
-o   Jeff Layton <jlayton@redhat.com>
-    * Have uppercase_string return success on NULL pointer in mount.cifs.
-    * Make mount.cifs return codes match the return codes for /bin/mount.
+o   Michael Adam <obnox@samba.org>
+    * BUG 6066: netinet/ip.h present but cannot be compiled on Solaris.
+    * BUG 6073: Prevent ads_connect() from using SSL unless explicitly
+      requested.
+    * Fix 'getent passwd' to allocate new uids.
+    * Fix 'getent group' to allocate new gids.
+    * Remove check for sharename being a username in 'net conf
+      addshare'.
 
 
-o   Volker Lendecke <vl@samba.org>
-    * BUG 5691: Fig smbd panic on Solaris.
-    * BUG 5840: Fix segfault in "rpcclient lsaaddacctrights".
-    * BUG 5860: safe_strcpy gives a nasty error message for overlong strings.
-    * Fix the offset checks in the trans routines (CVE-2008-4314).
-    * Fix a potential NULL deref in found by the IBM Checker.
-    * Fix an uninitialized variable found by the IBM Checker.
-    * Fix an unlikely memleak found by the IBM Checker.
-    * Fix some missing error handlings.
-    * Add workaround for domain joins using a netbios name which is different
-      from the hostname.
-    * Fix a valgrind error in idmap_ad_sids_to_unixids().
-    * Make memcache_add_talloc NULL out the source pointer.
-    * Fix memleak in memcache_add_talloc found by Martin Zielinski <mz@seh.de>.
-    * Fix memleak in calculate_next_machine_pwd_change.
+o   Guenther Deschner <gd@samba.org>
+    * Fix Coverity ID 848.
+    * Remove unused ENUM_HND from 'net'.
+    * Fix getform command asprintf return code in rpcclient.
+    * Fix memleak in get_remote_printer_publishing_data().
+    * Remove duplicate prototypes for generated rpc server functions.
 
 
-o   Jeff Layton <jlayton@redhat.com>
-    * mount.cifs: use lock/unlock_mtab scheme from util-linux-ng mount prog.
+o   Holger Hetterich <hhetter@novell.com>
+    * Enable total anonymization in vfs_smb_traffic_analyzer.
 
 
-o   Derrell Lipman <derrell.lipman@unwireduniverse.com>
-    * BUG 5805: Don't close stdout when calling setup_logging multiple times.
+o   Bjoern Jacke <bj@sernet.de>
+    * Fix build with external dns_sd libraries.
+    * Fix configure check "sub-second timestamps without struct timespec".
+    * Add configure check for AIX style sub-second resolution support.
+    * Add configure check for Tru64 sub-second timestamp resolution.
+    * Add Tru64 sub-second resolution timestamp support.
+    * Enable IPv6 support for NetBSD and FreeBSD.
+    * Use correct BSD evironment variable.
 
 
-o   Stefan Metzmacher <metze@samba.org>
-    * Return an error instead of crashing when no realm is given.
+o   Guenter Kukkukk <linux@kukkukk.com>
+    * Don't try and delete a default ACL from a file.
+
 
+o   Volker Lendecke <vl@samba.org>
+    * BUG 5798: CFLAGS info lost in configure.
+    * Fix Coverity IDs 740, 742, 744, 745, 876, 879, 880.
+    * Fix remotely adding a share via the Windows MMC.
+    * Avoid valgrind errors.
+    * Fix 'net rpc join' for users with the SeMachineAccountPrivilege.
+    * Fix resume handle for _samr_EnumDomainGroups.
+    * Fix a buffer handling bug when adding lots of registry keys.
+    * Fix a O(n^2) algorithm in regdb_fetch_keys().
 
-o   TAKAHASHI Motonobu <monyo@samba.gr.jp>
-    * 5901: Fix default value for streams_depot location.
 
+o   Jeff Layton <jlayton@redhat.com>
+    * Initialize rc to 0 in main in mount.cifs.
 
-o   Tim Prouty <tim.prouty@isilon.com>
-    * Fix several build warnings.
 
+o   Derrell Lipman <derrell.lipman@unwireduniverse.com>
+    * BUG 6069: Add a fstatvfs function for libsmbclient.
+    * Eliminate compiler warnings.
 
-o   Andreas Schneider <mail@cynapses.org>
-    * Delete the krb5 ccname variable from the PAM environment if set.
-    * Add a function out of pam_sm_close_session to delete the credentials.
-    * Fix circular dependency error with autoconf 2.6.3.
 
+o   Glenn Machin <gmachin@sandia.gov>
+    * Don't miss an absolute pathname as a kerberos keytab path.
 
-o   Davide Sfriso <sfriso@virgilio.it>
-    * BUG 5906: Fix Winbind crash bug during 'getent group' on PDC.
 
+o   Stefan Metzmacher <metze@samba.org>
+    * BUG 6100: Implement _netr_LogonGetCapabilities() with
+      NT_STATUS_NOT_IMPLEMENTED.
+    * Make Samba work with older ctdb versions.
+    * Add S-1-22-X-Y sids to the local token.
 
-o   Dan Sledz <dsledz@isilon.com>
-    * Add FreeBSD configure check for backtrace_symbols.
-    * Allow SYSLOG_FACILITY to be modified with a new configure option called
-      --with-syslog-facility.
 
+o   Lars Mueller <lars@samba.org>
+    * Conditional install of the cifs.upcall man page.
+    * Adjust regex to match variable names including underscores.
 
-o   Joe Smith <yasumoto7@gmail.com>
-    * Fix typo in source/utils/net_rap.c.
 
+o   Shirish Pargaonkar <shirishpargaonkar@gmail.com>
+    * BUG 4370: Clean-up entries in /etc/mtab after unmount.
+    * Add fakemount (-f) and nomtab (-n) flags to mount.cifs.
 
-o   Martin Schwenke <martin@meltin.net>
-    * Prevent make errors for picky makes when $(EXTRA_ALL_TARGETS) is empty.
-    * Add @CIFSUPCALL_PROGS@ to "all" target so cifs.upcall gets built at
-      compile time rather than install time.
 
+o   Ted Percival <ted.percival@quest.com>
+    * Fix a crash during name resolution.
 
-o   Yasuma Takeda <yasuma@osstech.co.jp>
-    * BUG 5909: Fix MS-DFS links containing multibyte characters on Vista.
 
+o   Tim Prouty <tprouty@samba.org>
+    * Fix "assignment discards qualifiers from pointer target type"
+      warnings.
+    * Fix SMB_VFS_RECVFILE/SENDFILE macros.
 
-o   Bo Yang <boyang@novell.com>
-    * Fix broken msgids in ntstatus_errors.
-    * i18n/l10n pam_winbind
 
+o   Karolin Seeger <kseeger@samba.org>
+    * Change "ldap ssl:ads" parameter to "ldap ssl ads".
+    * Add manpages for vfs_acl_xattr and vfs_acl_tdb.
 
-Commit Highlights:
-------------------
 
-o   Michael Adam <obnox@samba.org>
-    * BUG 5609: Remove configure option "--with-libdir" and add
-      "--with-modulesdir".
-    * Extend "net rpc vampire keytab" to support differential replication
-      and storing of kerberos keys.
-    * Rework internal logic of registry tdb code.
-    * Freeze autogenerated prototype headers (good bye "make proto").
+o   Dan Sledz <dsledz@isilon.com>
+    * Fix double free caused by incorrect talloc_steal usage.
 
 
-o   Jeremy Allison <jra@samba.org>
-    * Add new "winbind reconnect delay" parameter.
-    * Make the change to smbcontrol for "all" to mean broadcast,
-      and "smbd" to mean the main smb daemon.
+o   Simo Sorce <idra@samba.org>
+    * Build ldbrename.
 
 
-o   Gerald W. Carter <jerry@samba.org>
-    * Add support for name aliasing in Winbind.
-    * Add the idmap/nss-info provider from Likewise Open.
-    * Allow an admin to define the "uid" attribute for a RFC2307
-      user object in AD to be the username alias.
-    * Add new idmap backend "adex" to support RFC2307 enabled AD forests.
+o   Aravind Srinivasan <aravind.srinivasan@isilon.com>
+    * Make nmbd check all available interfaces for WINS before failing.
 
 
-o   Guenther Deschner <gd@samba.org>
-    * BUG 5710: Fix changing of machine account passwords.
-    * Add "net rpc vampire keytab" and "net rpc vampire ldif".
+o   Miguel Suarez <Miguel.Suarez@stratus.com>
+    * Fix compilation of vfs_default on systems that do not support utimes().
 
 
-o   Volker Lendecke <vl@samba.org>
-    * Rework of the Winbind idmap backend.
-    * Fix calculation of useable_space for trans2 and nttrans replies.
-    * Add mapping of generic bits when setting an NFSv4 ACL.
+o   Yasuma Takeda <yasuma@osstech.co.jp>
+    * BUG 5920: Fix the calculation of the memcpy length.
+    * BUG 6098: Fix ads_find_dc() in setups with "security = domain".
+
+
+o   Bo Yang <boyang@novell.com>
+    * Make libsmbclient work with DFS.
 
 
 ######################################################################
index 2acef3e2432c012dc6fb552e74306c13420e877c..610d720d94301c361c7e8baf4e8aaf139db81889 100644 (file)
@@ -58,13 +58,15 @@ clean::
        rm -rf $(OUTPUTDIR)/* $(DOCBOOKDIR)
        rm -f $(patsubst %.svg,%.png,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) \
                        $(patsubst %.svg,%.pdf,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \
-                       $(patsubst %.svg,%.eps,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg)))
+                       $(patsubst %.svg,%.eps,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \
+                       $(patsubst %.svg,%.png,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg)))
        rm -f *-attributions.xml *.d *.tpt *.tex *.loc *.toc *.lof *.glo *.idx *.aux
        rm -f *-images-html*
        rm -f *-images-latex-* $(LATEX_FIGURES)
        rm -f xslt/figures/*pdf
        rm -f $(SMBDOTCONFDOC)/parameters.*.xml
        rm -f $(addsuffix .*,$(MAIN_DOCS))
+       rm -f build/catalog.xml
 
 # Output format targets
 pdf:: $(patsubst %,$(PDFDIR)/%.pdf,$(MAIN_DOCS))
@@ -320,7 +322,10 @@ xslt/man.xsl:
 xslt/pearson.xsl:
 
 distclean clobber:: clean
-       rm Makefile.settings config.status config.log configure
+       rm -f Makefile.settings config.status config.log
+
+realdistclean:: distclean
+       rm -f configure
        rm -rf autom4te.cache
 
 
index 6d144ab2e312a822f62c4db8e59f2ec559eb5d54..c9ccd433d7b1a4e7789472c673062ae598065b6c 100644 (file)
@@ -477,7 +477,7 @@ Password for ADMINISTRATOR@LONDON.ABMAS.BIZ:
 <screen>
 &rootprompt; smbd -D
 &rootprompt; nmbd -D
-&rootprompt; winbindd -B
+&rootprompt; winbindd -D
 </screen>
                </para></step>
 
index e03c0106b07a3ce4b9b3c88a082bd19208bf4b72..2e60b4a91c64554d5c75aa2f0a4bf8ba95b5dd0c 100644 (file)
@@ -1910,8 +1910,8 @@ Loaded services file OK.
 14290 ?        S      0:00 /usr/sbin/smbd -D
 
 $rootprompt; ps ax | grep winbind
-14293 ?        S     0:00 /usr/sbin/winbindd -B
-14295 ?        S     0:00 /usr/sbin/winbindd -B
+14293 ?        S     0:00 /usr/sbin/winbindd -D
+14295 ?        S     0:00 /usr/sbin/winbindd -D
 </screen>
                        The <command>winbindd</command> daemon is running in split mode (normal), so there are also
                        two instances<footnote><para>For more information regarding winbindd, see <emphasis>TOSHARG2</emphasis>, 
index ca39af306313763bd72d9aa45e26f1702d93e9a6..b1787498f2f1ea2aff43dfabdc5226ae7fb7c19e 100644 (file)
@@ -767,8 +767,8 @@ Ignoring unknown parameter "dogbert"
 14290 ?        S      0:00 /usr/sbin/smbd -D
 
 $rootprompt; ps ax | grep winbind
-14293 ?        S     0:00 /usr/sbin/winbindd -B
-14295 ?        S     0:00 /usr/sbin/winbindd -B
+14293 ?        S     0:00 /usr/sbin/winbindd -D
+14295 ?        S     0:00 /usr/sbin/winbindd -D
 </screen>
                        The <command>winbindd</command> daemon is running in split mode (normal), so there are also
                        two instances of it. For more information regarding <command>winbindd</command>, see
index 130da819e8d86f760dacb96d804511a0d4dd2716..1f1f51cf47df0152a23ab3d9c8a83e17c36520a7 100644 (file)
@@ -492,9 +492,9 @@ netbios-ns dgram udp wait root /usr/local/samba/sbin/nmbd nmbd
 
 <para><programlisting>
 #!/bin/sh
-/usr/local/samba/sbin/smbd -D 
-/usr/local/samba/sbin/winbindd -B
-/usr/local/samba/sbin/nmbd -D 
+/usr/local/samba/sbin/smbd -D
+/usr/local/samba/sbin/winbindd -D
+/usr/local/samba/sbin/nmbd -D
 </programlisting></para>
 
        <para>
index b2b3ebd5b15c6647223161b440196e5fe4675b92..d1895829a9569225beff0e8a5cc76d6b4dfbe887 100644 (file)
@@ -1850,7 +1850,7 @@ net idmap dump /var/lib/samba/winbindd_idmap.tdb &gt; idmap_dump.txt
        <para>
        The IDMAP dump file can be restored using the following command:
 <screen>
-net idmap restore &lt;full_path_and_tdb_filename&gt; &lt; dumpfile.txt
+net idmap restore idmap_dump.txt
 </screen>
        Where the Samba run-time tdb files are stored in the <filename>/var/lib/samba</filename> directory
     the following command can be used to restore the data to the tdb file:
index 7731e4e20646f6b41feca95e78c893440fc98706..adb0ba24d39997aeb3a6c7f56e94c622c60efb7c 100644 (file)
@@ -1016,7 +1016,7 @@ start() {
 in the example above with:
 
 <programlisting>
-        daemon /usr/local/samba/sbin/winbindd -B
+        daemon /usr/local/samba/sbin/winbindd -D
 </programlisting>.
 </para>
 
@@ -1125,7 +1125,7 @@ Again, if you would like to run Samba in dual daemon mode, replace:
 </programlisting>
 in the script above with:
 <programlisting>
-/usr/local/samba/sbin/winbindd -B
+/usr/local/samba/sbin/winbindd -D
 </programlisting>
 </para>
 
index 789042f78e186a47ae6c18216348afc4bf64a22f..37ecc99eebb95102a7113d6445b06eb4c779e37f 100644 (file)
@@ -86,7 +86,7 @@ Tom Haapanen (tomh@metrics.com)
     consulting firm located in Waterloo, Ontario, Canada.  We work
     with a variety of environments (such as Windows, Windows NT and
     Unix), tools and application areas, and can provide assistance for
-    development work ranging from a few days to to multiple man-year
+    development work ranging from a few days to multiple man-year
     projects.  You can find more information at http://www.metrics.com/.
     
 
index d2be5effa9255b7f62912ff9584206fdd1a3e5d3..44fcc0f289ff4952c960cac2cec30b313e35905d 100644 (file)
  <td valign="top">This book provides example configurations, it documents key aspects of Microsoft Windows networking, provides in-depth insight into the important configuration of Samba-3, and helps to put all of these into a useful framework.</td>
 </tr>
 <tr>
- <td valign="top"><a href="../using_samba/toc.html">Using Samba</a>, 2nd Edition</td>
+ <td valign="top"><a href="using_samba/toc.html">Using Samba</a>, 2nd Edition</td>
  <td valign="top"><i>Using Samba</i>, Second Edition is a comprehensive guide to Samba administration. It covers all versions of Samba from 2.0 to 2.2, including selected features from an alpha version of 3.0, as well as the SWAT graphical configuration tool. Updated for Windows 2000, ME, and XP, the book also explores Samba's new role as a primary domain controller and domain member server, its support for the use of Windows NT/2000/XP authentication and filesystem security on the host Unix system, and accessing shared files and printers from Unix clients.</td>
 </tr>
 <tr>
- <td valign="top"><a href="manpages-3/index.html">Man pages</a></td>
+ <td valign="top"><a href="manpages/index.html">Man pages</a></td>
  <td valign="top">The Samba man pages in HTML.</td>
 </tr>
 <tr>
  <td valign="top"><a href="../../WHATSNEW.txt">WHATSNEW</a></td>
   <td valign="top">Samba Release Notes.</td>
 </tr>
-<tr>
- <td valign="top"><a href="../../README.VENDOR">README.VENDOR</a></td>
-  <td valign="top">VENDOR specific information.</td>
-</tr>
 </table></body></html>
index 5faf0f7102a1dac582a94ac08da3fdd6e056210d..9782987890d7ae1ee6ab6f62418b5df202392e7e 100644 (file)
@@ -8,7 +8,7 @@
         <manvolnum>8</manvolnum>
         <refmiscinfo class="source">Samba</refmiscinfo>
         <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-        <refmiscinfo class="version">3.2</refmiscinfo>
+        <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 <refnamediv>
index 04ba02203227365a3c54949f7df43c5a9d1fba21..e7d838bfe0cbc83dfbaa7bc69e1c94ef960ce609 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
@@ -91,7 +91,7 @@
                </term>
                <listitem><para>
                The <command>-o write</command> reads event log
-               records from standard input and writes them to theSamba
+               records from standard input and writes them to the Samba
                event log store named by EVENTLOG.
                </para> </listitem>
                </varlistentry>
                </para></listitem>
 
                <listitem><para>
-               <command>SRN</command> - he name of the machine on
+               <command>SRN</command> - The name of the machine on
                which the eventlog was generated. This is typically the
                host name.
                </para></listitem>
index 482450891d37002ccf7bf7fb2eaafd869c73d363..0d094a7661498cbc81c268f0bf54206bcdfbac7b 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>1</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">User Commands</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index fb0792eb9e70d8cfbefe44b3e561b4c90e017255..a5aaa8d6c548befada29b530d5fb417de77f433a 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
@@ -23,8 +23,8 @@
        extensions. This module implements only the &quot;idmap&quot;
        API, and is READONLY. Mappings must be provided in advance
        by the administrator by adding the posixAccount/posixGroup
-       classess and relative attribute/value pairs to the users and
-       groups objects in AD</para>
+       classes and relative attribute/value pairs to the user and
+       group objects in the AD.</para>
 </refsynopsisdiv>
 
 <refsect1>
@@ -34,7 +34,7 @@
                <varlistentry>
                <term>range = low - high</term>
                <listitem><para>
-                       Defines the available matching uid and gid range for which the
+                       Defines the available matching UID and GID range for which the
                        backend is authoritative. Note that the range acts as a filter.
                        If specified any UID or GID stored in AD that fall outside the
                        range is ignored and the corresponding map is discarded.
@@ -47,7 +47,7 @@
                <listitem><para>
                        Defines the schema that idmap_ad should use when querying
                        Active Directory regarding user and group information.
-                       This can either the RFC2307 schema support included
+                       This can be either the RFC2307 schema support included
                        in Windows 2003 R2 or the Service for Unix (SFU) schema.
                </para></listitem>
                </varlistentry>
@@ -58,8 +58,8 @@
        <title>EXAMPLES</title>
        <para>
        The following example shows how to retrieve idmappings from our principal and
-       and trusted AD domains. All is needed is to set default to yes. If trusted
-       domains are present id conflicts must be resolved beforehand, there is no
+       and trusted AD domains. If trusted domains are present id conflicts must be
+       resolved beforehand, there is no
        guarantee on the order conflicting mappings would be resolved at this point.
 
        This example also shows how to leave a small non conflicting range for local
index 9eb2ff7d461e596e308189c972ec57adb1ca84d9..3668c71daa1a5433efceb29d732470a3f7915c18 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 8e452b3c8952def4d80a6b51b2e63b6428c477f6..0e2fcfad4f83e54c361dd743500dea08428fd96e 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
@@ -37,7 +37,7 @@
                    Specifies the absolute path to the name mapping
                    file used by the nss_info API.  Entries in the file
                    are of the form &quot;<replaceable>unix name</replaceable>
-                   = <replaceable>qualified domain name</replaceable>&quote;.
+                   = <replaceable>qualified domain name</replaceable>&quot;.
                    Mapping of both user and group names is supported.
                </para></listitem>
                </varlistentry>
index c09c141bb49ecdfd66a660158f413630586c0223..603f80023243c5b6f464208c018404c1e67b07e3 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
 
        <para>The idmap_ldap plugin provides a means for Winbind to
        store and retrieve SID/uid/gid mapping tables in an LDAP directory
-       service.  The module implements both the &quot;idmap&quot; and
-       &quot;idmap alloc&quot; APIs.
+       service.
+       </para>
+
+       <para>
+       In contrast to read only backends like idmap_rid, it is an allocating
+       backend: This means that it needs to allocate new user and group IDs in
+       order to create new mappings. The allocator can be provided by the
+       idmap_ldap backend itself or by any other allocating backend like
+       idmap_tdb or idmap_tdb2. This is configured with the
+       parameter <parameter>idmap alloc backend</parameter>.
+       </para>
+
+       <para>
+       Note that in order for this (or any other allocating) backend to
+       function at all, the default backend needs to be writeable.
+       The ranges used for uid and gid allocation are the default ranges
+       configured by &quot;idmap uid&quot; and &quot;idmap gid&quot;.
+       </para>
+
+       <para>
+       Furthermore, since there is only one global allocating backend
+       responsible for all domains using writeable idmap backends,
+       any explicitly configured domain with idmap backend ldap
+       should have the same range as the default range, since it needs
+       to use the global uid / gid allocator. See the example below.
        </para>
 </refsynopsisdiv>
 
                <term>range = low - high</term>
                 <listitem><para>
                        Defines the available matching uid and gid range for which the
-                       backend is authoritative.  Note that the range commonly matches
-                       the allocation range due to the fact that the same backend will
-                       store and retrieve SID/uid/gid mapping entries.  If the parameter
-                       is absent, Winbind fail over to use the &quot;idmap uid&quot; and
-                       &quot;idmap gid&quot; options from smb.conf.
+                       backend is authoritative.
+                       If the parameter is absent, Winbind fails over to use the
+                       &quot;idmap uid&quot; and &quot;idmap gid&quot; options
+                       from smb.conf.
                 </para></listitem>
                 </varlistentry>
        </variablelist>
index 7d3503bcd1cd426691f1ee575343b68f51b36d7a..be5c2d88cfa91e570c6abd53f5b31d777c9f0187 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 5eba356a7df999eae3d4fc2011e828988b31c906..6839bc8e1f5525f7029c3fc1ab12fe44d1e56afc 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 4258d95ac67a0231704c17a2743cda10c61398d8..9c44f1a3171e3dce8f765b8a33723e10567bc4be 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
 <refsynopsisdiv>
        <title>DESCRIPTION</title>
 
-       <para>The idmap_tdb plugin is the default backend used by winbindd
-       for storing SID/uid/gid mapping tables and implements
-       both the &quot;idmap&quot; and &quot;idmap alloc&quot; APIs.
+       <para>
+       The idmap_tdb plugin is the default backend used by winbindd
+       for storing SID/uid/gid mapping tables.
+       </para>
+
+       <para>
+       In contrast to read only backends like idmap_rid, it is an allocating
+       backend: This means that it needs to allocate new user and group IDs in
+       order to create new mappings. The allocator can be provided by the
+       idmap_tdb backend itself or by any other allocating backend like
+       idmap_ldap or idmap_tdb2. This is configured with the
+       parameter <parameter>idmap alloc backend</parameter>.
+       </para>
+
+       <para>
+       Note that in order for this (or any other allocating) backend to
+       function at all, the default backend needs to be writeable.
+       The ranges used for uid and gid allocation are the default ranges
+       configured by &quot;idmap uid&quot; and &quot;idmap gid&quot;.
+       </para>
+
+       <para>
+       Furthermore, since there is only one global allocating backend
+       responsible for all domains using writeable idmap backends,
+       any explicitly configured domain with idmap backend tdb
+       should have the same range as the default range, since it needs
+       to use the global uid / gid allocator. See the example below.
        </para>
 </refsynopsisdiv>
 
                <term>range = low - high</term>
                 <listitem><para>
                        Defines the available matching uid and gid range for which the
-                       backend is authoritative.  Note that the range commonly matches
-                       the allocation range due to the fact that the same backend will
-                       store and retrieve SID/uid/gid mapping entries.  If the parameter
-                       is absent, Winbind fail over to use the &quot;idmap uid&quot; and
-                       &quot;idmap gid&quot; options from smb.conf.
+                       backend is authoritative.
+                       If the parameter is absent, Winbind fails over to use
+                       the &quot;idmap uid&quot; and &quot;idmap gid&quot; options
+                       from smb.conf.
                 </para></listitem>
                 </varlistentry>
        </variablelist>
 </refsect1>
 
 <refsect1>
-       <title>IDMAP ALLOC OPTIONS</title>
+       <title>EXAMPLES</title>
 
-       <variablelist>
-                <varlistentry>
-               <term>range = low - high</term>
-                <listitem><para>
-                       Defines the available matching uid and gid range from which
-                       winbindd can allocate for users and groups.  If the parameter
-                       is absent, Winbind fail over to use the &quot;idmap uid&quot;
-                       and &quot;idmap gid&quot; options from smb.conf.
-                </para></listitem>
-                </varlistentry>
-       </variablelist>
+       <para>
+       This example shows how tdb is used as a the default idmap backend.
+       It configures the idmap range through the global options for all
+       domains encountered. This same range is used for uid/gid allocation.
+       </para>
+
+       <programlisting>
+       [global]
+       # "idmap backend = tdb" is redundant here since it is the default
+       idmap backend = tdb
+       idmap uid = 1000000-2000000
+       idmap gid = 1000000-2000000
+       </programlisting>
+
+       <para>
+       This (rather theoretical) example shows how tdb can be used as the
+       allocating backend while ldap is the default backend used to store
+       the mappings.
+       It adds an explicit configuration for some domain DOM1, that
+       uses the tdb idmap backend. Note that the same range as the
+       default uid/gid range is used, since the allocator has to serve
+       both the default backend and the explicitly configured domain DOM1.
+       </para>
+
+       <programlisting>
+       [global]
+       idmap backend = ldap
+       idmap uid = 1000000-2000000
+       idmap gid = 1000000-2000000
+       # use a different uid/gid allocator:
+       idmap alloc backend = tdb
+
+       idmap config DOM1 : backend = tdb
+       idmap config DOM1 : range = 1000000-2000000
+       </programlisting>
 </refsect1>
 
 <refsect1>
diff --git a/docs-xml/manpages-3/idmap_tdb2.8.xml b/docs-xml/manpages-3/idmap_tdb2.8.xml
new file mode 100644 (file)
index 0000000..4f19ba1
--- /dev/null
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<refentry id="idmap_tdb2.8">
+
+<refmeta>
+       <refentrytitle>idmap_tdb2</refentrytitle>
+       <manvolnum>8</manvolnum>
+       <refmiscinfo class="source">Samba</refmiscinfo>
+       <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+       <refname>idmap_tdb2</refname>
+       <refpurpose>Samba's idmap_tdb2 Backend for Winbind</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+       <title>DESCRIPTION</title>
+
+       <para>
+       The idmap_tdb2 plugin is a substitute for the default idmap_tdb
+       backend used by winbindd for storing SID/uid/gid mapping tables
+       in clustered environments with Samba and CTDB.
+       </para>
+
+       <para>
+       In contrast to read only backends like idmap_rid, it is an allocating
+       backend: This means that it needs to allocate new user and group IDs in
+       order to create new mappings. The allocator can be provided by the
+       idmap_tdb2 backend itself or by any other allocating backend like
+       idmap_tdb or idmap_ldap. This is configured with the
+       parameter <parameter>idmap alloc backend</parameter>.
+       </para>
+
+       <para>
+       Note that in order for this (or any other allocating) backend to
+       function at all, the default backend needs to be writeable.
+       The ranges used for uid and gid allocation are the default ranges
+       configured by &quot;idmap uid&quot; and &quot;idmap gid&quot;.
+       </para>
+
+       <para>
+       Furthermore, since there is only one global allocating backend
+       responsible for all domains using writeable idmap backends,
+       any explicitly configured domain with idmap backend tdb2
+       should have the same range as the default range, since it needs
+       to use the global uid / gid allocator. See the example below.
+       </para>
+</refsynopsisdiv>
+
+<refsect1>
+       <title>IDMAP OPTIONS</title>
+
+       <variablelist>
+               <varlistentry>
+               <term>range = low - high</term>
+               <listitem><para>
+                       Defines the available matching uid and gid range for which the
+                       backend is authoritative.
+                       If the parameter is absent, Winbind fails over to use
+                       the &quot;idmap uid&quot; and &quot;idmap gid&quot; options
+                       from smb.conf.
+               </para></listitem>
+               </varlistentry>
+       </variablelist>
+</refsect1>
+
+<refsect1>
+       <title>IDMAP SCRIPT</title>
+
+       <para>
+       The tdb2 idmap backend supports a script for performing id mappings
+       through the smb.conf option <parameter>idmap : script</parameter>.
+       The script should accept the following command line options.
+       </para>
+
+       <programlisting>
+       SIDTOID S-1-xxxx
+       IDTOSID UID xxxx
+       IDTOSID GID xxxx
+       </programlisting>
+
+       <para>
+       And it should return one of the following responses as a single line of
+       text.
+       </para>
+
+       <programlisting>
+       UID:yyyy
+       GID:yyyy
+       SID:yyyy
+       ERR:yyyy
+       </programlisting>
+
+       <para>
+       Note that the script should cover the complete range of SIDs
+       that can be passed in for SID to Unix ID mapping, since otherwise
+       SIDs unmapped by the script might get mapped to IDs that had
+       previously been mapped by the script.
+       </para>
+</refsect1>
+
+<refsect1>
+       <title>EXAMPLES</title>
+
+       <para>
+       This example shows how tdb2 is used as a the default idmap backend.
+       It configures the idmap range through the global options for all
+       domains encountered. This same range is used for uid/gid allocation.
+       </para>
+
+       <programlisting>
+       [global]
+       idmap backend = tdb2
+       idmap uid = 1000000-2000000
+       idmap gid = 1000000-2000000
+       </programlisting>
+</refsect1>
+
+<refsect1>
+       <title>AUTHOR</title>
+
+       <para>
+       The original Samba software and related utilities
+       were created by Andrew Tridgell. Samba is now developed
+       by the Samba Team as an Open Source project similar
+       to the way the Linux kernel is developed.
+       </para>
+</refsect1>
+
+</refentry>
index a19422a438dcf48446d19fd000d7175fb799b727..564b92be359c922f4d6ba667868a1ebb801d34c8 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>3</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">C Library Functions</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 <refnamediv>
index fb57be29c60970598d11b18fb75d5592a841479a..4f7f51edf4fa8e521155294e3ae31933f58b695f 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>1</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">User Commands</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 158c5f1a764ce64e35baf3d40e1744e2e516b3cd..ef7f928a133bad5cf2397118e1e9cf4ea8865d84 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>1</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">User Commands</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 2d11ca94f73dfb44b87cc3db128fbf15a5319cf8..4c1a5a019d8ce8a3dd8e5658e3d604beba1b4e48 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>1</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">User Commands</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
     </refmeta>
 
 
index a46ae5047b5f9ba6b44a957807dbd7a9ed55f728..bab043c7efff8df545f26ace3e4d610edac7a5a3 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>1</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">User Commands</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/ldbrename.1.xml b/docs-xml/manpages-3/ldbrename.1.xml
new file mode 100644 (file)
index 0000000..391ec84
--- /dev/null
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<refentry id="ldbrename.1">
+
+<refmeta>
+       <refentrytitle>ldbrename</refentrytitle>
+       <manvolnum>1</manvolnum>
+</refmeta>
+
+
+<refnamediv>
+       <refname>ldbrename</refname>
+       <refpurpose>Edit LDB databases using your favorite editor</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+       <cmdsynopsis>
+               <command>ldbrename</command>
+               <arg choice="opt">-h</arg>
+               <arg choice="opt">-o options</arg>
+               <arg choice="req">olddn</arg>
+               <arg choice="req">newdb</arg>
+       </cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+       <title>DESCRIPTION</title>
+
+       <para>ldbrename is a utility that allows you to rename trees in 
+               an LDB database based by DN. This utility takes 
+               two arguments: the original 
+               DN name of the top element and the DN to change it to.
+       </para>
+
+</refsect1>
+
+
+<refsect1>
+       <title>OPTIONS</title>
+
+       <variablelist>
+               <varlistentry>
+               <term>-h</term>
+               <listitem><para>
+               Show list of available options.</para></listitem>
+               </varlistentry>
+
+               <varlistentry>
+                       <term>-H &lt;ldb-url&gt;</term>
+                       <listitem><para>
+                               LDB URL to connect to. See ldb(7) for details.
+                       </para></listitem>
+               </varlistentry>
+
+               <varlistentry>
+                       <term>-o options</term>
+                       <listitem><para>Extra ldb options, such as 
+                       modules.</para></listitem>
+               </varlistentry>
+               
+       </variablelist>
+       
+</refsect1>
+
+<refsect1>
+       <title>ENVIRONMENT</title>
+
+       <variablelist>
+               <varlistentry><term>LDB_URL</term>
+                       <listitem><para>LDB URL to connect to (can be overrided by using the 
+                                       -H command-line option.)</para></listitem>
+               </varlistentry>
+       </variablelist>
+       
+</refsect1>
+
+<refsect1>
+       <title>VERSION</title>
+
+       <para>This man page is correct for version 4.0 of the Samba suite.</para>
+</refsect1>
+
+<refsect1>
+       <title>SEE ALSO</title>
+
+       <para>ldb(7), ldbmodify, ldbdel, ldif(5)</para>
+
+</refsect1>
+
+<refsect1>
+       <title>AUTHOR</title>
+
+       <para> ldb was written by 
+                <ulink url="http://samba.org/~tridge/">Andrew Tridgell</ulink>.
+       </para>
+
+       <para>
+If you wish to report a problem or make a suggestion then please see
+the <ulink url="http://ldb.samba.org/"/> web site for
+current contact and maintainer information.
+       </para>
+
+       <para>This manpage was written by Jelmer Vernooij.</para>
+       
+</refsect1>
+
+</refentry>
index 398860bca02600e60a34dc2312de81b8d0eebf70..2e855d1878d9203a5c2e0b09a4d3fd713b8612f1 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>1</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">User Commands</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index ec9500420be5a19d8378194a279848eb2493d8e6..990f0cbaa060230ad4c61f2715a5faffad6338df 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>7</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">7</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
 
 <refsynopsisdiv>
        <cmdsynopsis>
-               <command>Browser URL:</command>
        <para>
-        smb://[[[domain:]user[:password@]]server[/share[/path[/file]]]] [?options]
-    </para>
+       Browser URL:
+       <command moreinfo="none">smb://[[[domain:]user[:password@]]server[/share[/path[/file]]]] [?options]
+       </command>
+       </para>
        </cmdsynopsis>
 </refsynopsisdiv>
 
index fca0616d6401e42f5954101e36b150567d5cbcf4..358c0dc3ad0edb41bae2cb6eb61609165a73431b 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>5</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">File Formats and Conventions</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index d6debe7b96596153fc54b03d7e75d1940c53846f..548813294be94f5efded322031aa1ad81bf76caa 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>1</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">User Commands</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 51a22b3879400ec35313cbf812e1bf77701f8be2..dae54e1d97ba918987ec1b8033c35448474ae7fb 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
@@ -43,10 +43,13 @@ by the popular Open Source server Samba.
        </para>
 
        <para>
-       The mount.cifs utility attaches the UNC name (exported network resource) to
-       the local directory <emphasis>mount-point</emphasis>. It is possible to set the mode for mount.cifs to 
-setuid root to allow non-root users to mount shares to directories for which they
-have write permission.
+       The mount.cifs utility attaches the UNC name (exported network resource)
+       specified as <emphasis>service</emphasis> (using //server/share syntax,
+       where "server" is the server name or IP address and "share" is the name
+       of the share) to the local directory <emphasis>mount-point</emphasis>.
+       It is possible to set the mode for mount.cifs to setuid root to allow
+       non-root users to mount shares to directories for which they
+       have write permission.
        </para>
 
        <para>
@@ -89,7 +92,7 @@ to be specified as part of the username.
 
                <listitem><para>specifies the CIFS password. If this
 option is not given then the environment variable
-<emphasis>PASSWD</emphasis> is used. If the password is not specified 
+<emphasis>PASSWD</emphasis> is used. If the password is not specified
 directly or indirectly via an argument to mount, <emphasis>mount.cifs</emphasis> will prompt
 for a password, unless the guest option is specified.
 </para>
@@ -106,14 +109,16 @@ below) or entered at the password prompt will be read correctly.
 
                <listitem><para>
                                specifies a file that contains a username
-                               and/or password. The format of the file is:
+                               and/or password and optionally the name of the
+                               workgroup. The format of the file is:
                        </para>
 
 <programlisting>
                username=<replaceable>value</replaceable>
                password=<replaceable>value</replaceable>
+               workgroup=<replaceable>value</replaceable>
 </programlisting>
-               
+
                <para>
 This is preferred over having passwords in plaintext in a
 shared file, such as <filename>/etc/fstab</filename>. Be sure to protect any
@@ -135,7 +140,7 @@ credentials file properly.
                 same domain (e.g. running winbind or nss_ldap) and
                 the server supports the Unix Extensions then the uid
                 and gid can be retrieved from the server (and uid
-                and gid would not have to be specifed on the mount. 
+                and gid would not have to be specified on the mount.
                 For servers which do not support the CIFS Unix
                 extensions, the default uid (and gid) returned on lookup 
                 of existing files will be the uid (gid) of the person
@@ -367,9 +372,9 @@ port 445 is tried and if no response then port 139 is tried.
                 <term>noacl</term>
                 <listitem><para>Do not allow POSIX ACL operations even if server would support them.</para><para>
                The CIFS client can get and set POSIX ACLs (getfacl, setfacl) to Samba servers
-               version 3.10 and later.  Setting POSIX ACLs requires enabling both XATTR and
+               version 3.0.10 and later.  Setting POSIX ACLs requires enabling both XATTR and
                then POSIX support in the CIFS configuration options when building the cifs
-               module.  POSIX ACL support can be disabled on a per mount basic by specifying
+               module.  POSIX ACL support can be disabled on a per mount basis by specifying
                "noacl" on mount.</para>
                </listitem>
        </varlistentry>
index 75f85e1c553984874765ee3243a2ea3fcc91999f..1fb720a239d48e1f557e91d926919c665a341123 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 19e6f4fb8f07d4b2d80e3af576f70e2975914240..207be7805ed7b3a5eae88ffcc72733871fde2c8f 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 85640da0332b6836c27f07c1a8e5cb0105920873..9eadbb05a78859f2888c0defb30bfe0073e69f65 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>1</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">User Commands</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 50085d410d8af165d784a84c3ff12e09ced9da08..ac2332673262eccc1e4f44e1086aa4f701ac398d 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>1</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">User Commands</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 7f233c13862c79b65b2a02810a4338311d283e8f..23fcafc44a8bae2d1842f73fe62383279aa29b57 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>7</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">7</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 41dc9b00782cc7c53632eb676393f9fa24086209..d761f0ba89d3286aee3d856b6e5be6381f95555d 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 0d3224d6e167c440d3c2108c88ace8c98c129c70..bd6c9ca609bc8416e2faf7e01e80ff5a762f6110 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>1</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">User Commands</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 2c2e42a2a7c44b1200487462f5de0b018a89b94d..9d4be8083e1d7751a79777d8587e580bf1ad7339 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>1</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">User Commands</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index a83c7a066f8519000cf10b599f44fef18a06b435..708bcb71de7a585c0897184c6f4dc6e69e8d7810 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>7</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">Miscellanea</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/sharesec.1.xml b/docs-xml/manpages-3/sharesec.1.xml
new file mode 100644 (file)
index 0000000..d8ac510
--- /dev/null
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<refentry id="sharesec.1">
+
+<refmeta>
+       <refentrytitle>sharesec</refentrytitle>
+       <manvolnum>1</manvolnum>
+       <refmiscinfo class="source">Samba</refmiscinfo>
+       <refmiscinfo class="manual">User Commands</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+       <refname>sharesec</refname>
+       <refpurpose>Set or get share ACLs</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+       <cmdsynopsis>
+               <command>sharesec</command>
+               <arg choice="req">sharename</arg>
+               <arg choice="opt">-r, --remove=ACL</arg>
+               <arg choice="opt">-m, --modify=ACL</arg>
+               <arg choice="opt">-a, --add=ACL</arg>
+               <arg choice="opt">-R, --replace=ACLs</arg>
+               <arg choice="opt">-D, --delete</arg>
+               <arg choice="opt">-v, --view</arg>
+               <arg choice="opt">-M, --machine-sid</arg>
+               <arg choice="opt">-F, --force</arg>
+               <arg choice="opt">-d, --debuglevel=DEBUGLEVEL</arg>
+               <arg choice="opt">-s, --configfile=CONFIGFILE</arg>
+               <arg choice="opt">-l, --log-basename=LOGFILEBASE</arg>
+               <arg choice="opt">-V, --version</arg>
+               <arg choice="opt">-?, --help</arg>
+               <arg choice="opt">--usage</arg>
+       </cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+       <title>DESCRIPTION</title>
+
+       <para>This tool is part of the <citerefentry><refentrytitle>samba</refentrytitle>
+       <manvolnum>7</manvolnum></citerefentry> suite.</para>
+
+       <para>The <command>sharesec</command> program manipulates share permissions
+       on SMB file shares.</para>
+</refsect1>
+
+
+<refsect1>
+       <title>OPTIONS</title>
+
+       <para>The following options are available to the <command>sharesec</command> program.
+       The format of ACLs is described in the section ACL FORMAT </para>
+
+       <variablelist>
+               <varlistentry>
+               <term>-a|--add=ACL</term>
+               <listitem><para>Add the ACEs specified to the ACL list.
+               </para></listitem>
+               </varlistentry>
+
+               <varlistentry>
+               <term>-D|--delete</term>
+               <listitem><para>Delete the entire security descriptor.
+               </para></listitem>
+               </varlistentry>
+
+               <varlistentry>
+               <term>-F|--force</term>
+               <listitem><para>Force storing the ACL.
+               </para></listitem>
+               </varlistentry>
+
+               <varlistentry>
+               <term>-m|--modify=ACL</term>
+               <listitem><para>Modify existing ACEs.
+               </para></listitem>
+               </varlistentry>
+
+               <varlistentry>
+               <term>-M|--machine-sid</term>
+               <listitem><para>Initialize the machine SID.
+               </para></listitem>
+               </varlistentry>
+
+               <varlistentry>
+               <term>-r|--remove=ACL</term>
+               <listitem><para>Remove ACEs.
+               </para></listitem>
+               </varlistentry>
+
+               <varlistentry>
+               <term>-R|--replace=ACLS</term>
+               <listitem><para>
+               Overwrite an existing share permission ACL.
+               </para></listitem>
+               </varlistentry>
+
+               &stdarg.help;
+               &stdarg.server.debug;
+               &popt.common.samba;
+       </variablelist>
+</refsect1>
+
+
+<refsect1>
+       <title>ACL FORMAT</title>
+
+       <para>The format of an ACL is one or more ACL entries separated by
+       either commas or newlines.  An ACL entry is one of the following: </para>
+
+       <para><programlisting>
+       REVISION:&lt;revision number&gt;
+       OWNER:&lt;sid or name&gt;
+       GROUP:&lt;sid or name&gt;
+       ACL:&lt;sid or name&gt;:&lt;type&gt;/&lt;flags&gt;/&lt;mask&gt;
+       </programlisting></para>
+
+       <para>The revision of the ACL specifies the internal Windows
+       NT ACL revision for the security descriptor.
+       If not specified it defaults to 1. Using values other than 1 may
+       cause strange behaviour.</para>
+
+       <para>The owner and group specify the owner and group SIDs for the
+       object. If a SID in the format S-1-x-y-z is specified this is used,
+       otherwise the name specified is resolved using the server on which
+       the file or directory resides.</para>
+
+       <para>ACLs specify permissions granted to the SID. This SID
+       can be specified in S-1-x-y-z format or as a name in which case
+       it is resolved against the server on which the file or directory
+       resides.  The type, flags and mask values determine the type of
+       access granted to the SID.</para>
+
+       <para>The type can be either ALLOWED or DENIED to allow/deny access
+       to the SID. The flags values are generally zero for share ACLs.
+       </para>
+
+       <para>The mask is a value which expresses the access right
+       granted to the SID. It can be given as a decimal or hexadecimal value,
+       or by using one of the following text strings which map to the NT
+       file permissions of the same name.</para>
+
+       <itemizedlist>
+               <listitem><para><emphasis>R</emphasis> - Allow read access </para></listitem>
+               <listitem><para><emphasis>W</emphasis> - Allow write access</para></listitem>
+               <listitem><para><emphasis>X</emphasis> - Execute permission on the object</para></listitem>
+               <listitem><para><emphasis>D</emphasis> - Delete the object</para></listitem>
+               <listitem><para><emphasis>P</emphasis> - Change permissions</para></listitem>
+               <listitem><para><emphasis>O</emphasis> - Take ownership</para></listitem>
+       </itemizedlist>
+
+       <para>The following combined permissions can be specified:</para>
+
+       <itemizedlist>
+               <listitem><para><emphasis>READ</emphasis> -  Equivalent to 'RX'
+               permissions</para></listitem>
+               <listitem><para><emphasis>CHANGE</emphasis> - Equivalent to 'RXWD' permissions
+               </para></listitem>
+               <listitem><para><emphasis>FULL</emphasis> - Equivalent to 'RWXDPO'
+               permissions</para></listitem>
+       </itemizedlist>
+       </refsect1>
+
+<refsect1>
+       <title>EXIT STATUS</title>
+
+       <para>The <command>sharesec</command> program sets the exit status
+       depending on the success or otherwise of the operations performed.
+       The exit status may be one of the following values. </para>
+
+       <para>If the operation succeeded, sharesec returns and exit
+       status of 0.  If <command>sharesec</command> couldn't connect to the specified server,
+       or there was an error getting or setting the ACLs, an exit status
+       of 1 is returned.  If there was an error parsing any command line
+       arguments, an exit status of 2 is returned. </para>
+</refsect1>
+
+<refsect1>
+       <title>EXAMPLES</title>
+
+       <para>Add full access for SID
+       <parameter>S-1-5-21-1866488690-1365729215-3963860297-17724</parameter> on
+       <parameter>share</parameter>:
+       </para>
+
+       <programlisting>
+       host:~ # sharesec share -a S-1-5-21-1866488690-1365729215-3963860297-17724:ALLOWED/0/FULL
+       </programlisting>
+
+       <para>List all ACEs for <parameter>share</parameter>:
+       </para>
+
+       <programlisting>
+       host:~ # sharesec share -v
+       REVISION:1
+       OWNER:(NULL SID)
+       GROUP:(NULL SID)
+       ACL:S-1-1-0:ALLOWED/0/0x101f01ff
+       ACL:S-1-5-21-1866488690-1365729215-3963860297-17724:ALLOWED/0/FULL
+       </programlisting>
+</refsect1>
+
+<refsect1>
+       <title>VERSION</title>
+
+       <para>This man page is correct for version 3 of the Samba suite.</para>
+</refsect1>
+
+<refsect1>
+       <title>AUTHOR</title>
+       <para>The original Samba software and related utilities
+       were created by Andrew Tridgell. Samba is now developed
+       by the Samba Team as an Open Source project similar
+       to the way the Linux kernel is developed.</para>
+</refsect1>
+
+</refentry>
index bb157e54d66e9f95ec363bf5e63827271fb80b98..1f60c3de7006f02853f78e1a849a62f3f262c57e 100644 (file)
@@ -6,7 +6,7 @@
        <manvolnum>5</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">File Formats and Conventions</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index d00bc9043c2df412b8391928eba5943a2fefcb9b..5a184b3091090a6250538f257f3fb0c4ce942fdc 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>1</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">User Commands</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index e2662cc08dc3c28e770ff7ac8e21d760dd1e6cb0..f8089021e488611f4cf416fda9809be2d78a4072 100644 (file)
@@ -7,13 +7,13 @@
        <manvolnum>1</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">User Commands</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
 <refnamediv>
        <refname>smbclient</refname>
-       <refpurpose>ftp-like client to access SMB/CIFS resources 
+       <refpurpose>ftp-like client to access SMB/CIFS resources
        on servers</refpurpose>
 </refnamediv>
 
@@ -30,6 +30,7 @@
                <arg choice="opt">-m maxprotocol</arg>
                <arg choice="opt">-A authfile</arg>
                <arg choice="opt">-N</arg>
+               <arg choice="opt">-g</arg>
                <arg choice="opt">-i scope</arg>
                <arg choice="opt">-O &lt;socket options&gt;</arg>
                <arg choice="opt">-p port</arg>
@@ -39,7 +40,7 @@
                <arg choice="opt">-P</arg>
                <arg choice="opt">-c &lt;command&gt;</arg>
        </cmdsynopsis>
-               
+
        <cmdsynopsis>
                <command>smbclient</command>
                <arg choice="req">servicename</arg>
@@ -54,6 +55,7 @@
                <arg choice="opt">-m maxprotocol</arg>
                <arg choice="opt">-A authfile</arg>
                <arg choice="opt">-N</arg>
+               <arg choice="opt">-g</arg>
                <arg choice="opt">-l log-basename</arg>
                <arg choice="opt">-I destinationIP</arg>
                <arg choice="opt">-E</arg>
                on your WfWg PCs if you want them to always be able to receive 
                messages. </para></listitem>
                </varlistentry>
-               
+
                <varlistentry>
                <term>-p port</term>
                <listitem><para>This number is the TCP port number that will be used 
                TCP port number for an SMB/CIFS server is 139, which is the 
                default. </para></listitem>
                </varlistentry>
-               
+
+               <varlistentry>
+               <term>-g</term>
+               <listitem><para>This parameter provides combined with
+               <parameter>-L</parameter> easy parseable output that allows processing
+               with utilities such as grep and cut.
+               </para></listitem>
+               </varlistentry>
+
                <varlistentry>
                <term>-P</term>
                <listitem><para>
                Make queries to the external server using the machine account of the local server.
                </para></listitem>
                </varlistentry>
-               
+
                &stdarg.help;
-               
+
                <varlistentry>
                <term>-I IP-address</term>
-               <listitem><para><replaceable>IP address</replaceable> is the address of the server to connect to. 
+               <listitem><para><replaceable>IP address</replaceable> is the address of the server to connect to.
                It should be specified in standard "a.b.c.d" notation. </para>
 
                <para>Normally the client would attempt to locate a named 
index f8c31bb1b915546051a243154d5a021f5ad6ac27..46dd6605a567a0e90fb499ba39f4b116a2e67b6b 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>1</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">User Commands</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 76ac980333ce78aab0eaa2d8c5d9dbcc6246c342..6c783b38809f5bf33682fcbc1d2475fd197983ab 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>1</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">User Commands</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index d27eb3a2e86fc73618d8b444a570d565943c60b8..54de1d9f626e70beb7db79b485e1636b61cb8ef4 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index bcbad602daaf2634b04a9ef81b6a62351150ff6f..bf814d3e60fffd9f51039122da546117dd04ae8c 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>1</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">User Commands</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index f7d17d453599276ed801b26398c790cfd4ab5212..6e977d481942630bea52058ff721da4160cafc08 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>5</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">File Formats and Conventions</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 4734ebb2c99331c137bb852a39841ce7f4a3ab21..bdd0791b66456c095e6ffc46791e817dd2195bf7 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>5</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">File Formats and Conventions</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 40acb58ac8e23c2c610847758e0d38ef340687d1..2618752dbf9d3cc5ba5efcc3e019ce4c89040bec 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index c15423816edb302df7c859d7a29ad50a4f0b85c9..918ab0c01076c2c2139660da6c84f6a6ad001495 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 493ec8d9170ecfe428bc00ad04710f04bdaf0504..e5b8a4a14d931996a299b7b72e22ac2ff9915673 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>1</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">User Commands</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index d3037f3b12df51e15d449df6408df216c5f9a8dd..924fc46979bdcc7509f8b03d2c0eac9565066e7e 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>1</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">User Commands</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 7e6dc545bfe9a5a53157839e08f8e161eec11412..f7fe808e5b8c5c5fd7fe4f39cf1017ec9adbaa75 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>1</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">User Commands</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index f4251a1393048edd741b58461ddc5b7020d9412d..d944959ad22fdf15f75dfb2fdbf090344819eb43 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index bf756868bdf6011344e9fe2648af7b25a78ae266..58a6490dcb1a6b61111297aabe06cc55f2ec1b1e 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 8b8e4501d0b8bdfd70ac2e7b6bc72f3f31b93f88..594978c9cc1b0ad9c0280a7685237b4335448286 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 3f5dec4ecd8cb90ff4ad2b388b6e7cd7f5c99559..c4b9127dae818157c1da71d2c4b1c63bfd7570a5 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
                </para></listitem>
                </varlistentry>
 
+               <varlistentry>
+               <term>
+               <option>check</option>
+               </term>
+               <listitem><para>Check the integrity of the current database.
+               </para></listitem>
+               </varlistentry>
+
                <varlistentry>
                <term>
                <option>quit</option>
index 87a427ff05fe53ee540c49f8220c46a73082713b..ab044b14ed86d77e8cbf5ec2b1568bd12ceed3bb 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>1</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">User Commands</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 38ce24228dc931184f0e6b5737aa8be50734a4a7..956feb8fdf3d1d0d363ca0469c6ad5ff146008e2 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/vfs_acl_tdb.8.xml b/docs-xml/manpages-3/vfs_acl_tdb.8.xml
new file mode 100644 (file)
index 0000000..086b86f
--- /dev/null
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<refentry id="vfs_acl_tdb.8">
+
+<refmeta>
+       <refentrytitle>vfs_acl_tdb</refentrytitle>
+       <manvolnum>8</manvolnum>
+       <refmiscinfo class="source">Samba</refmiscinfo>
+       <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+       <refname>vfs_acl_tdb</refname>
+       <refpurpose>Save NTFS-ACLs in a tdb file</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+       <cmdsynopsis>
+               <command>vfs objects = acl_tdb</command>
+       </cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+       <title>DESCRIPTION</title>
+
+       <para>This VFS module is part of the
+       <citerefentry><refentrytitle>samba</refentrytitle>
+       <manvolnum>7</manvolnum></citerefentry> suite.</para>
+
+       <para>The <command>vfs_acl_tdb</command> VFS module stores
+       NTFS Access Control Lists (ACLs) in a tdb file.
+       This enables the full mapping of Windows ACLs on Samba
+       servers.
+       </para>
+
+       <para>
+       The ACL settings are stored in
+       <filename>$LOCKDIR/file_ntacls.tdb</filename>.
+       </para>
+
+       <para>Please note that this module is
+       <emphasis>experimental</emphasis>!
+       </para>
+
+       <para>This module is stackable.</para>
+</refsect1>
+
+<refsect1>
+       <title>OPTIONS</title>
+       <para>
+       There are no options for <command>vfs_acl_tdb</command>.
+       </para>
+</refsect1>
+
+<refsect1>
+       <title>AUTHOR</title>
+
+       <para>The original Samba software and related utilities
+       were created by Andrew Tridgell. Samba is now developed
+       by the Samba Team as an Open Source project similar
+       to the way the Linux kernel is developed.</para>
+</refsect1>
+
+</refentry>
diff --git a/docs-xml/manpages-3/vfs_acl_xattr.8.xml b/docs-xml/manpages-3/vfs_acl_xattr.8.xml
new file mode 100644 (file)
index 0000000..7387824
--- /dev/null
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<refentry id="vfs_acl_xattr.8">
+
+<refmeta>
+       <refentrytitle>vfs_acl_xattr</refentrytitle>
+       <manvolnum>8</manvolnum>
+       <refmiscinfo class="source">Samba</refmiscinfo>
+       <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+       <refname>vfs_acl_xattr</refname>
+       <refpurpose>Save NTFS-ACLs in Extended Attributes (EAs)</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+       <cmdsynopsis>
+               <command>vfs objects = acl_xattr</command>
+       </cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+       <title>DESCRIPTION</title>
+
+       <para>This VFS module is part of the
+       <citerefentry><refentrytitle>samba</refentrytitle>
+       <manvolnum>7</manvolnum></citerefentry> suite.</para>
+
+       <para>The <command>vfs_acl_xattr</command> VFS module stores
+       NTFS Access Control Lists (ACLs) in Extended Attributes (EAs).
+       This enables the full mapping of Windows ACLs on Samba
+       servers.
+       </para>
+
+       <para>The ACLs are stored in the Extended Attribute
+       <parameter>security.NTACL</parameter> of a file or directory.
+       This Attribute is <emphasis>not</emphasis> listed by
+       <command>getfattr -d <filename>filename</filename></command>.
+       To show the current value, the name of the EA must be specified
+       (e.g. <command>getfattr -n security.NTACL <filename>filename</filename>
+       </command>).
+       </para>
+
+       <para>Please note that this module is
+       <emphasis>experimental</emphasis>!
+       </para>
+
+       <para>This module is stackable.</para>
+</refsect1>
+
+<refsect1>
+       <title>OPTIONS</title>
+       <para>
+       There are no options for <command>vfs_acl_xattr</command>.
+       </para>
+</refsect1>
+
+<refsect1>
+       <title>AUTHOR</title>
+
+       <para>The original Samba software and related utilities
+       were created by Andrew Tridgell. Samba is now developed
+       by the Samba Team as an Open Source project similar
+       to the way the Linux kernel is developed.</para>
+</refsect1>
+
+</refentry>
index ce2c3e4bd0b4dbcdbacdfe4e52aa19f6763ad4ed..ea88c5093517d15472d2025c15555361ba5bb74c 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 0249ac27b8a033675fcf605657caeccc6b33135c..3f0d16667962a78ead659466120e067d8655308a 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 93dab4a196e30f6e902ebf0b828c3c57e3b65712..a346cd84461e386da96394807d66295cb00df826 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 736aee00a8c227e000267f6eef6b71e66a77abbd..95c72933a8410bae870dac6c86dc5df1a1a69db9 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index ab2d234baaab51c43f30ad4f52589339e1aa2803..611cb1ed8697d066e2bb1a1277f05cbd8ab57658 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 28d2413a7dbab4d52047a7ed6e8dd642ebc223e7..29d06627508ca410eb5d57a29998f1055859eeab 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 0e12bd1b1d93ddc7559804b3d29445b105e9c5a7..9aae854bcab50d3f6684183a161e44f2c7b16387 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 87279bee2a1b66b932ade450f61f71b9e6d3cacb..d9a0953c0be831625b6c5091f6fc0c7b57d71e6f 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/vfs_fileid.8.xml b/docs-xml/manpages-3/vfs_fileid.8.xml
new file mode 100644 (file)
index 0000000..c790cda
--- /dev/null
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<refentry id="vfs_fileid.8">
+
+<refmeta>
+       <refentrytitle>vfs_fileid</refentrytitle>
+       <manvolnum>8</manvolnum>
+       <refmiscinfo class="source">Samba</refmiscinfo>
+       <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+       <refname>vfs_fileid</refname>
+       <refpurpose>Generates file_id structs with unique device id values for
+       cluster setups</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+       <cmdsynopsis>
+               <command>vfs objects = fileid</command>
+       </cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+       <title>DESCRIPTION</title>
+
+       <para>This VFS module is part of the
+       <citerefentry><refentrytitle>samba</refentrytitle>
+       <manvolnum>7</manvolnum></citerefentry>
+       suite.</para>
+
+       <para>Samba uses file_id structs to uniquely identify files
+       for locking purpose. By default the file_id contains the device
+       and inode number returned by the <command>stat()</command> system call.
+       As the file_id is a unique identifier of a file, it must be the same
+       on all nodes in a cluster setup. This module overloads the
+       <command>SMB_VFS_FILE_ID_CREATE()</command> operation and
+       generates the device number based on the configured algorithm
+       (see the "fileid:algorithm" option).
+       </para>
+</refsect1>
+
+
+<refsect1>
+       <title>OPTIONS</title>
+
+       <variablelist>
+
+               <varlistentry>
+               <term>fileid:algorithm = ALGORITHM</term>
+               <listitem>
+               <para>Available algorithms are <command>fsname</command>
+               and <command>fsid</command>. The default value is
+               <command>fsname</command>.
+               </para>
+               <para>The <command>fsname</command> algorithm generates
+               device id by hashing the kernel device name.
+               </para>
+               <para>The <command>fsid</command> algorithm generates
+               the device id from the <command>f_fsid</command> returned
+               from the <command>statfs()</command> syscall.
+               </para>
+               </listitem>
+               </varlistentry>
+
+               <varlistentry>
+               <term>fileid:mapping = ALGORITHM</term>
+               <listitem>
+               <para>This option is the legacy version of the
+               <command>fileid:algorithm</command> option, which was used in earlier
+               versions of fileid mapping feature in custom Samba 3.0 versions.
+               </para>
+               </listitem>
+               </varlistentry>
+
+       </variablelist>
+</refsect1>
+
+<refsect1>
+       <title>EXAMPLES</title>
+
+       <para>Usage of the <command>fileid</command> module with the
+       <command>fsid</command> algorithm:</para>
+
+<programlisting>
+        <smbconfsection name="[global]"/>
+       <smbconfoption name="vfs objects">fileid</smbconfoption>
+       <smbconfoption name="fileid:algorithm">fsid</smbconfoption>
+</programlisting>
+
+</refsect1>
+
+<refsect1>
+       <title>VERSION</title>
+
+       <para>This man page is correct for version 3.2 of the Samba suite.
+       </para>
+</refsect1>
+
+<refsect1>
+       <title>AUTHOR</title>
+
+       <para>The original Samba software and related utilities
+       were created by Andrew Tridgell. Samba is now developed
+       by the Samba Team as an Open Source project similar
+       to the way the Linux kernel is developed.</para>
+
+</refsect1>
+
+</refentry>
index eec3f3127ce020b12ce721496b8da5b29ae2eb9c..7bcf18c77ba781c046cff2747f22e47475d7bb5e 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index f926ecacf9028fe9d2e48bac0bd7c1f64ba592b8..e88d9ed43eb87ce51e71b315c79d147e7ca4e136 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index e4f6772a7b9533a27e787b88df45eac0d4157c6d..80bcd88a2b8c26ea57479df301bf979cf383c29b 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 10605753c851509ff4b5825963ede1eac426466a..57f58c18a602fb69bfacd55ff5efdfe03731f22b 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 36cc2894f3bcfd7a88a46a6a327dc5e04063f3d0..a7ff165221d514b92dc1015119240b39a858edb3 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 0f4bd6aa501266468812afe7a84dd0390860468e..7a4fe9498569fb3a01f15e43feb4219dc2540c5d 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 1d3d979cb0324712ec09d09f772a2787b5cfcb9b..c04483b229dbd6f76d707bb2c6801f16dc3fb13f 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index ca95f881b73106ffdb6b48712c9271ec359c82a4..70ca689141eeda82cb52a7b334021b1ddf5bb062 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
 <refsect1>
        <title>EXAMPLES</title>
 
-       <para>Log operations on all shares using the LOCAL1 facility
-       and NOTICE priority:</para>
+       <para>Move files "deleted" on <parameter>share</parameter> to
+       <parameter>/data/share/.recycle</parameter> instead of deleting them:
+       </para>
 
 <programlisting>
-        <smbconfsection name="[global]"/>
+        <smbconfsection name="[share]"/>
+       <smbconfoption name="path">/data/share</smbconfoption>
        <smbconfoption name="vfs objects">recycle</smbconfoption>
-       <smbconfoption name="recycle:facility">LOCAL1</smbconfoption>
-       <smbconfoption name="recycle:priority">NOTICE</smbconfoption>
+       <smbconfoption name="recycle:repository">.recycle</smbconfoption>
+       <smbconfoption name="recycle:keeptree">yes</smbconfoption>
+       <smbconfoption name="recycle:versions">yes</smbconfoption>
 </programlisting>
 
 </refsect1>
index 49f79542d3fc29693a2a09ca510981636cfe6b2f..eaded8e16ef457dcbefd3413e0f595de17f8e4ad 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/vfs_shadow_copy2.8.xml b/docs-xml/manpages-3/vfs_shadow_copy2.8.xml
new file mode 100644 (file)
index 0000000..e671408
--- /dev/null
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<refentry id="vfs_shadow_copy2.8">
+
+<refmeta>
+       <refentrytitle>vfs_shadow_copy2</refentrytitle>
+       <manvolnum>8</manvolnum>
+       <refmiscinfo class="source">Samba</refmiscinfo>
+       <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+       <refname>vfs_shadow_copy2</refname>
+       <refpurpose>Expose snapshots to Windows clients as shadow copies.</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+       <cmdsynopsis>
+               <command>vfs objects = shadow_copy2</command>
+       </cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+       <title>DESCRIPTION</title>
+
+       <para>This VFS module is part of the
+       <citerefentry><refentrytitle>samba</refentrytitle>
+       <manvolnum>7</manvolnum></citerefentry> suite.</para>
+
+       <para>The <command>vfs_shadow_copy2</command> VFS module functionality
+       that is similar to Microsoft Shadow Copy services. When setup properly,
+       this module allows Microsoft Shadow Copy clients to browse
+       "shadow copies" on Samba shares.
+       </para>
+
+       <para>This is a 2nd implementation of a shadow copy module. This
+       version has the following features:</para>
+       <orderedlist continuation="restarts" inheritnum="ignore" numeration="arabic">
+        <listitem><para>You don't need to populate your shares with symlinks to the
+       snapshots. This can be very important when you have thousands of
+       shares, or use [homes].</para></listitem>
+       <listitem><para>The inode number of the files is altered so it is different
+       from the original. This allows the 'restore' button to work
+       without a sharing violation.</para></listitem>
+       </orderedlist>
+
+       <para>This module is stackable.</para>
+
+</refsect1>
+
+<refsect1>
+       <title>CONFIGURATION</title>
+
+       <para><command>vfs_shadow_copy2</command> relies on a filesystem
+       snapshot implementation. Many common filesystems have native
+       support for this.
+       </para>
+
+       <para>Filesystem snapshots must be mounted on
+       specially named directories in order to be recognized by
+       <command>vfs_shadow_copy2</command>. The snapshot mount points must
+       be immediate children of a the directory being shared.</para>
+
+       <para>The snapshot naming convention is @GMT-YYYY.MM.DD-hh.mm.ss,
+       where:
+       <itemizedlist>
+               <listitem><para><command>YYYY</command> is the 4 digit year</para></listitem>
+               <listitem><para><command>MM</command> is the 2 digit month</para></listitem>
+               <listitem><para><command>DD</command> is the 2 digit day</para></listitem>
+               <listitem><para><command>hh</command> is the 2 digit hour</para></listitem>
+               <listitem><para><command>mm</command> is the 2 digit minute</para></listitem>
+               <listitem><para><command>ss</command> is the 2 digit second.</para></listitem>
+               </itemizedlist>
+       </para>
+
+       <para>The <command>vfs_shadow_copy2</command> snapshot naming convention can be
+       produced with the following <citerefentry><refentrytitle>date</refentrytitle>
+       <manvolnum>1</manvolnum></citerefentry> command:
+       <programlisting>
+       TZ=GMT date +@GMT-%Y.%m.%d-%H.%M.%S
+       </programlisting></para>
+
+</refsect1>
+
+<refsect1>
+        <title>OPTIONS</title>
+
+        <variablelist>
+               <varlistentry>
+                <term>shadow:snapdir = SNAPDIR
+                </term>
+                <listitem>
+                <para>Path to the directory where snapshots are kept.
+                </para>
+                </listitem>
+                </varlistentry>
+
+                <varlistentry>
+                <term>shadow:basedir = BASEDIR
+               </term>
+                <listitem>
+                <para>Path to the base directory that snapshots are from.
+                </para>
+                </listitem>
+                </varlistentry>
+
+               <varlistentry>
+                <term>shadow:fixinodes = yes/no
+                </term>
+                <listitem>
+                <para>If you enable <command moreinfo="none">shadow:fixinodes
+               </command> then this module will modify the apparent inode
+               number of files in the snapshot directories using a hash of the
+               files path. This is needed for snapshot systems where the
+               snapshots have the same device:inode number as the original
+               files (such as happens with GPFS snapshots). If you don't set
+               this option then the 'restore' button in the shadow copy UI
+               will fail with a sharing violation.
+                </para>
+                </listitem>
+                </varlistentry>
+               </variablelist>
+</refsect1>
+
+<refsect1>
+       <title>EXAMPLES</title>
+
+       <para>Add shadow copy support to user home directories:</para>
+<programlisting>
+        <smbconfsection name="[homes]"/>
+       <smbconfoption name="vfs objects">shadow_copy2</smbconfoption>
+       <smbconfoption name="shadow:snapdir">/data/snaphots</smbconfoption>
+       <smbconfoption name="shadow:basedir">/data/home</smbconfoption>
+</programlisting>
+
+</refsect1>
+
+<refsect1>
+       <title>CAVEATS</title>
+
+       <para>This is not a backup, archival, or version control solution.
+       </para>
+
+       <para>With Samba or Windows servers,
+       <command>vfs_shadow_copy2</command> is designed to be an end-user
+       tool only. It does not replace or enhance your backup and
+       archival solutions and should in no way be considered as
+       such. Additionally, if you need version control, implement a
+       version control system.</para>
+
+</refsect1>
+
+
+
+<refsect1>
+       <title>VERSION</title>
+
+       <para>This man page is correct for version 3.2.7 of the Samba suite.
+       </para>
+</refsect1>
+
+<refsect1>
+       <title>AUTHOR</title>
+
+       <para>The original Samba software and related utilities
+       were created by Andrew Tridgell. Samba is now developed
+       by the Samba Team as an Open Source project similar
+       to the way the Linux kernel is developed.</para>
+
+</refsect1>
+
+</refentry>
index 556fa3e86ea084a212f329121d532f92bebb1b82..3a16b612100d7f228d69e77832ce305f0d79023e 100644 (file)
                </listitem>
                </varlistentry>
 
+               <varlistentry>
+               <term>smb_traffic_analyzer:total_anonymization = STRING</term>
+               <listitem>
+               <para>If STRING matches to 'yes', the module will replace
+               any user name with the string given by the option 
+               smb_traffic_analyzer:anonymize_prefix, without generating
+               an additional hash number. This means that any transfer data
+               will be mapped to a single user, leading to a total 
+               anonymization of user related data.</para>
+               </listitem>
+               </varlistentry>
 
        </variablelist>
 </refsect1>
index 3a11319d4a64daf682631f5f5906b07b6d66581d..32dde19b544a14eaf93a447fbe59cfa647c91d17 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 50649af60514206931c3f574f99c30077de16361..36be8d257632db4c3e3319a97d37ffa5e47c0485 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 4f3b70223f53768129925c280c13f99a8bdd23a9..de60f3defe1acec517e7b30e5bffbff2060eab0c 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index debe65244e074eb4a15d8ab62a8a7cedb54dc936..63487dff4880478baaefad73ed81b19932e7ca61 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>1</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">User Commands</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 1fb7206950e605061de7f8efe69e510cbf3d55f2..c91351d1afa65279e0b12daebe87203077f0ef30 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>1</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">User Commands</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 7721bd480ef4651be7074646b0d0dbc83775625d..6a00580c85853014251a2303cd16439c47ce2038 100644 (file)
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">3.2</refmiscinfo>
+       <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
index 13f2cd644643f8db31d4fbaff9f0a371263fb1f7..7f85616c22287502ef25cb2ce06739a9eb946f2c 100644 (file)
@@ -17,7 +17,7 @@
 
        <para>You may wish to disable this option if you have a problem with empty
        workgroups not disappearing from browse lists. Due to the restrictions
-       of the browse protocols these enhancements can cause a empty workgroup
+       of the browse protocols, these enhancements can cause a empty workgroup
        to stay around forever which can be annoying.</para>
 
        <para>In general you should leave this option enabled as it makes
index 39ed08fe82d72fa7ed9c418c1cc9fc1c0c371913..fa7fea94d0663637715d3095a9bfd29aaed3e693 100644 (file)
@@ -3,36 +3,46 @@
                                 type="enum"
                  advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
- <description>
+<description>
        <para>This option is used to define whether or not Samba should
        use SSL when connecting to the ldap server
        This is <emphasis>NOT</emphasis> related to
-       Samba's previous SSL support which was enabled by specifying the 
-        <command moreinfo="none">--with-ssl</command> option to the <filename moreinfo="none">configure</filename> 
+       Samba's previous SSL support which was enabled by specifying the
+       <command moreinfo="none">--with-ssl</command> option to the
+       <filename moreinfo="none">configure</filename>
        script.</para>
-               
-<para>The <smbconfoption name="ldap ssl"/> can be set to one of three values:</para>   
+
+       <para>LDAP connections should be secured where possible. This may be
+       done setting <emphasis>either</emphasis> this parameter to
+       <parameter moreinfo="none">Start_tls</parameter>
+       <emphasis>or</emphasis> by specifying <parameter moreinfo="none">ldaps://</parameter> in
+        the URL argument of <smbconfoption name="passdb backend"/>.</para>
+
+       <para>The <smbconfoption name="ldap ssl"/> can be set to one of
+       two values:</para>
        <itemizedlist>
                <listitem>
-                       <para><parameter moreinfo="none">Off</parameter> = Never 
+                       <para><parameter moreinfo="none">Off</parameter> = Never
                        use SSL when querying the directory.</para>
                </listitem>
 
                <listitem>
-                       <para><parameter moreinfo="none">Start_tls</parameter> = Use 
-                       the LDAPv3 StartTLS extended operation (RFC2830) for 
+                       <para><parameter moreinfo="none">start tls</parameter> = Use
+                       the LDAPv3 StartTLS extended operation (RFC2830) for
                        communicating with the directory server.</para>
                </listitem>
-           
-               <listitem>
-                       <para><parameter moreinfo="none">On</parameter>  = Use SSL 
-                       on the ldaps port when contacting the <parameter 
-                       moreinfo="none">ldap server</parameter>. Only available when the 
-                       backwards-compatiblity <command 
-                       moreinfo="none">--with-ldapsam</command> option is specified
-               to configure. See <smbconfoption name="passdb backend"/></para>.
-               </listitem>
-       </itemizedlist>         
+       </itemizedlist>
+       <para>
+       Please note that this parameter does only affect <emphasis>rpc</emphasis>
+       methods. To enable the LDAPv3 StartTLS extended operation (RFC2830) for
+       <emphasis>ads</emphasis>, set
+       <smbconfoption name="ldap ssl">yes</smbconfoption>
+       <emphasis>and</emphasis>
+       <smbconfoption name="ldap ssl ads">yes</smbconfoption>.
+       See <refentrytitle>smb.conf</refentrytitle><manvolnum>5</manvolnum>
+       for more information on <smbconfoption name="ldap ssl ads"/>.
+        </para>
+
 </description>
-<value type="default">start_tls</value>
+<value type="default">start tls</value>
 </samba:parameter>
diff --git a/docs-xml/smbdotconf/ldap/ldapsslads.xml b/docs-xml/smbdotconf/ldap/ldapsslads.xml
new file mode 100644 (file)
index 0000000..e6998cb
--- /dev/null
@@ -0,0 +1,21 @@
+<samba:parameter name="ldap ssl ads"
+                context="G"
+                type="boolean"
+                 advanced="1" developer="1"
+                xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+       <para>This option is used to define whether or not Samba should
+       use SSL when connecting to the ldap server using
+       <emphasis>ads</emphasis> methods.
+       Rpc methods are not affected by this parameter. Please note, that
+       this parameter won't have any effect if <smbconfoption name="ldap ssl"/>
+       is set to <parameter>no</parameter>.
+       </para>
+
+       <para>See <refentrytitle>smb.conf</refentrytitle><manvolnum>5</manvolnum>
+       for more information on <smbconfoption name="ldap ssl"/>.
+       </para>
+
+</description>
+<value type="default">no</value>
+</samba:parameter>
index 9c34ac8bec657ade8041d3553b3e17e503b79dea..5bc2699d00b9044a35ece5496c7f24ad356da328 100644 (file)
@@ -5,9 +5,7 @@
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
        <para>
-       When Samba connects to an ldap server that server may be down or unreachable. To prevent Samba from hanging whilst
-       waiting for the connection this parameter specifies in seconds how long Samba should wait before failing the 
-       connect. The default is to only wait fifteen seconds for the ldap server to respond to the connect request.
+       This parameter defines the number of seconds that Samba should use as timeout for LDAP operations.
        </para>
 </description>
 <value type="default">15</value>
index e8371a563daa9f1ac02908eb68585c2e614a44b3..c529886d33e74f8239aff0c139bd6264c1a1f41a 100644 (file)
@@ -3,25 +3,26 @@
                  context="S"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
-       <para>This enables or disables the honoring of 
-       the <parameter moreinfo="none">share modes</parameter> during a file open. These 
-       modes are used by clients to gain exclusive read or write access 
+       <para>This enables or disables the honoring of
+       the <parameter moreinfo="none">share modes</parameter> during a file open. These
+       modes are used by clients to gain exclusive read or write access
        to a file.</para>
 
+       <para>This is a deprecated option from old versions of
+       Samba, and will be removed in the next major release.
+       </para>
+
        <para>These open modes are not directly supported by UNIX, so
-       they are simulated using shared memory, or lock files if your 
-       UNIX doesn't support shared memory (almost all do).</para>
+       they are simulated using shared memory.</para>
 
-       <para>The share modes that are enabled by this option are 
-        <constant>DENY_DOS</constant>, <constant>DENY_ALL</constant>,
-       <constant>DENY_READ</constant>, <constant>DENY_WRITE</constant>,
-       <constant>DENY_NONE</constant> and <constant>DENY_FCB</constant>.
+       <para>The share modes that are enabled by this option are
+       the standard Windows share modes.
        </para>
 
-       <para>This option gives full share compatibility and enabled 
+       <para>This option gives full share compatibility and is enabled
        by default.</para>
 
-       <para>You should <emphasis>NEVER</emphasis> turn this parameter 
+       <para>You should <emphasis>NEVER</emphasis> turn this parameter
        off as many Windows applications will break if you do so.</para>
 </description>
 <value type="default">yes</value>
index e3a0ed7b4c5035b44052decd338cfc8f2a58fec4..15ad0ad07394e4c99baab0f40451209768ab4316 100644 (file)
@@ -12,7 +12,7 @@
        <para>
        When strict locking is set to Auto (the default), the server performs file lock checks only on non-oplocked files.
        As most Windows redirectors perform file locking checks locally on oplocked files this is a good trade off for
-       inproved performance.
+       improved performance.
        </para>
 
        <para>
index 9eb50f3dc3b6a6d6de3ca342db2c7725ed7b7add..de8da7b5cad074d53b0909a0b079196d8bbaee62 100644 (file)
@@ -7,15 +7,19 @@
        <para>
        Samba 2.2.0 introduced the ability to dynamically add and delete shares via the Windows NT 4.0 Server
        Manager.  The <parameter moreinfo="none">add share command</parameter> is used to define an external program
-       or script which will add a new service definition to <filename moreinfo="none">smb.conf</filename>.  In order
-       to successfully execute the <parameter moreinfo="none">add share command</parameter>, <command
-       moreinfo="none">smbd</command> requires that the administrator be connected using a root account (i.e.  uid == 0).
+       or script which will add a new service definition to
+       <filename moreinfo="none">smb.conf</filename>.
        </para>
 
-    <para>
-    If the connected account has <literal>SeDiskOperatorPrivilege</literal>, scripts defined in
-    <parameter moreinfo="none">change share</parameter> parameter are executed as root.
-    </para>
+       <para>
+       In order to successfully execute the
+       <parameter moreinfo="none">add share command</parameter>,
+       <command moreinfo="none">smbd</command> requires that the administrator
+       connects using a root account (i.e.  uid == 0) or has the
+       <literal>SeDiskOperatorPrivilege</literal>.
+       Scripts defined in the <parameter moreinfo="none">add share command</parameter>
+       parameter are executed as root.
+       </para>
 
        <para>
        When executed, <command moreinfo="none">smbd</command> will automatically invoke the
@@ -56,7 +60,7 @@
        </itemizedlist>
 
        <para>
-       This parameter is only used for add file shares.  To add printer shares, see the <smbconfoption
+       This parameter is only used to add file shares. To add printer shares, see the <smbconfoption
        name="addprinter command"/>.
        </para>
 </description>
index 5a42e225594436ddd0f059d9ecb9d11d5bf1c3f5..2033fcf46cdfd88aa90576fafdf4f38852568bca 100644 (file)
@@ -8,14 +8,17 @@
        Samba 2.2.0 introduced the ability to dynamically add and delete shares via the Windows NT 4.0 Server
 Manager.  The <parameter moreinfo="none">change share command</parameter> is used to define an external
 program or script which will modify an existing service definition in <filename
-moreinfo="none">smb.conf</filename>.  In order to successfully execute the <parameter moreinfo="none">change
-share command</parameter>, <command moreinfo="none">smbd</command> requires that the administrator be
-connected using a root account (i.e. uid == 0).
+moreinfo="none">smb.conf</filename>.
        </para>
 
        <para>
-       If the connected account has <literal>SeDiskOperatorPrivilege</literal>, scripts defined in
-       <parameter moreinfo="none">change share</parameter> parameter are executed as root.
+       In order to successfully execute the
+       <parameter moreinfo="none">change share command</parameter>,
+       <command moreinfo="none">smbd</command> requires that the administrator
+       connects using a root account (i.e. uid == 0) or has the
+       <literal>SeDiskOperatorPrivilege</literal>.
+       Scripts defined in the <parameter moreinfo="none">change share command</parameter>
+       parameter are executed as root.
        </para>
 
        <para>
@@ -58,13 +61,14 @@ connected using a root account (i.e. uid == 0).
        </itemizedlist>
 
        <para>
-       This parameter is only used modify existing file shares definitions.  To modify
-       printer shares, use the &quot;Printers...&quot; folder as seen when browsing the Samba host.
+       This parameter is only used to modify existing file share definitions.
+       To modify printer shares, use the &quot;Printers...&quot; folder as seen
+       when browsing the Samba host.
        </para>
 </description>
 
 <related>add share command</related>
 <related>delete share command</related>
 <value type="default"></value>
-<value type="example">/usr/local/bin/addshare</value>
+<value type="example">/usr/local/bin/changeshare</value>
 </samba:parameter>
index 40eb6495dbf23e32b5a9be7053b6ded3f3adfed4..3def6b8013ddbd89d7ff58aa4642cefacab776df 100644 (file)
@@ -8,15 +8,17 @@
        Samba 2.2.0 introduced the ability to dynamically add and delete shares via the Windows NT 4.0 Server
        Manager.  The <parameter moreinfo="none">delete share command</parameter> is used to define an external
        program or script which will remove an existing service definition from
-       <filename moreinfo="none">smb.conf</filename>.  In order to successfully execute the
-       <parameter moreinfo="none">delete share command</parameter>, <command moreinfo="none">smbd</command>
-       requires that the administrator be connected using a root account (i.e.  uid == 0).
+       <filename moreinfo="none">smb.conf</filename>.
        </para>
 
-    <para>
-    If the connected account has <literal>SeDiskOperatorPrivilege</literal>, scripts defined in
-    <parameter moreinfo="none">change share</parameter> parameter are executed as root.
-    </para>
+       <para>In order to successfully execute the
+       <parameter moreinfo="none">delete share command</parameter>,
+       <command moreinfo="none">smbd</command> requires that the administrator
+       connects using a root account (i.e.  uid == 0) or has the
+       <literal>SeDiskOperatorPrivilege</literal>.
+       Scripts defined in the <parameter moreinfo="none">delete share command</parameter>
+       parameter are executed as root.
+       </para>
 
        <para>
        When executed, <command moreinfo="none">smbd</command> will automatically invoke the
@@ -44,7 +46,7 @@
 </description>
 
 <related>add share command</related>
-<related>delete share command</related>
+<related>change share command</related>
 <value type="default"></value>
 <value type="example">/usr/local/bin/delshare</value>
 </samba:parameter>
index f23968b5015a5cdd205ea1a50fe40de93f25903c..a6bf0c546f5cabd89d347dafd888c10f1c1a2f47 100644 (file)
@@ -6,7 +6,7 @@
 <description>
        <para>
        This option allows you to setup <citerefentry><refentrytitle>nmbd</refentrytitle>
-       <manvolnum>8</manvolnum></citerefentry>to periodically announce itself 
+       <manvolnum>8</manvolnum></citerefentry> to periodically announce itself 
        to arbitrary IP addresses with an arbitrary workgroup name.
        </para>
 
@@ -23,7 +23,7 @@
 </programlisting>
        the above line would cause <command moreinfo="none">nmbd</command> to announce itself 
        to the two given IP addresses using the given workgroup names. If you leave out the 
-       workgroup name then the one given in the <smbconfoption name="workgroup"/> parameter 
+       workgroup name, then the one given in the <smbconfoption name="workgroup"/> parameter 
        is used instead.
        </para>
 
index 7566380e7092011683f73bba9675f293a938063e..17018efd40a682e344cc3f21cd88db27addf379a 100644 (file)
@@ -4,12 +4,14 @@
                 developer="1"
                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
-       <para>This option allows you to control what 
-       address Samba will listen for connections on. This is used to 
-       support multiple virtual interfaces on the one server, each 
+       <para>This option allows you to control what
+       address Samba will listen for connections on. This is used to
+       support multiple virtual interfaces on the one server, each
        with a different configuration.</para>
-               
-       <para>By default Samba will accept connections on any 
+       <para>Setting this option should never be necessary on usual Samba
+       servers running only one nmbd.</para>
+
+       <para>By default Samba will accept connections on any
                address.</para>
 </description>
 
index 738f3a11bad1fa971412229682e92e255a746c5a..a3ae5183b090b8f74350ac323d1f439dad02489a 100644 (file)
@@ -8,7 +8,7 @@
        to be accessed by non-authenticated users or not. It is the equivalent
        of allowing people who can create a share the option of setting
        <parameter moreinfo="none">guest ok = yes</parameter> in a share
-       definition. Due to the security sensitive nature of this the default
+       definition. Due to its security sensitive nature, the default
        is set to off.</para>
 
 </description>
index bacc2e9530eafbbbdb2b792de7e05aac456c3679..6c1822a16583aa86a1c648df79c8ea748d7ab10c 100644 (file)
@@ -6,8 +6,8 @@
 <description>
        <para>This parameter specifies a list of absolute pathnames
        the root of which are allowed to be exported by user defined share definitions.
-       If the pathname exported doesn't start with one of the strings in this
-       list the user defined share will not be allowed. This allows the Samba
+       If the pathname to be exported doesn't start with one of the strings in this
+       list, the user defined share will not be allowed. This allows the Samba
        administrator to restrict the directories on the system that can be
        exported by user defined shares.
        </para>
index efe2e81d22c6268bec7cc0949db9c5085a74cdc0..9593a6c7e4a2faeb848d6e3254aae014a85db665 100644 (file)
@@ -5,7 +5,7 @@
                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
        <para>User defined shares only have limited possible parameters
-       such as path, guest ok etc. This parameter allows usershares to
+       such as path, guest ok, etc. This parameter allows usershares to
        "cloned" from an existing share. If "usershare template share"
        is set to the name of an existing share, then all usershares
        created have their defaults set from the parameters set on this
index 3be0f429392e874c70ddc2f1586bbda6e20a16dd..c365594e1f12997e5838f90bb293b89173dd9450 100644 (file)
@@ -33,4 +33,6 @@
     <para>See also the discussion in the <link linkend="PRINTERSSECT">
     [printers]</link> section.</para>
 </description>
+<value type="default">Depends on the operating system, see
+<command moreinfo="none">testparm -v.</command></value>
 </samba:parameter>
index 99e85568110cc0020f72f944763f15ae01f40ec2..4d9b7abfccc406c77d6078150a941132e5a95acc 100644 (file)
@@ -29,7 +29,7 @@
     <para>If this parameter is enabled for a printer, then any attempt
     to open the printer with the PRINTER_ACCESS_ADMINISTER right is mapped
     to PRINTER_ACCESS_USE instead.  Thus allowing the OpenPrinterEx()
-    call to succeed.  <emphasis>This parameter MUST not be able enabled
+    call to succeed.  <emphasis>This parameter MUST not be enabled
     on a print share which has valid print driver installed on the Samba 
        server.</emphasis></para>
 </description>
index 69162617596cb4b5737fd21d8f046691f50cc062..79b6da7afa5edaaaf5ec0520a4d039867cec550c 100644 (file)
@@ -21,7 +21,7 @@
     and allows the open. If the user doesn't have permission to delete the file this will only be
     discovered at close time, which is too late for the Windows user tools to display an error message
     to the user. The symptom of this is files that appear to have been deleted "magically" re-appearing
-    on a Windows explorer refersh. This is an extremely advanced protocol option which should not
+    on a Windows explorer refresh. This is an extremely advanced protocol option which should not
     need to be changed. This parameter was introduced in its final form in 3.0.21, an earlier version
     with slightly different semantics was introduced in 3.0.20. That older version is not documented here.
     </para>
index cd4f30fb8d62bda31079ec8ee9479e1cb28dd2e5..bb56b5ad0bd1ead56710e00a51f6b8696fd30cb6 100644 (file)
@@ -5,7 +5,7 @@
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>Hosts running the "Advanced Server for Unix (ASU)" product 
-    require some special accomodations such as creating a builting [ADMIN$] 
+    require some special accomodations such as creating a builtin [ADMIN$] 
     share that only supports IPC connections.  The has been the default
     behavior in smbd for many years.  However, certain Microsoft applications
     such as the Print Migrator tool require that the remote server support
index 5266fef6a24ee50529baf298c061e9d839592cc5..967eacf85bb199bff4011b88a71589f44c1b307d 100644 (file)
@@ -11,7 +11,7 @@
     password hashes (e.g. Windows NT/2000, Samba, etc... but not 
     Windows 95/98) will be able to be connected from the Samba client.</para>
 
-    <para>The LANMAN encrypted response is easily broken, due to it's
+    <para>The LANMAN encrypted response is easily broken, due to its
     case-insensitive nature, and the choice of algorithm.  Clients
     without Windows 95/98 servers are advised to disable
     this option.  </para>
index bf37cbb8746476d53434ce0f7270e47829b716df..c657e057118f66d5139d35ca489e6eadb3653e8c 100644 (file)
@@ -4,8 +4,7 @@
                  basic="1"
                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
-    <para>This controls whether the client offers or requires
-    the server it talks to to use SMB signing. Possible values 
+    <para>This controls whether the client is allowed or required to use SMB signing. Possible values 
     are <emphasis>auto</emphasis>, <emphasis>mandatory</emphasis> 
     and <emphasis>disabled</emphasis>. 
     </para>
index 341952205f6940809a41f84cd703c7e7bcb40155..4e68c5e03aa16b5c5529343c475f7f75e2cf7911 100644 (file)
@@ -12,7 +12,7 @@
     Windows 95/98 or the MS DOS network client) will be able to
     connect to the Samba host.</para>
 
-    <para>The LANMAN encrypted response is easily broken, due to it's
+    <para>The LANMAN encrypted response is easily broken, due to its
     case-insensitive nature, and the choice of algorithm.  Servers
     without Windows 95/98/ME or MS DOS clients are advised to disable
     this option.  </para>
index 0da247d27d5d0d4514569197bd9a0ba78a0811bf..0e92af9ebaeaff76dda2deb34c4e4066357dcc86 100644 (file)
@@ -7,7 +7,7 @@
     <para>By specifying the name of another SMB server 
     or Active Directory domain controller with this option, 
     and using <command moreinfo="none">security = [ads|domain|server]</command> 
-    it is possible to get Samba to 
+    it is possible to get Samba
     to do all its username/password validation using a specific remote server.</para>
 
     <para>This option sets the name or IP address of the password server to use. 
index 3ad5175712e7e1bf126e684568a9b14dce7ef4cd..514ea54e0ff65231255a54ad0c8abc1a26941fed 100644 (file)
@@ -47,7 +47,7 @@
     want to mainly setup shares without a password (guest shares). This 
     is commonly used for a shared printer server. It is more difficult 
     to setup guest shares with <command moreinfo="none">security = user</command>, see 
-    the <smbconfoption name="map to guest"/>parameter for details.</para>
+    the <smbconfoption name="map to guest"/> parameter for details.</para>
                
     <para>It is possible to use <command moreinfo="none">smbd</command> in a <emphasis>
     hybrid mode</emphasis> where it is offers both user and share 
@@ -58,7 +58,7 @@
 
     <para><anchor id="SECURITYEQUALSSHARE"/><emphasis>SECURITY = SHARE</emphasis></para> 
                
-    <para>When clients connect to a share level security server they 
+    <para>When clients connect to a share level security server, they 
     need not log onto the server with a valid username and password before 
     attempting to connect to a shared resource (although modern clients 
     such as Windows 95/98 and Windows NT will send a logon request with 
        </para></note>
 
        <note><para>From the client's point of 
-    view <command moreinfo="none">security = server</command> is the
+    view, <command moreinfo="none">security = server</command> is the
     same as <command moreinfo="none">security = user</command>.  It
     only affects how the server deals  with the authentication, it does
        not in any way affect what the  client sees.</para></note>
index 6317448fb62ecb89f353dfa836004c6ee95d81da..655463576f3540a45886d87c8e21f6457ce66fb6 100644 (file)
@@ -13,7 +13,7 @@
        </para>
 
     <para>
-       Please note that with this set to <literal>no</literal> you will have to apply the WindowsXP
+       Please note that with this set to <literal>no</literal>, you will have to apply the WindowsXP
        <filename>WinXP_SignOrSeal.reg</filename> registry patch found in the docs/registry subdirectory of the Samba distribution tarball.
        </para>
 </description>
index f2f5629586150f8e95d5748974c267b226c9d599..ea21a2c6f64d487b0ae9261d42a64c8f62f44ccd 100644 (file)
@@ -5,8 +5,7 @@
                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 
-    <para>This controls whether the server offers or requires
-    the client it talks to to use SMB signing. Possible values 
+    <para>This controls whether the client is allowed or required to use SMB signing. Possible values 
     are <emphasis>auto</emphasis>, <emphasis>mandatory</emphasis> 
     and <emphasis>disabled</emphasis>. 
     </para>
index eb91ce51fa3ce389445ca5064c5bea2be8465750..d556166953697a54d384a9c50430d81a61367ed0 100644 (file)
@@ -16,8 +16,7 @@
     and MacOS/X clients. Windows clients do not support this feature.
     </para>
 
-    <para>This controls whether the server offers or requires
-    the client it talks to to use SMB encryption. Possible values 
+    <para>This controls whether the remote client is allowed or required to use SMB encryption. Possible values 
     are <emphasis>auto</emphasis>, <emphasis>mandatory</emphasis> 
     and <emphasis>disabled</emphasis>. This may be set on a per-share
     basis, but clients may chose to encrypt the entire session, not
index da493665cf2333448652ba0de77ef86ee7287084..eb54ed9bab6592e8a35b7d1bc9d62fc9ff7eda37 100644 (file)
@@ -9,7 +9,7 @@
        This boolean parameter allows a user logging on with a plaintext password to have their encrypted (hashed)
        password in the smbpasswd file to be updated automatically as they log on. This option allows a site to
        migrate from plaintext password authentication (users authenticate with plaintext password over the
-       wire, and are checked against a UNIX account atabase) to encrypted password authentication (the SMB
+       wire, and are checked against a UNIX account database) to encrypted password authentication (the SMB
        challenge/response authentication mechanism) without forcing all users to re-enter their passwords via
        smbpasswd at the time the change is made. This is a convenience option to allow the change over to encrypted
        passwords to be made over a longer period.  Once all users have encrypted representations of their passwords
@@ -24,7 +24,7 @@
        </para>
 
     <para>
-       Note that even when this parameter is set a user authenticating to <command moreinfo="none">smbd</command>
+       Note that even when this parameter is set, a user authenticating to <command moreinfo="none">smbd</command>
        must still enter a valid password in order to connect correctly, and to update their hashed (smbpasswd)
        passwords.
        </para>
index 7891adc13b5fba95ffcfe47f9d51f15fb8839705..95f42cfe2a8334cc30bfb69ea1a64fd92898e75c 100644 (file)
@@ -1,5 +1,5 @@
 <samba:parameter name="acl compatibility"
-                 context="S"
+                 context="G"
                                 type="enum"
                  advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
index 047addc8f7ad856e9c865d117cba7b0bd00aebd1..728dbe0edbca9597afe3b24aa95b9ce83a0ce664 100644 (file)
@@ -24,6 +24,8 @@ TESTS=        testsmbc \
        teststat \
        teststat2 \
        teststat3 \
+       teststatvfs \
+       testfstatvfs \
        testtruncate \
        testchmod \
        testutime \
@@ -74,6 +76,14 @@ teststat3: teststat3.o
        @echo Linking teststat3
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBSMBCLIENT) -lpopt
 
+teststatvfs: teststatvfs.o
+       @echo Linking teststatvfs
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBSMBCLIENT) -lpopt
+
+testfstatvfs: testfstatvfs.o
+       @echo Linking testfstatvfs
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBSMBCLIENT) -lpopt
+
 testtruncate: testtruncate.o
        @echo Linking testtruncate
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBSMBCLIENT) -lpopt
diff --git a/examples/libsmbclient/testfstatvfs.c b/examples/libsmbclient/testfstatvfs.c
new file mode 100644 (file)
index 0000000..b4dafef
--- /dev/null
@@ -0,0 +1,122 @@
+#include <sys/types.h>
+#include <sys/statvfs.h>
+#include <stdio.h> 
+#include <unistd.h>
+#include <string.h> 
+#include <time.h> 
+#include <errno.h>
+#include <libsmbclient.h> 
+#include "get_auth_data_fn.h"
+
+
+int main(int argc, char * argv[]) 
+{ 
+    int             i;
+    int             fd;
+    int             ret;
+    int             debug = 0;
+    char *          p;
+    char            path[2048];
+    struct stat     statbuf;
+    struct statvfs  statvfsbuf;
+    
+    smbc_init(get_auth_data_fn, debug); 
+    
+    for (;;)
+    {
+        fprintf(stdout, "Path: ");
+        *path = '\0';
+        fgets(path, sizeof(path) - 1, stdin);
+        if (strlen(path) == 0)
+        {
+            return 0;
+        }
+
+        p = path + strlen(path) - 1;
+        if (*p == '\n')
+        {
+            *p = '\0';
+        }
+    
+        /* Determine if it's a file or a folder */
+        if (smbc_stat(path, &statbuf) < 0)
+        {
+            perror("smbc_stat");
+            continue;
+        }
+
+        if (S_ISREG(statbuf.st_mode))
+        {
+            if ((fd = smbc_open(path, O_RDONLY, 0)) < 0)
+            {
+                perror("smbc_open");
+                continue;
+            }
+        }
+        else
+        {
+            if ((fd = smbc_opendir(path)) < 0)
+            {
+                perror("smbc_opendir");
+                continue;
+            }
+        }
+
+        ret = smbc_fstatvfs(fd, &statvfsbuf);
+
+        smbc_close(fd);
+
+        if (ret < 0)
+        {
+            perror("fstatvfs");
+        }
+        else
+        {
+            printf("\n");
+            printf("Block Size: %lu\n", statvfsbuf.f_bsize);
+            printf("Fragment Size: %lu\n", statvfsbuf.f_frsize);
+            printf("Blocks: %llu\n", statvfsbuf.f_blocks);
+            printf("Free Blocks: %llu\n", statvfsbuf.f_bfree);
+            printf("Available Blocks: %llu\n", statvfsbuf.f_bavail);
+            printf("Files : %llu\n", statvfsbuf.f_files);
+            printf("Free Files: %llu\n", statvfsbuf.f_ffree);
+            printf("Available Files: %llu\n", statvfsbuf.f_favail);
+            printf("File System ID: %lu\n", statvfsbuf.f_fsid);
+            printf("\n");
+
+            printf("Flags: 0x%lx\n", statvfsbuf.f_flag);
+            printf("Extended Features: ");
+
+            if (statvfsbuf.f_flag & SMBC_VFS_FEATURE_NO_UNIXCIFS)
+            {
+                printf("NO_UNIXCIFS ");
+            }
+            else
+            {
+                printf("unixcifs ");
+            }
+
+            if (statvfsbuf.f_flag & SMBC_VFS_FEATURE_CASE_INSENSITIVE)
+            {
+                printf("CASE_INSENSITIVE ");
+            }
+            else
+            {
+                printf("case_sensitive ");
+            }
+
+            if (statvfsbuf.f_flag & SMBC_VFS_FEATURE_DFS)
+            {
+                printf("DFS ");
+            }
+            else
+            {
+                printf("no_dfs ");
+            }
+
+            printf("\n");
+        }
+    }
+
+    return 0; 
+}
diff --git a/examples/libsmbclient/teststatvfs.c b/examples/libsmbclient/teststatvfs.c
new file mode 100644 (file)
index 0000000..8812002
--- /dev/null
@@ -0,0 +1,96 @@
+#include <sys/types.h>
+#include <sys/statvfs.h>
+#include <stdio.h> 
+#include <unistd.h>
+#include <string.h> 
+#include <time.h> 
+#include <errno.h>
+#include <libsmbclient.h> 
+#include "get_auth_data_fn.h"
+
+
+int main(int argc, char * argv[]) 
+{ 
+    int             i;
+    int             fd;
+    int             ret;
+    int             debug = 0;
+    char *          p;
+    char            path[2048];
+    struct stat     statbuf;
+    struct statvfs  statvfsbuf;
+    
+    smbc_init(get_auth_data_fn, debug); 
+    
+    for (;;)
+    {
+        fprintf(stdout, "Path: ");
+        *path = '\0';
+        fgets(path, sizeof(path) - 1, stdin);
+        if (strlen(path) == 0)
+        {
+            return 0;
+        }
+
+        p = path + strlen(path) - 1;
+        if (*p == '\n')
+        {
+            *p = '\0';
+        }
+    
+        ret = smbc_statvfs(path, &statvfsbuf);
+
+        if (ret < 0)
+        {
+            perror("fstatvfs");
+        }
+        else
+        {
+            printf("\n");
+            printf("Block Size: %lu\n", statvfsbuf.f_bsize);
+            printf("Fragment Size: %lu\n", statvfsbuf.f_frsize);
+            printf("Blocks: %llu\n", statvfsbuf.f_blocks);
+            printf("Free Blocks: %llu\n", statvfsbuf.f_bfree);
+            printf("Available Blocks: %llu\n", statvfsbuf.f_bavail);
+            printf("Files : %llu\n", statvfsbuf.f_files);
+            printf("Free Files: %llu\n", statvfsbuf.f_ffree);
+            printf("Available Files: %llu\n", statvfsbuf.f_favail);
+            printf("File System ID: %lu\n", statvfsbuf.f_fsid);
+            printf("\n");
+
+            printf("Flags: 0x%lx\n", statvfsbuf.f_flag);
+            printf("Extended Features: ");
+
+            if (statvfsbuf.f_flag & SMBC_VFS_FEATURE_NO_UNIXCIFS)
+            {
+                printf("NO_UNIXCIFS ");
+            }
+            else
+            {
+                printf("unixcifs ");
+            }
+
+            if (statvfsbuf.f_flag & SMBC_VFS_FEATURE_CASE_INSENSITIVE)
+            {
+                printf("CASE_INSENSITIVE ");
+            }
+            else
+            {
+                printf("case_sensitive ");
+            }
+
+            if (statvfsbuf.f_flag & SMBC_VFS_FEATURE_DFS)
+            {
+                printf("DFS ");
+            }
+            else
+            {
+                printf("no_dfs ");
+            }
+
+            printf("\n");
+        }
+    }
+
+    return 0; 
+}
index 683e91395b1558d6ae4f74305cc9a6404e4dd3ae..1a05a6941c5ab5514a31a3919e79a52c8d31097c 100755 (executable)
@@ -24,14 +24,14 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 killproc() 
 {
        pid=`ps aux | grep $1 | egrep -v '(grep|perfcountd)' | awk '{print $2}'`
-       if [ "$pid" != "" ]; then
+       if [ x"$pid" != "x" ]; then
                kill $pid
        fi
 }
 
 # Start/stop processes 
 
-case "$1" 
+case "$1"
 in
 start)
        /opt/samba/bin/perfcount -d -f /var/lib/samba/perfmon 2> /dev/null
@@ -47,7 +47,7 @@ stop)
 
 status)
        pid=`ps aux | grep perfcount | egrep -v '(grep|perfcountd)' | awk '{print $2}'`
-       if [ "$pid" == "" ]; then
+       if [ x"$pid" = "x" ]; then
                echo "Dead!"
                exit 2;
        fi
index 75960402053b6865dfc545f07527aa42b6c334eb..b9a1ee12c2beb6f05065f98916874cec72e1264e 100755 (executable)
@@ -1,37 +1,56 @@
+#!/bin/sh
 
 case `uname -m` in
-     x86_64)
-       libdir=/usr/lib64/samba
-       ;;
-     *)
-       libdir=/usr/lib/samba
-       ;;
+       x86_64)
+               _libarch=lib64
+               ;;
+       *)
+               _libarch=lib
+               ;;
 esac
 
-CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure \
-        --prefix=/usr \
-        --localstatedir=/var \
-        --with-configdir=/etc/samba \
-        --with-libdir=$libdir \
-        --with-lockdir=/var/lib/samba \
-        --with-logfilebase=/var/log/samba \
-        --with-mandir=/usr/man \
-        --with-piddir=/var/run \
-        --with-privatedir=/etc/samba \
-        --with-sambabook=/usr/share/swat/using_samba \
-        --with-swatdir=/usr/share/swat \
+_libarchdir=/usr/${_libarch}
+
+_prefix=/usr
+_sysconfdir=/etc
+_mandir=/usr/man
+_datadir=/usr/share
+
+# check for ccache
+ccache -h 2>&1 > /dev/null
+if [ $? -eq 0 ]; then
+       CC="ccache gcc"
+else
+       CC="gcc"
+fi
+
+./autogen.sh
+
+CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure -C \
+       --prefix=${_prefix} \
+       --localstatedir=/var \
+       --with-configdir=${_sysconfdir}/samba \
+       --with-libdir=${_libarchdir}/samba \
+       --with-pammodulesdir=/${_libarch}/security \
+       --with-lockdir=/var/lib/samba \
+       --with-logfilebase=/var/log/samba \
+       --with-mandir=${_mandir} \
+       --with-piddir=/var/run \
+       --with-privatedir=${_sysconfdir}/samba \
+       --with-sambabook=${_datadir}/swat/using_samba \
+       --with-swatdir=${_datadir}/swat \
        --disable-cups \
-        --with-acl-support \
+       --with-acl-support \
        --with-ads \
-        --with-automount \
-        --with-fhs \
+       --with-automount \
+       --with-fhs \
        --with-pam_smbpass \
        --with-libsmbclient \
        --with-libsmbsharemodes \
-        --without-smbwrapper \
+       --without-smbwrapper \
        --with-pam \
        --with-quotas \
-       --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2 \
+       --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2,vfs_gpfs \
        --with-syslog \
        --with-utmp \
        --with-cluster-support \
@@ -40,3 +59,6 @@ CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure \
        --without-dnsupdate \
        --with-aio-support \
        $*
+
+make showlayout
+
index 219982fda907b8c310b338012336dc153efdf01f..50fa96c2b11248827c7d496bfad556b8ed54abf8 100755 (executable)
@@ -25,8 +25,6 @@ RPMSRCDIR=`rpm --eval %_sourcedir`
 
 DIRNAME=$(dirname $0)
 TOPDIR=${DIRNAME}/../..
-SRCDIR=${TOPDIR}/source
-VERSION_H=${SRCDIR}/include/version.h
 
 SPECFILE="samba.spec"
 DOCS="docs.tar.bz2"
@@ -49,25 +47,14 @@ esac
 ##
 ## determine the samba version and create the SPEC file
 ##
-pushd ${SRCDIR}
-./script/mkversion.sh
-popd
-if [ ! -f ${VERSION_H} ] ; then
-       echo "Error creating version.h"
-       exit 1
+${DIRNAME}/makespec.sh
+RC=$?
+if [ $RC -ne 0 ]; then
+       exit ${RC}
 fi
 
-VERSION=`grep SAMBA_VERSION_OFFICIAL_STRING ${VERSION_H} | awk '{print $3}'`
-vendor_version=`grep SAMBA_VERSION_VENDOR_SUFFIX ${VERSION_H} | awk '{print $3}'`
-if test "x${vendor_version}"  != "x" ; then
-       VERSION="${VERSION}-${vendor_version}"
-fi
-VERSION=`echo ${VERSION} | sed 's/-/_/g'`
-VERSION=`echo ${VERSION} | sed 's/\"//g'`
-echo "VERSION: ${VERSION}"
-sed -e s/PVERSION/${VERSION}/g \
-       < ${DIRNAME}/${SPECFILE}.tmpl \
-       > ${DIRNAME}/${SPECFILE}
+RELEASE=$(grep ^Release ${DIRNAME}/${SPECFILE} | sed -e 's/^Release:\ \+//')
+VERSION=$(grep ^Version ${DIRNAME}/${SPECFILE} | sed -e 's/^Version:\ \+//')
 
 ##
 ## create the tarball
diff --git a/packaging/RHEL-CTDB/makespec.sh b/packaging/RHEL-CTDB/makespec.sh
new file mode 100755 (executable)
index 0000000..ae58db0
--- /dev/null
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# Copyright (C) Michael Adam 2008
+#
+# Script to determine the samba version and create the SPEC file from template
+
+DIRNAME=$(dirname $0)
+TOPDIR=${DIRNAME}/../..
+SRCDIR=${TOPDIR}/source
+VERSION_H=${SRCDIR}/include/version.h
+SPECFILE=${DIRNAME}/samba.spec
+
+##
+## determine the samba version and create the SPEC file
+##
+pushd ${SRCDIR}
+./script/mkversion.sh
+popd
+if [ ! -f ${VERSION_H} ] ; then
+       echo "Error creating version.h"
+       exit 1
+fi
+
+VERSION=`grep SAMBA_VERSION_OFFICIAL_STRING ${VERSION_H} | awk '{print $3}'`
+vendor_version=`grep SAMBA_VERSION_VENDOR_SUFFIX ${VERSION_H} | awk '{print $3}'`
+if test "x${vendor_version}"  != "x" ; then
+       VERSION="${VERSION}-${vendor_version}"
+fi
+VERSION=`echo ${VERSION} | sed 's/-/_/g'`
+VERSION=`echo ${VERSION} | sed 's/\"//g'`
+echo "VERSION: ${VERSION}"
+sed -e s/PVERSION/${VERSION}/g \
+       < ${SPECFILE}.tmpl \
+       > ${SPECFILE}
+
index b34f01f6598a01b9b9a13c229f6b0c8d52eb22dc..c8f31f3170d197f3d37accfb2fbf63db3a73d611 100644 (file)
@@ -133,12 +133,13 @@ cd source
 # RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
 
 ## check for ccache
-# ccache -h 2>&1 > /dev/null
-#if [ $? -eq 0 ]; then
-#      CC="ccache gcc"
-#else
+if ccache -h >/dev/null 2>&1 ; then
+       CC="ccache gcc"
+else
        CC="gcc"
-#fi 
+fi
+
+export CC
 
 ## always run autogen.sh
 ./autogen.sh
@@ -149,6 +150,7 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
         --with-configdir=%{_sysconfdir}/samba \
         --libdir=%{_libarchdir} \
        --with-modulesdir=%{_libarchdir}/samba \
+       --with-pammodulesdir=%{_libarch}/security \
         --with-lockdir=/var/lib/samba \
         --with-logfilebase=/var/log/samba \
         --with-mandir=%{_mandir} \
@@ -167,7 +169,7 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
         --without-smbwrapper \
        --with-pam \
        --with-quotas \
-       --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2 \
+       --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2,vfs_gpfs \
        --with-syslog \
        --with-utmp \
        --with-cluster-support \
@@ -192,12 +194,6 @@ fi
 make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %{?_smp_mflags} \
        all modules pam_smbpass
 
-## build the cifs fs mount helper
-cd client
-gcc  -o mount.cifs $RPM_OPT_FLAGS  -D_GNU_SOURCE -Wall -D_GNU_SOURCE -D_LARGEFILE64_SOURCE mount.cifs.c
-gcc  -o umount.cifs $RPM_OPT_FLAGS  -D_GNU_SOURCE -Wall -D_GNU_SOURCE -D_LARGEFILE64_SOURCE umount.cifs.c
-cd ..
-
 # Remove some permission bits to avoid to many dependencies
 cd ..
 find examples docs -type f | xargs -r chmod -x
@@ -230,8 +226,7 @@ make DESTDIR=$RPM_BUILD_ROOT \
         install
 cd ..
 
-# NSS & PAM winbind support
-install -m 755 source/bin/pam_winbind.so $RPM_BUILD_ROOT/%{_libarch}/security/pam_winbind.so
+# NSS winbind support
 install -m 755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_libarch}/libnss_winbind.so.2
 ( cd $RPM_BUILD_ROOT/%{_libarch};
   ln -sf libnss_winbind.so.2  libnss_winbind.so )
@@ -242,8 +237,6 @@ install -m 755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_libarch}/lib
 #install -m 755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_libarch}/libnss_wins.so
 # ( cd $RPM_BUILD_ROOT/%{_libarch}; ln -sf libnss_wins.so  libnss_wins.so.2 )
 
-# Install pam_smbpass.so
-install -m755 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_libarch}/security/pam_smbpass.so
 
 ## cleanup
 /bin/rm -rf $RPM_BUILD_ROOT/usr/lib*/samba/security
@@ -260,8 +253,8 @@ install -m644 setup/samba.pamd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/samba
 install -m755 setup/smbprint $RPM_BUILD_ROOT%{_bindir}
 install -m644 setup/smbusers $RPM_BUILD_ROOT%{_sysconfdir}/samba/smbusers
 install -m644 setup/smb.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
-install -m755 source/client/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
-install -m755 source/client/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
+install -m755 source/bin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
+install -m755 source/bin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
 install -m755 source/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
 
 /bin/rm $RPM_BUILD_ROOT%{_sbindir}/*mount.cifs
@@ -419,6 +412,8 @@ exit 0
 /sbin/mount.cifs
 /sbin/umount.cifs
 
+%{_sbindir}/cifs.upcall
+
 %{_bindir}/rpcclient
 %{_bindir}/smbcacls
 %{_bindir}/findsmb
@@ -432,6 +427,7 @@ exit 0
 
 %{_mandir}/man8/mount.cifs.8.*
 %{_mandir}/man8/umount.cifs.8.*
+%{_mandir}/man8/cifs.upcall.8*
 %{_mandir}/man8/smbspool.8*
 %{_mandir}/man1/smbget.1*
 %{_mandir}/man5/smbgetrc.5*
@@ -512,7 +508,6 @@ exit 0
 %{_mandir}/man1/ldbedit.1*
 %{_mandir}/man1/ldbmodify.1*
 %{_mandir}/man1/ldbsearch.1*
-%{_mandir}/man8/cifs.upcall.8*
 
 %ifarch i386 i486 i586 i686 ppc s390
 %files winbind-32bit
index 92030fcd6b73a582e70f9ac1db8efa51a2479909..f674e8386c947a389c07a7bc8c2e407593cae0c7 100644 (file)
@@ -178,12 +178,6 @@ fi
 make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %{?_smp_mflags} \
        all modules pam_smbpass
 
-## build the cifs fs mount helper
-cd client
-gcc  -o mount.cifs $RPM_OPT_FLAGS  -D_GNU_SOURCE -Wall -D_GNU_SOURCE -D_LARGEFILE64_SOURCE mount.cifs.c
-gcc  -o umount.cifs $RPM_OPT_FLAGS  -D_GNU_SOURCE -Wall -D_GNU_SOURCE -D_LARGEFILE64_SOURCE umount.cifs.c
-cd ..
-
 # Remove some permission bits to avoid to many dependencies
 cd ..
 find examples docs -type f | xargs -r chmod -x
@@ -238,8 +232,8 @@ install -m644 setup/samba.pamd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/samba
 install -m755 setup/smbprint $RPM_BUILD_ROOT%{_bindir}
 install -m644 setup/smbusers $RPM_BUILD_ROOT%{_sysconfdir}/samba/smbusers
 install -m644 setup/smb.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
-install -m755 source/client/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
-install -m755 source/client/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
+install -m755 source/bin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
+install -m755 source/bin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
 install -m755 source/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
 
 /bin/rm $RPM_BUILD_ROOT%{_sbindir}/*mount.cifs
diff --git a/packaging/bin/fill-templates b/packaging/bin/fill-templates
new file mode 100755 (executable)
index 0000000..20e32b2
--- /dev/null
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+# Script to fill the packaging templates with the version
+# information that is created by mkversion in advance.
+#
+# This is a standalone wrapper for update-pkginfo, which
+# is ususally called from release-scripts/create-tarball.
+# This allows for testing some aspects of packaging without
+# the need to go through all of create-tarball.
+#
+# Copyright (C) Michael Adam 2009
+#
+# License: GPL
+
+DIRNAME=$(dirname $0)
+TOPDIR=${DIRNAME}/../..
+SRCDIR=${TOPDIR}/source
+VERSION_H=${SRCDIR}/include/version.h
+
+pushd ${SRCDIR} > /dev/null 2>&1
+./script/mkversion.sh
+popd > /dev/null 2>&1
+
+if [ ! -f ${VERSION_H} ] ; then
+       echo "Error creating version.h"
+       exit 1
+fi
+
+VERSION=`grep "define SAMBA_VERSION_OFFICIAL_STRING" ${VERSION_H} | awk '{print $3}'`
+
+vendor_version=`grep "define SAMBA_VERSION_VENDOR_SUFFIX" ${VERSION_H} | awk '{print $3}'`
+if test "x${vendor_version}" != "x" ; then
+       VERSION="${VERSION}-${vendor_version}"
+fi
+
+vendor_patch=`grep "define SAMBA_VERSION_VENDOR_PATCH" ${VERSION_H} | awk '{print $3}'`
+if test "x${vendor_patch}" != "x" ; then
+       VERSION="${VERSION}-${vendor_patch}"
+fi
+
+VERSION=`echo ${VERSION} | sed 's/\"//g'`
+
+echo "VERSION: ${VERSION}"
+
+pushd ${TOPDIR}/packaging > /dev/null 2>&1
+./bin/update-pkginfo "${VERSION}" 1 ""
+popd > /dev/null 2>&1
index 020c773da08a80e4a439e986b0d5a978cb5e2635..7587f689d910ff148946204ef8a0d206a987a36b 100755 (executable)
@@ -14,10 +14,13 @@ if [ $# -ne 3 ]; then
     echo Usage: update-pkginfo VERSION RELEASE REVISION
     exit 1
 fi
-# PREV=`echo ${REVISION} | sed 's/[^0-9]//g'`
-# PREV="."`echo ${REVISION} | sed 's/[0-9]//g'`".${PREV}"
 
-for f in `du -a | awk '{print $2}' | grep \.tmpl$`; do
+DIRNAME=$(dirname $0)
+TOPDIR=${DIRNAME}/../../
+PACKAGINGDIR=${TOPDIR}/packaging
+
+pushd ${PACKAGINGDIR} > /dev/null 2>&1
+for f in `find . -type f -name "*.tmpl"`; do
         f2=`echo $f | sed s/.tmpl//g`
         echo $f2
         sed -e s/PVERSION/$VERSION/g \
@@ -25,4 +28,4 @@ for f in `du -a | awk '{print $2}' | grep \.tmpl$`; do
                -e s/PREVISION/${REVISION}/g \
                -e s/PRPMREV/${RPMREVISION}/g < $f > $f2
 done
-
+popd > /dev/null 2>&1
index 357b4e9847f84447827140bd0775c5c763b51d28..5da641ac691edb9698ad3259824175f6822edcaa 100755 (executable)
@@ -1,8 +1,14 @@
 #!/bin/sh
 
+_exit() {
+       echo $@
+       popd
+       exit 1
+}
+
 DOCSRCDIR=`dirname $0`/../docs-xml
 
-cd $DOCSRCDIR || exit 1
+pushd $DOCSRCDIR || exit 1
 
 git clean -d -x -f
 autoconf && \
@@ -11,21 +17,23 @@ autoconf && \
        make release
 
 if [ $? != 0 ]; then
-        echo "Docs build failed!"
-        exit 1
+        _exit "Docs build failed!"
 fi
 
-mkdir ../docs
+mkdir -p ../docs
 rsync -Ca --delete --exclude=.git output/ ../docs/
 rsync -Ca --exclude=.svn registry ../docs/
 rsync -Ca --exclude=.svn archives/ ../docs/
 
-cd ../docs || exit 1
+cd ../docs || _exit "Error changing dir to ${DOCSDIR}/../docs/"
+
 /bin/rm -rf test.pdf Samba4*pdf htmldocs/Samba4* htmldocs/test
 mv manpages-3 manpages
 mv htmldocs/manpages-3 htmldocs/manpages
 
-cd $DOCSRCDIR || exit 1
-make clean
+cd ../docs-xml || _exit "Error changing dir to ${DOCSDIR}/../docs-xml/"
+make distclean
 
+echo "Success"
+popd
 exit
index da39d89c9022b99bb7bd2aa1d1ad041372161840..d468dd3bd8f961b3956ab563791322fdfb00376c 100755 (executable)
@@ -183,6 +183,10 @@ function main
     if [ -n "$vendor_version" ]; then
        version="$version-$vendor_version"
     fi
+    vendor_patch=`grep "define SAMBA_VERSION_VENDOR_PATCH" $VER_H | awk '{print $3}'`
+    if [ -n "$vendor_patch" ]; then
+       version="$version-$vendor_patch"
+    fi
     version=`echo $version | sed 's/\"//g'`
 
     echo "Creating release tarball for Samba $version"
index 5e1aed46f6a4f8f1675868731f0aad8fe7f78a69..f7b443160f8e66919edc45f0a0df874d1eca71fe 100644 (file)
@@ -126,7 +126,6 @@ INSTALLPERMS_DATA = 0644
 LOGFILEBASE = @logfilebase@
 CONFIGFILE = $(CONFIGDIR)/smb.conf
 LMHOSTSFILE = $(CONFIGDIR)/lmhosts
-CTDBDIR = @ctdbdir@
 
 # This is where smbpasswd et al go
 PRIVATEDIR = @privatedir@
@@ -192,10 +191,10 @@ BIN_PROGS2 = bin/smbcontrol@EXEEXT@ bin/smbtree@EXEEXT@ bin/tdbbackup@EXEEXT@ \
        bin/nmblookup@EXEEXT@ bin/pdbedit@EXEEXT@ bin/tdbdump@EXEEXT@ \
        bin/tdbtool@EXEEXT@
 BIN_PROGS3 = bin/smbpasswd@EXEEXT@ bin/rpcclient@EXEEXT@ bin/smbcacls@EXEEXT@ \
-       bin/profiles@EXEEXT@ bin/ntlm_auth@EXEEXT@ \
+       bin/profiles@EXEEXT@ bin/ntlm_auth@EXEEXT@ bin/sharesec@EXEEXT@ \
        bin/smbcquotas@EXEEXT@ bin/eventlogadm@EXEEXT@
 BIN_PROGS4 = bin/ldbedit@EXEEXT@ bin/ldbsearch@EXEEXT@ bin/ldbadd@EXEEXT@ \
-       bin/ldbdel@EXEEXT@ bin/ldbmodify@EXEEXT@
+       bin/ldbdel@EXEEXT@ bin/ldbmodify@EXEEXT@ bin/ldbrename@EXEEXT@
 
 TORTURE_PROGS = bin/smbtorture@EXEEXT@ bin/msgtest@EXEEXT@ \
        bin/masktest@EXEEXT@ bin/locktest@EXEEXT@ \
@@ -724,7 +723,7 @@ NMBD_OBJ = $(NMBD_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
 SWAT_OBJ1 = web/cgi.o web/diagnose.o web/startstop.o web/statuspage.o \
            web/swat.o web/neg_lang.o
 
-SWAT_OBJ = $(SWAT_OBJ1) $(PARAM_OBJ) $(PRINTING_OBJ) $(LIBSMB_OBJ) \
+SWAT_OBJ = $(SWAT_OBJ1) $(PARAM_OBJ) $(PRINTING_OBJ) $(PRINTBASE_OBJ) $(LIBSMB_OBJ) \
           $(LOCKING_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(KRBCLIENT_OBJ) \
           $(LIB_NONSMBD_OBJ) $(GROUPDB_OBJ) $(PLAINTEXT_AUTH_OBJ) \
           $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) $(RPC_PARSE_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \
@@ -1081,6 +1080,7 @@ LDBSEARCH_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbsearch.o
 LDBADD_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbadd.o
 LDBDEL_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbdel.o
 LDBMODIFY_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbmodify.o
+LDBRENAME_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbrename.o
 
 WINBIND_KRB5_LOCATOR_OBJ1 = nsswitch/winbind_krb5_locator.o
 WINBIND_KRB5_LOCATOR_OBJ = $(WINBIND_KRB5_LOCATOR_OBJ1) $(LIBREPLACE_OBJ)
@@ -1202,8 +1202,10 @@ IDL_FILES = lsa.idl dfs.idl echo.idl winreg.idl initshutdown.idl \
        dssetup.idl krb5pac.idl ntsvcs.idl libnetapi.idl drsuapi.idl drsblobs.idl \
        nbt.idl
 
+PIDL = "$(srcdir)/pidl/pidl"
+
 idl::
-       @IDL_FILES="$(IDL_FILES)" CPP="$(CPP)" PERL="$(PERL)" \
+       @IDL_FILES="$(IDL_FILES)" CPP="$(CPP)" PERL="$(PERL)" PIDL="$(PIDL)"\
         srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh $(PIDL_ARGS)
 
 
@@ -1510,7 +1512,7 @@ bin/pdbtest@EXEEXT@: $(BINARY_PREREQS) $(PDBTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SH
 bin/vfstest@EXEEXT@: $(BINARY_PREREQS) $(VFSTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
        @echo Linking $@
        @$(CC) $(FLAGS) -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) \
-               $(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
+               $(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(DNSSD_LIBS) \
                $(ACL_LIBS) $(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \
                @SMBD_LIBS@ $(NSCD_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
                $(WINBIND_LIBS)
@@ -1578,6 +1580,12 @@ bin/ldbdel: $(BINARY_PREREQS) $(LDBDEL_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIB
                $(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
                $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
 
+bin/ldbrename: $(BINARY_PREREQS) $(LDBRENAME_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
+       @echo Linking $@
+       @$(CC) $(FLAGS) -o $@ $(LDBRENAME_OBJ) $(DYNEXP) $(LDFLAGS) \
+               $(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
+               $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
+
 
 #####################################################################
 #
@@ -1616,7 +1624,7 @@ $(LIBTALLOC_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBTALLOC_OBJ) $(LIBTALLO
 
 $(LIBTALLOC_SHARED_TARGET): $(LIBTALLOC_SHARED_TARGET_SONAME)
        @rm -f $@
-       @ln -s -f `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` $@
+       @ln -f -s `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` $@
 
 $(LIBTALLOC_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ0)
        @echo Linking non-shared library $@
@@ -1636,7 +1644,7 @@ installlibtalloc:: installdirs libtalloc
        -$(INSTALLLIBCMD_SH) $(LIBTALLOC_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
        @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)`
        -if test -r $(LIBTALLOC_SHARED_TARGET_SONAME) ; then \
-               ln -s -f `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` \
+               ln -f -s `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` \
                        $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)` ; \
        fi
        -$(INSTALLLIBCMD_A) $(LIBTALLOC_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
@@ -1682,7 +1690,7 @@ $(LIBTDB_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBTDB_OBJ) $(LIBTDB_SYMS)
 
 $(LIBTDB_SHARED_TARGET): $(LIBTDB_SHARED_TARGET_SONAME)
        @rm -f $@
-       @ln -s -f `basename $(LIBTDB_SHARED_TARGET_SONAME)` $@
+       @ln -f -s `basename $(LIBTDB_SHARED_TARGET_SONAME)` $@
 
 $(LIBTDB_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTDB_OBJ0)
        @echo Linking non-shared library $@
@@ -1703,7 +1711,7 @@ installlibtdb:: installdirs libtdb
        -$(INSTALLLIBCMD_SH) $(LIBTDB_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
        @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)`
        -if test -r $(LIBTDB_SHARED_TARGET_SONAME) ; then \
-               ln -s -f `basename $(LIBTDB_SHARED_TARGET_SONAME)` \
+               ln -f -s `basename $(LIBTDB_SHARED_TARGET_SONAME)` \
                        $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)` ; \
        fi
        -$(INSTALLLIBCMD_A) $(LIBTDB_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
@@ -1757,7 +1765,7 @@ $(LIBWBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ) $(LIBW
 
 $(LIBWBCLIENT_SHARED_TARGET): $(LIBWBCLIENT_SHARED_TARGET_SONAME)
        @rm -f $@
-       @ln -s -f `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` $@
+       @ln -f -s `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` $@
 
 $(LIBWBCLIENT_STATIC_TARGET): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ0) $(WBCOMMON_OBJ)
        @echo Linking non-shared library $@
@@ -1777,7 +1785,7 @@ installlibwbclient:: installdirs libwbclient
        -$(INSTALLLIBCMD_SH) $(LIBWBCLIENT_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
        @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET)`
        -if test -r $(LIBWBCLIENT_SHARED_TARGET_SONAME) ; then \
-               ln -s -f `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` \
+               ln -f -s `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` \
                        $(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET)` ; \
        fi
        @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
@@ -1818,7 +1826,7 @@ $(LIBADDNS_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBADDNS_OBJ) @LIBTALLOC_S
 
 $(LIBADDNS_SHARED_TARGET): $(LIBADDNS_SHARED_TARGET_SONAME)
        @rm -f $@
-       @ln -s -f `basename $(LIBADDNS_SHARED_TARGET_SONAME)` $@
+       @ln -f -s `basename $(LIBADDNS_SHARED_TARGET_SONAME)` $@
 
 $(LIBADDNS_STATIC_TARGET): $(BINARY_PREREQS) $(LIBADDNS_OBJ0)
        @echo Linking non-shared library $@
@@ -1837,7 +1845,7 @@ installlibaddns:: installdirs libaddns
        -$(INSTALLLIBCMD_SH) $(LIBADDNS_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
        @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_SHARED_TARGET)`
        -if test -r $(LIBADDNS_SHARED_TARGET_SONAME) ; then \
-               ln -s -f `basename $(LIBADDNS_SHARED_TARGET_SONAME)` \
+               ln -f -s `basename $(LIBADDNS_SHARED_TARGET_SONAME)` \
                        $(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_SHARED_TARGET)` ; \
        fi
        -$(INSTALLLIBCMD_A) $(LIBADDNS_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
@@ -1904,7 +1912,7 @@ $(LIBNETAPI_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBNETAPI_OBJ) $(LIBNETAP
 
 $(LIBNETAPI_SHARED_TARGET): $(LIBNETAPI_SHARED_TARGET_SONAME)
        @rm -f $@
-       @ln -s -f `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` $@
+       @ln -f -s `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` $@
 
 $(LIBNETAPI_STATIC_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ0)
        @echo Linking non-shared library $@
@@ -1924,7 +1932,7 @@ installlibnetapi:: installdirs libnetapi
        -$(INSTALLLIBCMD_SH) $(LIBNETAPI_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
        @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_SHARED_TARGET)`
        -if test -r $(LIBNETAPI_SHARED_TARGET_SONAME) ; then \
-               ln -s -f `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` \
+               ln -f -s `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` \
                        $(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_SHARED_TARGET)` ; \
        fi
        -$(INSTALLLIBCMD_A) $(LIBNETAPI_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
@@ -1988,7 +1996,7 @@ installlibsmbclient:: installdirs libsmbclient
        -$(INSTALLLIBCMD_SH) $(LIBSMBCLIENT_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
        @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_SHARED_TARGET)`
        -if test -r $(LIBSMBCLIENT_SHARED_TARGET_SONAME) ; then \
-               ln -s -f `basename $(LIBSMBCLIENT_SHARED_TARGET_SONAME)` \
+               ln -f -s `basename $(LIBSMBCLIENT_SHARED_TARGET_SONAME)` \
                        $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_SHARED_TARGET)` ; \
        fi
        -$(INSTALLLIBCMD_A) $(LIBSMBCLIENT_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
@@ -2041,7 +2049,7 @@ $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBSHAREMODES_O
 
 $(LIBSMBSHAREMODES_SHARED_TARGET): $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)
        @rm -f $@
-       @ln -s -f `basename $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)` $@
+       @ln -f -s `basename $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)` $@
 
 $(LIBSMBSHAREMODES_STATIC_TARGET): $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ0)
        @echo Linking non-shared library $@
@@ -2060,7 +2068,7 @@ installlibsmbsharemodes:: installdirs libsmbsharemodes
        -$(INSTALLLIBCMD_SH) $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
        @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_SHARED_TARGET)`
        -if test -r $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME) ; then \
-               ln -s -f `basename $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)` \
+               ln -f -s `basename $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)` \
                        $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_SHARED_TARGET)` ; \
        fi
        -$(INSTALLLIBCMD_A) $(LIBSMBSHAREMODES_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
index 0056eb73ff45e3901591d57097c90207698d9642..d248ea1a8270097d97927400415a7b8fb4ab818a 100644 (file)
@@ -25,7 +25,7 @@
 ########################################################
 SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=3
-SAMBA_VERSION_RELEASE=0
+SAMBA_VERSION_RELEASE=1
 
 ########################################################
 # Bug fix releases use a letter for the patch revision #
index d2a8591ae61e9e97dadc3877dd86b21997f0edad..b84c1688d83eb2134ddba0bddd6ddb17688a4edb 100644 (file)
@@ -555,9 +555,6 @@ NTSTATUS make_server_info_sam(auth_serversupplied_info **server_info,
        struct passwd *pwd;
        gid_t *gids;
        auth_serversupplied_info *result;
-       int i;
-       size_t num_gids;
-       DOM_SID unix_group_sid;
        const char *username = pdb_get_username(sampass);
        NTSTATUS status;
 
@@ -573,8 +570,6 @@ NTSTATUS make_server_info_sam(auth_serversupplied_info **server_info,
        }
 
        result->sam_account = sampass;
-       /* Ensure thaat the sampass will be freed with the result */
-       talloc_steal(result, sampass);
        result->unix_name = pwd->pw_name;
        /* Ensure that we keep pwd->pw_name, because we will free pwd below */
        talloc_steal(result, pwd->pw_name);
@@ -631,30 +626,6 @@ NTSTATUS make_server_info_sam(auth_serversupplied_info **server_info,
                }
        }
 
-       /* Add the "Unix Group" SID for each gid to catch mapped groups
-          and their Unix equivalent.  This is to solve the backwards 
-          compatibility problem of 'valid users = +ntadmin' where 
-          ntadmin has been paired with "Domain Admins" in the group 
-          mapping table.  Otherwise smb.conf would need to be changed
-          to 'valid user = "Domain Admins"'.  --jerry */
-       
-       num_gids = result->num_sids;
-       for ( i=0; i<num_gids; i++ ) {
-               if ( !gid_to_unix_groups_sid( gids[i], &unix_group_sid ) ) {
-                       DEBUG(1,("make_server_info_sam: Failed to create SID "
-                               "for gid %d!\n", gids[i]));
-                       continue;
-               }
-               status = add_sid_to_array_unique(result, &unix_group_sid,
-                                                &result->sids,
-                                                &result->num_sids);
-               if (!NT_STATUS_IS_OK(status)) {
-                       result->sam_account = NULL; /* Don't free on error exit. */
-                       TALLOC_FREE(result);
-                       return status;
-               }
-       }
-
        /* For now we throw away the gids and convert via sid_to_gid
         * later. This needs fixing, but I'd like to get the code straight and
         * simple first. */
@@ -665,6 +636,8 @@ NTSTATUS make_server_info_sam(auth_serversupplied_info **server_info,
                 pdb_get_username(sampass), result->unix_name));
 
        *server_info = result;
+       /* Ensure thaat the sampass will be freed with the result */
+       talloc_steal(result, sampass);
 
        return NT_STATUS_OK;
 }
@@ -719,6 +692,7 @@ NTSTATUS create_local_token(auth_serversupplied_info *server_info)
 {
        NTSTATUS status;
        size_t i;
+       struct dom_sid tmp_sid;
 
        /*
         * If winbind is not around, we can not make much use of the SIDs the
@@ -771,7 +745,44 @@ NTSTATUS create_local_token(auth_serversupplied_info *server_info)
                                        &server_info->utok.ngroups);
        }
 
+       /*
+        * Add the "Unix Group" SID for each gid to catch mapped groups
+        * and their Unix equivalent.  This is to solve the backwards
+        * compatibility problem of 'valid users = +ntadmin' where
+        * ntadmin has been paired with "Domain Admins" in the group
+        * mapping table.  Otherwise smb.conf would need to be changed
+        * to 'valid user = "Domain Admins"'.  --jerry
+        *
+        * For consistency we also add the "Unix User" SID,
+        * so that the complete unix token is represented within
+        * the nt token.
+        */
+
+       if (!uid_to_unix_users_sid(server_info->utok.uid, &tmp_sid)) {
+               DEBUG(1,("create_local_token: Failed to create SID "
+                       "for uid %d!\n", server_info->utok.uid));
+       }
+       add_sid_to_array_unique(server_info->ptok, &tmp_sid,
+                               &server_info->ptok->user_sids,
+                               &server_info->ptok->num_sids);
+
+       for ( i=0; i<server_info->utok.ngroups; i++ ) {
+               if (!gid_to_unix_groups_sid( server_info->utok.groups[i], &tmp_sid ) ) {
+                       DEBUG(1,("create_local_token: Failed to create SID "
+                               "for gid %d!\n", server_info->utok.groups[i]));
+                       continue;
+               }
+               add_sid_to_array_unique(server_info->ptok, &tmp_sid,
+                                       &server_info->ptok->user_sids,
+                                       &server_info->ptok->num_sids);
+       }
+
        debug_nt_user_token(DBGC_AUTH, 10, server_info->ptok);
+       debug_unix_user_token(DBGC_AUTH, 10,
+                             server_info->utok.uid,
+                             server_info->utok.gid,
+                             server_info->utok.ngroups,
+                             server_info->utok.groups);
 
        status = log_nt_token(server_info->ptok);
        return status;
index 9345eed27afb6103c48a02d741f7602271f2fe62..4312b771c95c1d7920771f7a913402e4a83c25f9 100644 (file)
@@ -462,7 +462,9 @@ static bool smb_pam_end(pam_handle_t *pamh, struct pam_conv *smb_pam_conv_ptr)
 static bool smb_pam_start(pam_handle_t **pamh, const char *user, const char *rhost, struct pam_conv *pconv)
 {
        int pam_error;
+#ifdef PAM_RHOST
        const char *our_rhost;
+#endif
        char addr[INET6_ADDRSTRLEN];
 
        *pamh = (pam_handle_t *)NULL;
@@ -475,6 +477,7 @@ static bool smb_pam_start(pam_handle_t **pamh, const char *user, const char *rho
                return False;
        }
 
+#ifdef PAM_RHOST
        if (rhost == NULL) {
                our_rhost = client_name(get_client_fd());
                if (strequal(our_rhost,"UNKNOWN"))
@@ -483,7 +486,6 @@ static bool smb_pam_start(pam_handle_t **pamh, const char *user, const char *rho
                our_rhost = rhost;
        }
 
-#ifdef PAM_RHOST
        DEBUG(4,("smb_pam_start: PAM: setting rhost to: %s\n", our_rhost));
        pam_error = pam_set_item(*pamh, PAM_RHOST, our_rhost);
        if(!smb_pam_error_handler(*pamh, pam_error, "set rhost failed", 0)) {
index d05a82a2637188fdbcb0c21bb3ffbce172eb16f6..53bd9e6f9aa814f0b782effbf62604a0e07ebdcf 100644 (file)
@@ -364,7 +364,7 @@ static int do_cd(const char *new_dir)
 
        /* Ensure cur_dir ends in a DIRSEP */
        if ((new_cd[0] != '\0') && (*(new_cd+strlen(new_cd)-1) != CLI_DIRSEP_CHAR)) {
-               new_cd = talloc_asprintf_append(new_cd, CLI_DIRSEP_STR);
+               new_cd = talloc_asprintf_append(new_cd, "%s", CLI_DIRSEP_STR);
                if (!new_cd) {
                        goto out;
                }
@@ -728,11 +728,11 @@ static void do_list_helper(const char *mntpoint, file_info *f, const char *mask,
                                return;
                        }
                        p = strrchr_m(mask2,CLI_DIRSEP_CHAR);
-                       if (!p) {
-                               TALLOC_FREE(dir);
-                               return;
+                       if (p) {
+                               p[1] = 0;
+                       } else {
+                               mask2[0] = '\0';
                        }
-                       p[1] = 0;
                        mask2 = talloc_asprintf_append(mask2,
                                        "%s%s*",
                                        f->name,
@@ -871,7 +871,7 @@ static int cmd_dir(void)
                if (*buf == CLI_DIRSEP_CHAR) {
                        mask = talloc_strdup(ctx, buf);
                } else {
-                       mask = talloc_asprintf_append(mask, buf);
+                       mask = talloc_asprintf_append(mask, "%s", buf);
                }
        } else {
                mask = talloc_asprintf_append(mask, "*");
@@ -912,7 +912,7 @@ static int cmd_du(void)
                return 1;
        }
        if ((mask[0] != '\0') && (mask[strlen(mask)-1]!=CLI_DIRSEP_CHAR)) {
-               mask = talloc_asprintf_append(mask, CLI_DIRSEP_STR);
+               mask = talloc_asprintf_append(mask, "%s", CLI_DIRSEP_STR);
                if (!mask) {
                        return 1;
                }
@@ -923,7 +923,7 @@ static int cmd_du(void)
                if (*buf == CLI_DIRSEP_CHAR) {