[SCM] Samba Shared Repository - branch v4-0-stable updated
Karolin Seeger
kseeger at samba.org
Tue Dec 4 03:19:47 MST 2012
The branch, v4-0-stable has been updated
via 484747c VERSION: Disable git snapshots to prepare rc6 release.
via 378dfec WHATSNEW: Update changes since RC5.
via e0e7437 docs: Fix typo in the howto collection.
via fabb2fd docs: Update man 7 samba.
via 05fa60f docs: Merge both samba.8 manpages.
via 2888d32 docs: Add samba.8 and samba-tool manpage to waf build.
via 1f92994 lib/talloc: Move manpage to man/.
via 83fb3ee lib/tdb: Rename manpages/ to man/.
via af88aeb s3-net: Fix DEBUG() location.
via 9032ddf s3-net: give more control how to update/register DNS entries.
via 64047e3 s3-net: pass down a flags field to DoDNSUpdate().
via d2f5c83 s3-net: move out some prototypes to net_dns.h.
via 95e91cb s3-net: pass down struct net_context to the dns update calls.
via fb7e960 s3:passdb: fix building pdb_ldap as shared module
via f86b276 WHATSNEW: Update changes since rc5.
via 2af84e6 samba-tool dns: Don't use "localhost" to connect to local host
via 23211c1 s4-rpc: dnsserver: Ignore DNS zones that are not used by RPC dnsserver
via 1d3864e s4-dns: dlz_bind9: Ignore zones that are not used by BIND9 DLZ plugin
via dc1eab6 s3:selftest: extend sids2xids test script to cope with "ID_TYPE_BOTH mappings
via b9efe2a s3:passdb: don't look into group mappings in legacy_sid_to_unixid()
via 0ec17f6 s3:passdb:pdb_ldap: treat "Unix User" and "Unix Group" in sid_to_id()
via 36eaa2c s3:passdb:pdb_ldap: pre-validate sid with sid_check_object_is_for_passdb()
via 17fa9a0 s3:passdb: add sid_check_object_is_for_passdb()
via 39e841d s3:passdb: factor pdb_sid_to_id_unix_users_and_groups() out of pdb_default_sid_to_id()
via 84f5bcb s3:passdb: don't bail out in pdb_default_sid_to_id() if sid is not in our sam
via 56c0e36 s3:winbindd: use the new sid_check_is_for_passdb() in idmap_find_domain_with_sid()
via b6a5c05 build the new sid_check_is_for_passdb() function into passdb
via 55f8b4b s3:lib: add utility function sid_check_is_for_passdb()
via ecb567f s3:winbindd: remove unused function idmap_backends_sid_to_unixid()
via b356ad6 s3:test:wbinfo_sids2xids: test the results with singular calls with filled and with empty cache
via 259cb7a s3:test: fix intialization of WBINFO in test_wbinfo_sids2xids.sh
via c6acdc4 s3:idmap_autorid: force mapping type to ID_TYPE_BOTH for sid->unixid mapping
via fe08853 s3:idmap_rid: force mapping type to ID_TYPE_BOTH for sid->unixid mapping
via 1529443 s3:winbindd: remove unused idmap_sid_to_gid()
via 7aae0ec s3:winbindd: remove unused idmap_sid_to_uid()
via 5c0e80d s3:winbindd: remove unused server implementation of wbint_Sid2Gid()
via e0a1396 s3:winbindd: remove unused server implementation of wbint_Sid2Uid()
via 2dc2490 s3:winbindd: remove wbint_Sid2Gid from the wbint.idl
via ccb054f s3:winbindd: remove wbint_Sid2Uid() from the wbint.idl
via db89bcc s3:winbindd: remove now unused wb_sid2uid and wb_sid2gid modules
via 15fc4e2 s3:winbindd: change winbindd_getgroups to use wb_sids2xids instead of wb_sid2gid
via 5978e13 s3:winbindd: change wb_getgrsid to use wb_sids2xids instead of wb_sid2gid
via 3cdb648 s3:winbindd: change wb_fill_pwent to use wb_sids2xids instead of wb_sid2[ug]id
via 4a3a6bc selftest:Samba3: provision the BUILTIN\Users group if the environment runs winbindd
via 5db6488 selftest:Samba3: add "wbinfo -p" test to wait_for_start()
via 5f4fb57 selftest:Samba3: add nmbd, winbindd smbd arguments to wait_for_start()
via 4575aae selftest:Samba3: call wait_for_start() from check_or_start()
via 9838175 s3:winbindd: make idmap_find_domain() static.
via ad9538b s3:winbindd: also use idmap_passdb for own sam and builtin in wbint_Sids2UnixIDs()
via eb90e9a s3:winbindd: add idmap_find_domain_with_sid()
via fd3ddba s3:winbindd: rename idmap_init_passdb_domain() -> idmap_passdb_domain()
via 9f0f141 selftest:Samba3: provision the domain adminstrators group in the s3 environments
via 3bb5a6c s3:winbindd: use struct unixid instead of uint64 in Sids2Xids parent<->child
via 35b03e7 s3:winbindd: add an explanatory comment to _wbint_Sids2UnixIDs()
via 403835f s3:winbindd: add an explanatory comment to _wbint_Sids2UnixIDs()
via 3cc4c38 s3:winbindd: use wb_sids2xids instead of wb_sid2gid in winbindd_sid_to_gid
via ce9c6d1 s3:winbindd: use wb_sids2xids instead of wb_sid2uid in winbindd_sid_to_uid
via 9b94125 s3:winbindd: factor winbindd_sids_to_xids into external and internal part
via 52d9672 s3:winbindd: convert some spaces to tabs in winbindd_sids_to_xids_send()
via 0d62bf4 s3:winbindd: add explaining comment winbindd_sids_to_xids_send()
via e2c3472 s3:winbindd: factor lsa_SidType_to_id_type() out of winbindd_sids_to_xids_lookupsids_done()
via b3ca88c s3:winbindd: simplify winbindd_sids_to_xids_recv() a bit.
via 50bb917 s3:winbindd:util: add a comment explaining the function parse_sidlist()
via ea33f9c s3:winbindd fix a compiler warning
via 57049b8 s3:winbindd fix a compiler warning
via 66c2120 s3:winbind:idmap_tdb_common: improve readability of assignment by adding an "if"
via 9f9677c s3:winbind:idmap_tdb_common: improve readability of assignment by adding an "if"
via 60871c1 s3: Fix idmap_hash
via ce4a390 s4:dsdb/descriptor: NULL out user_descriptor elements depending on the sd_flags
via 73e0b68 s4:dsdb/tests: add SdAutoInheritTests
via b54ea1e s4:dsdb/repl_meta_data: call dsdb_module_schedule_sd_propagation() for replicated changes
via 2cc2a1f s4:dsdb/descriptor: inherit nTSecurityDescriptor changes to children (bug #8621)
via 36b712f s4:dsdb/descriptor: recalculate nTSecurityDescriptor after a rename (bug #8621)
via ef67c59 s4:dsdb/acl_util: add dsdb_module_schedule_sd_propagation()
via 957a583 s4:dsdb/descriptor: implement DSDB_EXTENDED_SEC_DESC_PROPAGATION_OID
via 3513d73 s4:dsdb: define DSDB_EXTENDED_SEC_DESC_PROPAGATION_OID
via 3d81ebc s4:dsdb/descriptor: handle DSDB_CONTROL_SEC_DESC_PROPAGATION_OID
via 67c0761 s4:dsdb/schema_data: allow DSDB_CONTROL_SEC_DESC_PROPAGATION_OID on modify
via 8639079 s4:dsdb/repl_meta_data: allow DSDB_CONTROL_SEC_DESC_PROPAGATION_OID on modify
via 20d92f6 s4:dsdb/objectclass_attrs: allow DSDB_CONTROL_SEC_DESC_PROPAGATION_OID on modify
via 442609b s4:dsdb: define DSDB_CONTROL_SEC_DESC_PROPAGATION_OID
via f6c8ece s4:dsdb/subtree_delete: delete from the leafs to the root (bug #7711)
via eb4ff6a s4:dsdb/subtree_delete: do the recursive delete AS_SYSTEM/TRUSTED (bug #7711)
via f657975 s4:dsdb/subtree_delete: do an early return and avoid some nesting
via 4f77389 s4:dsdb/objectclass: do not pass the callers controls on helper searches
via e681f0d s4:dsdb/acl: require SEC_ADS_DELETE_TREE if the TREE_DELETE control is given (bug #7711)
via 958f488 s4:dsdb/dirsync: remove unused 'deletedattr' variable
via 68e443d s4:provision: add pekList and msDS-ExecuteScriptPassword to @KLUDGEACL
via 6e0d9e8 s4:dsdb/common: add pekList and msDS-ExecuteScriptPassword to DSDB_SECRET_ATTRIBUTES_EX
via 72718dd s4:dsdb/acl: also add DSDB_SECRET_ATTRIBUTES into the password attributes
via 2dc2ea5 s4:dsdb/descriptor: the old nTSecurityDescriptor is always expected there on modify
via 73f845b s4:dsdb/descriptor: make explicit that we don't support MOD_DELETE on nTSecurityDescriptor
via 7397218 s4:dsdb/descriptor: remove some nesting from descriptor_modify
via 9ac44ae s4:dsdb/descriptor: remove some unnecessary nesting
via 83a64e4 s4:dsdb/descriptor: add some error checks to descriptor_{add,modify}
via de75b1c s4:dsdb/descriptor: remove support for unused LDB_CONTROL_RECALCULATE_SD_OID
via 82b08af s4:dsdb/descriptor: move special dn check to the start of descriptor_{add,modify,rename}
via 71486a9 s4:samba_upgradeprovision: use the sd_flags:1:15 control with an empty sd
via 0da0478 s4:provision: add get_empty_descriptor()
via 8da430d s4:dsdb/descriptor: if the caller specifies no DACL/SACL the objects gets a default one
via b931c8d s4:dsdb/descriptor: give SYSTEM the correct default owner (group) sid
via f4c4f0d s4:dsdb/acl_read: enable acl checking on search by default (bug #8620)
via 08706b5 s4:dsdb/acl_read: specify the correct access_mask for nTSecurityDescriptor
via aa6bab84 s4:dsdb/acl_read: do search for instanceType AS_SYSTEM and with SHOW_RECYCLED
via 936cff0 s4:dsdb/acl: calculate the correct access_mask when modifying nTSecurityDescriptor
via d7d1c73 s4:dsdb/acl: don't protect confidential attributes when "acl:search = yes" is set
via a600f89 s4:dsdb/acl: remove unused "acl:perform" option
via 502ab6d s4:dsdb/acl: do helper searches AS_SYSTEM and with SHOW_RECYCLED
via dea1768 s4:dsdb/descriptor: make it clear that the SD Flags are ignored on add
via 695b079 s4:dsdb/descriptor: make use of dsdb_request_sd_flags()
via 8e85a3d s4:dsdb/descriptor: always use descriptor_search_callback if we return nTSecurityDescriptor
via f758629 s4:dsdb/descriptor: do searches for nTSecurityDescriptor AS_SYSTEM and with SHOW_RECYCLED
via a1ccdc1 s4:dsdb/acl_util: add dsdb_request_sd_flags() helper function
via 01de895 s4:dsdb/acl_util: do helper searches AS_SYSTEM
via c9cad1d s4:dsdb/extended_dn_store: do helper searches AS_SYSTEM
via 0ea8c2a s4:dsdb/extended_dn_in: do helper searches AS_SYSTEM and with SHOW_RECYCLED
via ea18372 s4:dsdb/objectclass: do helper searches AS_SYSTEM and with SHOW_RECYCLED
via da53837 s4:dsdb/rootdse: do helper searches AS_SYSTEM
via 9934111 s4:dsdb/rootdse: remove unused variable
via 00fa2ad s4:dsdb/dirsync: explicitly ask for sdctr->secinfo_flags = 0xF
via 7ff6b7a s4:dsdb/dirsync: use the correct nc_root to fetch replUpToDateVector
via 0f7ac5e s4:dsdb/dirsync: check result of replUpToDateVector fetch on nc_root
via cd976a3 s4:dsdb/schema_data: fix debug message in schema_data_modify()
via caaefb6 s4:python/ntacl: add 'as_sddl' option to dsacl2fsacl()
via b90fc0c s4:python/ntacl: allow string or objects for sd/sid in setntacl()
via 9627bb0 s4:samba-tool/gpo: fix the operation order when creating gpos
via 9feac15 s4:samba-tool/gpo: use 'gPCFileSysPath' when deleting gpos
via 029c306 s4:samba-tool/gpo: use the dns_domain from the server when creating gpos
via 89dc803 s4:libcli/finddcs_cldap: allow io->in.server_address as hostname
via f165329 s4:libcli/finddcs_cldap: try all NBT#1C addresses
via 87de57e s3:smbcacls: add --query-security-info and --set-security-info options
via 640505f s3:libsmb: add cli_{query,set}_security_descriptor() which take sec_info flags
via 0bdf886 libcli/security: remove duplicate aces in se_create_child_secdesc()
via 5e44f0c s3:smbd/open: fall back to Builtin_Administrators if SYSTEM doesn't map to a group
via 04f96c7 s3:smbd/open: try the primary sid (user) as group_sid if the token has just one sid
via 048b5be s3:smbd/open: use Builtin_Administrators as owner of files (if possible)
via 6551e17 s4:tests/samba_tool/gpo.py: fix accidential line break
via 4be23d5 s4:tests/samba_tool/gpo.py: add test_show_as_admin()
via 9b9eabd s4:netcmd/gpo.py: let get_gpo_info explicitly ask for the full ntSecurityDescriptor
via b99358e s4:netcmd/gpo.py: only ask for OWNER/GROUP/DACL when validating the nTSecurityDescriptor
via 4a54a66 s4:netcmd/gpo.py: the nTSecurityDescriptor may not be visible for the current user
via 890f87d s4:netcmd/gpo.py: s/ntSecurityDescriptor/nTSecurityDescriptor
via 872fffe WHATSNEW.txt: "acl compatibility" was removed
via e5258a9 s3:vfs_gpfs: add no memory check in gpfs2smb_acl()
via 80c736a s3:vfs_gpfs: make sure we return the correct errno in gpfs2smb_acl()
via 8ee5127 s4:smbd/open: add missing TALLOC_FREE(frame) to inherit_new_acl()
via 9466762 s3:vfs_aixacl2: make use of vfs_aixacl_util.h
via 2b73dfb s3:vfs_modules: fix *sys_acl_blob_get_{file,fd} and only return ENOSYS
via f5f0459 s3:param: set "map archive = no" in ROLE_ACTIVE_DIRECTORY_DC
via 5704573 vfs: Remove type parameter from sys_acl_blob_get_{fd,file}
via 2d41511 s3:param: make init_locals() static.
via ba1b0a6 s3-param: Handle setting default AD DC per-share settings in init_locals()
via cd78fc8 samba-tool: Add new samba-tool gpo aclcheck and test
via 655eb86 scripting ntacls: Do not place a SACL in the GPO filesystem ACL
via 8a87025 ntvfs: Fill in sd->type based on the new ACL being added
via 9f0b860 smbd: Remove NT4 compatability handling in posix -> NT ACL conversion
via ba846a4 smbd: Correctly set fsp->is_directory before dealing with ACLs
via 42b58ba Ensure we Correctly set fsp->is_directory before dealing with ACLs.
via 82167ea selftest: Add --tmpdir to 'samba-tool gpo create' test
via fa34ae7 selftest: Avoid returning errors (rather than failures) in gpo test
via 619905d selftest: Avoid test cross-contamination in samba.tests.posixacl
via 8e278b8 selftest: Add tests for expected behaviour on directories as well as files
via 8c0a636 pysmbd: Add SMB_ACL_EXECUTE to the mask set by make_simple_acl()
via 91ad382 selftest: Make samba.tests.ntacl also use TestCaseInTempDir
via 276d86c provision: Make dsacl2fsacl() take a security.dom_sid, not str
via e3d093f provision: Also walk directories checking ACLs
via 8b94535 selftest: check that samba-tool gpo works for basic operations
via dae0a76 vfs_acl_common: In add_directory_inheritable_components allocate on psd as parent
via 19b87aa TestCaseInTempDir: Use addCleanup rather than tearDown. (cherry picked from commit 8d397b69bb29b7a464b610bc46cedd6be01b2455)
via 7563247 sefltest: use TestCaseInTempDir and setUp/tearDown for posixacl.py temp file
via 35efdd0 provision: Fix comments in checksysvolacl (cherry picked from commit 7e90a064437790789726d701ada5de9503816281)
via 482e78f vfstest: set umask(0) in vfstest
via d902eae pysmbd: Set umask to 0 during smbd operations (cherry picked from commit e146fe5ef96c1522175a8e81db15d1e8879e5652)
via 737b1d4 pysmbd: Remember to close files after setting the NT ACL (cherry picked from commit 728e56b4636b668aaac60ec557d6fe16b530a6f9)
via 3aab9af pysmbd: Add hook for unlink() so python scripts can remove xattr.tdb entries
via 95f64c4 python-ntacls: Cope with ACL revision 4
via 8cfbd6b dbwrap: use talloc_stackframe() in db_tdb_log_key()
via c7e2dd4 selftest: Always unlink the tempf in posixacl test (cherry picked from commit 1008f6fbf49d5b797c7d968ea7ffdcb29d623644)
via e29446b selftest: Cover the important non-Samba invalidation of the NT ACL
via 86f5615 selftest: Cover one more NT ACL invalidation case and improve comments
via 6d3a607 selftest: Add many more tests for our posix ACL handling
via 3e238c2 pysmbd: Fix pysmbd octal mode handling
via 5e8c2de vfs: Fix compilation of ACL support on solaris (cherry picked from commit 60a06ff09cb62d4102a89194ce8fef5c4c5a2f16)
via b888cd2 smbd: Always free the talloc_stackframe() before leaving smbd_do_query_security_desc
via cbf098a rpc_server:srvsvc Remove psd variable that was no longer set by SMB_VFS_FGET_NT_ACL
via 4a8424c s3:modules:nfs4_acls remove unused mem_ctx parameter to smbacl4_fill_ace4
via 1f15981 s3:modules:nfs4_acls fix memory hierarchy in smb_create_smb4acl
via 5cf4af2 s3:vfs_gpfs fix a memory leak in gpfsacl_get_posix_acl
via 545973e s3:vfs_gpfs fix memory corruption in gpfs2smb_acl
via 066a957 s3:vfs_gpfs fix memory leak in gpfs_get_nfs4_acl
via e244868 s3:vfs_gpfs fix the build
via beb20d4 vfs: Fix alternative posix and no-op sys acl implementations to take a mem_ctx
via f20ccba smbd: Add mem_ctx to {f,}get_nt_acl VFS call
via 9109258 smbd: Add mem_ctx to sys_acl_init() and all callers
via 0f0da30 Make sure the returned sd is on the right context, and if not it's always freed.
via 0a18ce8 Move setting of psd->dacl->revision and protect against null SD's. (cherry picked from commit 5afabdc976d5ba1fd21dcdede85657b618fb6b76)
via 069e1e6 We should never just assign an st_mode to an ace->perms field, theoretically they are different so should go through a mapping function. Ensure this is so.
via 6f89412 Simplify ensure_canon_entry_valid by splitting out the _get codepath. (cherry picked from commit 9466cd189d6a07411f451f7596feee36f0be7f32)
via 44b2f4b samba-tool: Add samba-tool processes subcommand
via 85e1784 pymessaging: Add irpc_servers_byname() and irpc_all_servers()
via 9b06aac pymessaging: Use the server_id IDL structure rather than a tuple
via 493a76f imessaging: Add irpc_all_servers() to list all available servers
via ec60e57 build(waf): fix a typo
via 329a64d Makefile: Allow specifying PYTHON environment variable.
via 59a7a30 configure: Support specifying PYTHON environment variable to run waf.
via c2fb1e7 heimdal_build: Fix finding of system heimdal.
via bff4c78 heimdal_build: HEIMDAL_LIBRARY(): Remove unused cflags argument. (cherry picked from commit 9cf985c53eb1a4bbe8b8110f123744291026cee6)
via 839f526 ldb_secrets_tdb_sync: Add dependency on gssapi.
via 775b5ac dsdb: Rename _res argument to _result.
via 2504cf2 s3:docs document shadow:snapdirseverywhere option of vfs_shadow_copy2
via 73af1ab samba-tool: Rework ldap attribute fetch in classicupgrade for missing attributes
via c993daa utils: Remove unused samba-dig tool
via 1146ef7 Removed phpldapadmin inclusion for Samba 4.
via c730e0e libads: Always free the talloc_stackframe() on error path
via c275adc client: Fix talloc_stackframe() free order assertion in developer mode
via c9393e7 s4:rpc_server/drsuapi: use talloc_zero instead of talloc() in dcesrv_drsuapi_DsBind()
via 16275e2 s4:rpc_server/drsuapi: fix a crash in dcesrv_drsuapi_DsGetDomainControllerInfo_1()
via 1108c45 s4:torture/rpc/handles: try to make all assoc_group tests less flakey
via e266d39 s4:torture/rpc/handles: try to make the assoc_group test less flakey
via 4102ae8 s4:torture/rpc/handles: move a torture_comment()
via c331dcf selftest/knownfail: add samba3.rpc.lsa.privileges.lsa.Privileges
via 1c171af s4:tortore/rpc/lsa: make more use of torture_assert*
via 4b44cdb Add samba3.samba3badnameblob test to check regressions in bug #9215.
via 60003e5 selftest: use an array when starting testenv with system()
via 4621811 s3-winbind: use new reconnect logic in rpc_lookup_sids() also.
via 78b5271 s3-winbindd: rework reconnect logic in winbindd_lookup_names().
via 16322b1 s3-winbindd: rework reconnect logic in winbindd_lookup_sids().
via 90f3530 s3-winbindd: remove lookup_sids_fn_t.
via 65071a3 s3-winbindd: remove lookup_names_fn_t.
via 1b109ed s3-rpc_client: make dcerpc_lsa_lookup_names_generic() public.
via d0de112 s3-rpc_cli: make dcerpc_lsa_lookup_sids_generic() public.
via 08d4a67 s3-winbindd: add cm_connect_lsat().
via 3e32998 s3-rpc_cli: Remove some unused wrapping code.
via deb11c4 configure(waf): Fail "configure --with-ads" if ads support is not available
via e42fef3 WHATSNEW: Update changes since rc5.
via 5b1aeb6 dbwrap: Fix bug 9440: Do not rely on dbwrap_record_get_value to return a talloc object
via 121157a WHATSNEW: Update changes since RC5.
via 61afd00 docs: man oLschema2ldif: Add missing meta data.
via 68eff14 docs: man ntlm_auth4: Add missing meta data.
via 91c2674 docs: man smbtorture: Add missing meta data.
via fb6d779 docs: man masktest: Add missing meta data.
via 5a99e29 docs: man locktest: Add missing meta data.
via b1505ca docs: man gentest: Add missing meta data.
via 1bc9abe docs: man 8 samba: Add missing meta data.
via e7df1cc docs: man regtree: Add missing meta data.
via 52d7901 docs: man regshell: Add missing meta data.
via f540628 docs: man regpatch: Add missing meta data.
via 6d03994 docs: man regdiff: Add missing meta data.
via 71e6ce4 docs: man ndrdump: Add missing meta data.
via b0e45aa docs: man tdbtool: Add missing meta data.
via 63e77b0 docs: man talloc: Add missing meta data.
via 109deeb docs: man ldbsearch: Add missing meta data.
via d650a14 docs: man ldbrename: Add missing meta data.
via 60c8dfc docs: man ldbmodify: Add missing meta data.
via bb2c41e docs: man ldbedit: Add missing meta data.
via fa4051a docs: man ldbdel: Add missing meta data.
via 09e3bd9 docs: man ldbadd: Add missing meta data.
via 4fbde8f docs: man ldb.3: Add missing meta data.
via 5a5894c spoolss: fix segfault when "default devmode" is disabled
via 0fa3d75 WHATSNEW: Update changes since RC5.
via db6a76a BUG 9436: Fix leaking sockets of SMB connections to a DC.
via b0595ad Fix MD5 detection in the autoconf build
via 1036f3d Fix Bug 9422 - large read requests cause server to issue malformed reply
via 08db481 docs: Rename man ntlm_auth.
via 9872a73 docs: Add some binaries to the "SEE ALSO" section
via 7001c0a docs: Fix version in man smb.conf.
via aa1e012 s3-rpc_client: try to use socket_addr if available in rpc_pipe_open_tcp() (bug #9426)
via 92c3c86 WHATSNEW: Update changes since rc5.
via ac0623c s3-rpc_client: lookup nametype 0x20 in rpc_pipe_open_tcp_port(). (bug #9426)
via 4760b8f waf: Disable ntdb by default.
via 76106a3 s4:samba-tool/testparm: report a CommandError if loading of the config file fails
via 48ec9ca build: Do not install testing binaries
via 256eedd packaging: Remove long-gone --disable-merged-build from RHEL-CTDB packaging
via 428c170 build: Remove --enable-smbtorture, require bin/smbtorture (from waf) for make test
via 0519b9b build: Be consistent with the name of smbtorture binaries
via 68e6eda torture: remove source3 locktest and masktest
via 2a2480f build: Use ntlm_auth from source3 as the only ntlm_auth installed on the system
via 3e042a9 lib/replace: Do not use STRERROR_R_PROTO_COMPATIBLE as only roken.h sets this
via 2b130b4 WHATSNEW: Update changes since rc5.
via 225dcb2 examples: fix build on AIX6
via cdbf43c WHATSNEW: Update changes since rc5.
via cf24aab s3:smbd/aio do not mark file modified during reads
via 4975257 More for #9374 - Allow smb2.acls torture test to pass against smbd with a POSIX ACLs backend.
via 1187895 Add comments explaining exactly *why* we don't check FILE_READ_ATTRIBUTES when evaluating file/directory ACE's.
via 0e9778e WHATSNEW: Start release notes for RC6.
via 8663173 popt_common: Fix typos.
via 02ca126 s4:samba-tool: Fix samba-tool fsmo --role=schema
via f3ab644 lib/addns: remove compiler warnings
via 1236393 lib/addns: don't depend on the order in resp->answers[]
via dd9a98c lib/addns: remove pointless check for resp->num_additionals != 1
via 3f5b4ed lib/replace: replace all *printf function if we replace snprintf (bug #9390)
via ce8beb7 Another fix needed for bug #9236 - ACL masks incorrectly applied when setting ACLs.
via f40de48 s4-dns: Fix format string vulnerability in an error message (bug #9354)
via 5296386 lib/ldb: add missing newline in the output of ldb_ldif_write_trace()
via e46a6cd s3:winbind: BUG 9386: Failover if netlogon pipe is not available.
via 6c0b864 Use work around for 'winbind use default domain' only if it is set
via 6f25fde build: add DMAPI configure option and checks
via 182ab92 build(waf): support AIX 6.1
via e122c7d Fix bug 9376 - ensure_canon_entry_valid generates duplicate SMB_ACL_GROUP, acl_valid fails.
via c06af93 VERSION: Bump version number up to 4.0.0rc6.
from 0dd3b9f VERSION: Disable GIT snapshot to prepare rc5 release.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-stable
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
Makefile | 3 +-
VERSION | 2 +-
WHATSNEW.txt | 132 ++++-
buildtools/wafsamba/wscript | 2 +-
configure | 2 +-
docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml | 2 +-
docs-xml/manpages/samba.7.xml | 195 +++--
docs-xml/manpages/samba.8.xml | 108 +++-
docs-xml/manpages/smb.conf.5.xml | 5 +-
docs-xml/manpages/vfs_shadow_copy2.8.xml | 15 +
docs-xml/smbdotconf/vfs/aclcompatibility.xml | 17 -
docs-xml/wscript_build | 2 +
examples/VFS/skel_opaque.c | 19 +-
examples/VFS/skel_transparent.c | 29 +-
examples/libsmbclient/testfstatvfs.c | 2 +
examples/libsmbclient/teststatvfs.c | 2 +
lib/addns/dnsgss.c | 20 +-
lib/dbwrap/dbwrap_tdb.c | 7 +-
lib/ldb/common/ldb_ldif.c | 2 +-
lib/ldb/man/ldb.3.xml | 3 +
lib/ldb/man/ldbadd.1.xml | 3 +
lib/ldb/man/ldbdel.1.xml | 3 +
lib/ldb/man/ldbedit.1.xml | 3 +
lib/ldb/man/ldbmodify.1.xml | 3 +
lib/ldb/man/ldbrename.1.xml | 3 +
lib/ldb/man/ldbsearch.1.xml | 3 +
lib/param/param_functions.c | 1 -
lib/param/param_table.c | 19 -
lib/replace/replace.c | 6 +-
lib/replace/replace.h | 46 +-
lib/replace/snprintf.c | 5 +-
lib/talloc/man/talloc.3.xml | 813 ++++++++++++++++++++
lib/talloc/talloc.3.xml | 801 -------------------
lib/talloc/wscript | 2 +-
lib/tdb/man/tdbbackup.8.xml | 136 ++++
lib/tdb/man/tdbdump.8.xml | 61 ++
lib/tdb/{manpages => man}/tdbrestore.8.xml | 0
lib/tdb/man/tdbtool.8.xml | 235 ++++++
lib/tdb/manpages/tdbbackup.8.xml | 136 ----
lib/tdb/manpages/tdbdump.8.xml | 61 --
lib/tdb/manpages/tdbtool.8.xml | 235 ------
lib/tdb/wscript | 8 +-
libcli/security/secdesc.c | 34 +
libcli/smb/smb_seal.c | 2 +-
librpc/tools/ndrdump.1.xml | 3 +
librpc/wscript_build | 5 +
nsswitch/wscript_build | 7 +-
packaging/RHEL-CTDB/configure.rpm | 2 -
packaging/RHEL-CTDB/samba.spec.tmpl | 2 -
script/autobuild.py | 4 +-
selftest/flapping | 1 +
selftest/knownfail | 8 -
selftest/selftest.pl | 14 +-
selftest/target/Samba3.pm | 137 +++--
selftest/target/Samba4.pm | 5 +-
selftest/wscript | 2 +-
source3/Makefile-smbtorture | 24 +
source3/Makefile-smbtorture4 | 30 -
source3/Makefile.in | 34 +-
source3/auth/auth_util.c | 3 +-
source3/client/client.c | 1 +
source3/configure.in | 67 +-
source3/include/passdb.h | 3 +
source3/include/proto.h | 5 +-
source3/include/smb_acls.h | 8 +-
source3/include/vfs.h | 29 +-
source3/include/vfs_macros.h | 40 +-
source3/lib/asys/wscript_build | 3 +-
source3/lib/dbwrap/dbwrap_watch.c | 5 +-
source3/lib/pthreadpool/wscript_build | 3 +-
source3/lib/sysacls.c | 71 +-
source3/lib/util_sid_passdb.c | 100 +++
source3/lib/util_sid_passdb.h | 36 +
source3/libads/kerberos.c | 1 +
source3/librpc/idl/wbint.idl | 14 +-
source3/libsmb/clisecdesc.c | 56 +-
source3/libsmb/proto.h | 9 +
source3/m4/check_path.m4 | 1 +
source3/modules/nfs4_acls.c | 25 +-
source3/modules/nfs4_acls.h | 2 +
source3/modules/vfs_acl_common.c | 88 ++-
source3/modules/vfs_afsacl.c | 16 +-
source3/modules/vfs_aixacl.c | 12 +-
source3/modules/vfs_aixacl2.c | 29 +-
source3/modules/vfs_aixacl_util.c | 4 +-
source3/modules/vfs_aixacl_util.h | 2 +-
source3/modules/vfs_cap.c | 6 +-
source3/modules/vfs_catia.c | 8 +-
source3/modules/vfs_default.c | 43 +-
source3/modules/vfs_fake_acls.c | 79 +--
source3/modules/vfs_full_audit.c | 24 +-
source3/modules/vfs_gpfs.c | 57 +-
source3/modules/vfs_hpuxacl.c | 17 +-
source3/modules/vfs_irixacl.c | 8 +-
source3/modules/vfs_media_harmony.c | 22 +-
source3/modules/vfs_posixacl.c | 15 +-
source3/modules/vfs_posixacl.h | 6 +-
source3/modules/vfs_shadow_copy2.c | 11 +-
source3/modules/vfs_solarisacl.c | 14 +-
source3/modules/vfs_solarisacl.h | 6 +-
source3/modules/vfs_time_audit.c | 21 +-
source3/modules/vfs_tru64acl.c | 18 +-
source3/modules/vfs_zfsacl.c | 18 +-
source3/param/loadparm.c | 59 +-
source3/passdb/ABI/pdb-0.sigs | 3 +
source3/passdb/lookup_sid.c | 29 +-
source3/passdb/pdb_interface.c | 53 +-
source3/passdb/pdb_ldap.c | 11 +-
source3/rpc_client/cli_lsarpc.c | 101 +--
source3/rpc_client/cli_lsarpc.h | 39 +-
source3/rpc_client/cli_pipe.c | 23 +-
source3/rpc_client/cli_pipe.h | 1 +
source3/rpc_server/spoolss/srv_spoolss_nt.c | 52 +-
source3/rpc_server/srvsvc/srv_srvsvc_nt.c | 24 +-
source3/script/tests/test_wbinfo_sids2xids.sh | 5 +-
source3/script/tests/test_wbinfo_sids2xids_int.py | 39 +-
source3/selftest/s3-selftest.sh | 4 +-
source3/selftest/tests.py | 2 +-
source3/smbd/aio.c | 2 -
source3/smbd/dir.c | 14 +-
source3/smbd/file_access.c | 7 +-
source3/smbd/nttrans.c | 16 +-
source3/smbd/open.c | 151 ++++-
source3/smbd/posix_acls.c | 308 ++++----
source3/smbd/process.c | 2 +-
source3/smbd/proto.h | 6 +-
source3/smbd/pysmbd.c | 181 ++++-
source3/smbd/trans2.c | 12 +-
source3/smbd/vfs.c | 19 +-
source3/torture/cmd_vfs.c | 14 +-
source3/torture/locktest.c | 692 -----------------
source3/torture/rpc_open_tcp.c | 3 +-
source3/torture/vfstest.c | 5 +
source3/utils/net_ads.c | 44 +-
source3/utils/net_dns.c | 96 ++-
source3/utils/net_dns.h | 43 +
source3/utils/smbcacls.c | 65 ++-
source3/winbindd/idmap.c | 61 +--
source3/winbindd/idmap_autorid.c | 3 +
source3/winbindd/idmap_hash/idmap_hash.c | 2 +-
source3/winbindd/idmap_proto.h | 4 -
source3/winbindd/idmap_rid.c | 2 +
source3/winbindd/idmap_tdb_common.c | 16 +-
source3/winbindd/idmap_util.c | 148 ----
source3/winbindd/wb_fill_pwent.c | 36 +-
source3/winbindd/wb_getgrsid.c | 19 +-
source3/winbindd/wb_sid2gid.c | 167 ----
source3/winbindd/wb_sid2uid.c | 165 ----
source3/winbindd/wb_sids2xids.c | 263 +++++++
source3/winbindd/winbindd_cm.c | 35 +
source3/winbindd/winbindd_dual_srv.c | 47 +-
source3/winbindd/winbindd_getgroups.c | 19 +-
source3/winbindd/winbindd_msrpc.c | 116 ++--
source3/winbindd/winbindd_pam.c | 52 +-
source3/winbindd/winbindd_proto.h | 23 +-
source3/winbindd/winbindd_rpc.c | 23 +-
source3/winbindd/winbindd_sid_to_gid.c | 18 +-
source3/winbindd/winbindd_sid_to_uid.c | 18 +-
source3/winbindd/winbindd_sids_to_xids.c | 215 +-----
source3/winbindd/winbindd_util.c | 9 +
source3/wscript | 140 +++-
source3/wscript_build | 45 +-
source4/dns_server/dlz_bind9.c | 14 +-
source4/dsdb/common/util.c | 12 +-
source4/dsdb/common/util.h | 2 +
source4/dsdb/samdb/ldb_modules/acl.c | 102 +++-
source4/dsdb/samdb/ldb_modules/acl_read.c | 26 +-
source4/dsdb/samdb/ldb_modules/acl_util.c | 67 ++
source4/dsdb/samdb/ldb_modules/descriptor.c | 782 ++++++++++++++++---
source4/dsdb/samdb/ldb_modules/dirsync.c | 14 +-
source4/dsdb/samdb/ldb_modules/extended_dn_in.c | 25 +-
source4/dsdb/samdb/ldb_modules/extended_dn_store.c | 4 +-
source4/dsdb/samdb/ldb_modules/objectclass.c | 36 +-
source4/dsdb/samdb/ldb_modules/objectclass_attrs.c | 18 +
source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 88 ++-
source4/dsdb/samdb/ldb_modules/rootdse.c | 37 +-
source4/dsdb/samdb/ldb_modules/schema_data.c | 18 +-
source4/dsdb/samdb/ldb_modules/subtree_delete.c | 79 ++-
.../dsdb/samdb/ldb_modules/wscript_build_server | 2 +-
source4/dsdb/samdb/samdb.h | 19 +
source4/dsdb/tests/python/sec_descriptor.py | 84 ++-
source4/heimdal_build/wscript_build | 3 +-
source4/heimdal_build/wscript_configure | 55 +-
source4/lib/cmdline/popt_common.h | 4 +-
source4/lib/messaging/irpc.h | 2 +
source4/lib/messaging/messaging.c | 71 ++
source4/lib/messaging/pymessaging.c | 124 +++-
source4/lib/registry/man/regdiff.1.xml | 3 +
source4/lib/registry/man/regpatch.1.xml | 3 +
source4/lib/registry/man/regshell.1.xml | 3 +
source4/lib/registry/man/regtree.1.xml | 3 +
source4/libcli/finddcs_cldap.c | 77 ++-
source4/libcli/pysmb.c | 7 +-
source4/librpc/idl/irpc.idl | 13 +-
source4/librpc/wscript_build | 6 +
source4/ntvfs/posix/pvfs_acl.c | 21 +
source4/rpc_server/dnsserver/dnsdb.c | 4 +
source4/rpc_server/drsuapi/dcesrv_drsuapi.c | 14 +-
source4/scripting/bin/samba_upgradeprovision | 21 +-
source4/scripting/python/samba/netcmd/dns.py | 2 +
source4/scripting/python/samba/netcmd/fsmo.py | 2 +-
source4/scripting/python/samba/netcmd/gpo.py | 151 +++-
source4/scripting/python/samba/netcmd/main.py | 2 +
source4/scripting/python/samba/netcmd/processes.py | 78 ++
source4/scripting/python/samba/netcmd/testparm.py | 5 +-
source4/scripting/python/samba/ntacls.py | 26 +-
.../scripting/python/samba/provision/__init__.py | 30 +-
.../scripting/python/samba/provision/descriptor.py | 5 +
source4/scripting/python/samba/tests/__init__.py | 5 +-
source4/scripting/python/samba/tests/messaging.py | 13 +-
source4/scripting/python/samba/tests/ntacls.py | 68 +-
source4/scripting/python/samba/tests/posixacl.py | 489 ++++++++++--
source4/scripting/python/samba/tests/provision.py | 10 -
.../python/samba/tests/samba_tool/base.py | 2 +-
.../scripting/python/samba/tests/samba_tool/gpo.py | 79 ++
.../python/samba/tests/samba_tool/processes.py | 35 +
source4/scripting/python/samba/upgrade.py | 41 +-
source4/selftest/tests.py | 8 +
source4/setup/phpldapadmin-config.php | 20 -
source4/setup/provision_init.ldif | 2 +
source4/setup/schema_samba4.ldif | 2 +
source4/smbd/samba.8.xml | 178 -----
source4/smbd/wscript_build | 1 -
source4/torture/man/gentest.1.xml | 3 +
source4/torture/man/locktest.1.xml | 3 +
source4/torture/man/masktest.1.xml | 3 +
source4/torture/man/smbtorture.1.xml | 3 +
source4/torture/raw/raw.c | 1 +
source4/torture/raw/samba3misc.c | 138 ++++
source4/torture/rpc/handles.c | 16 +-
source4/torture/rpc/lsa.c | 87 +--
source4/utils/man/ntlm_auth.1.xml | 266 -------
source4/utils/man/ntlm_auth4.1.xml | 269 +++++++
source4/utils/man/oLschema2ldif.1.xml | 3 +
source4/utils/wscript_build | 14 +-
utils/samba-dig.c | 160 ----
utils/wscript_build | 7 -
wscript | 2 +-
wscript_build | 1 -
239 files changed, 7129 insertions(+), 5207 deletions(-)
delete mode 100644 docs-xml/smbdotconf/vfs/aclcompatibility.xml
create mode 100644 lib/talloc/man/talloc.3.xml
delete mode 100644 lib/talloc/talloc.3.xml
create mode 100644 lib/tdb/man/tdbbackup.8.xml
create mode 100644 lib/tdb/man/tdbdump.8.xml
rename lib/tdb/{manpages => man}/tdbrestore.8.xml (100%)
create mode 100644 lib/tdb/man/tdbtool.8.xml
delete mode 100644 lib/tdb/manpages/tdbbackup.8.xml
delete mode 100644 lib/tdb/manpages/tdbdump.8.xml
delete mode 100644 lib/tdb/manpages/tdbtool.8.xml
create mode 100644 source3/Makefile-smbtorture
delete mode 100644 source3/Makefile-smbtorture4
create mode 100644 source3/lib/util_sid_passdb.c
create mode 100644 source3/lib/util_sid_passdb.h
delete mode 100644 source3/torture/locktest.c
create mode 100644 source3/utils/net_dns.h
delete mode 100644 source3/winbindd/wb_sid2gid.c
delete mode 100644 source3/winbindd/wb_sid2uid.c
create mode 100644 source3/winbindd/wb_sids2xids.c
create mode 100644 source4/scripting/python/samba/netcmd/processes.py
create mode 100644 source4/scripting/python/samba/tests/samba_tool/gpo.py
create mode 100644 source4/scripting/python/samba/tests/samba_tool/processes.py
delete mode 100644 source4/setup/phpldapadmin-config.php
delete mode 100644 source4/smbd/samba.8.xml
delete mode 100644 source4/utils/man/ntlm_auth.1.xml
create mode 100644 source4/utils/man/ntlm_auth4.1.xml
delete mode 100644 utils/samba-dig.c
delete mode 100644 utils/wscript_build
Changeset truncated at 500 lines:
diff --git a/Makefile b/Makefile
index ae2fc06..5f220fa 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
# simple makefile wrapper to run waf
-WAF_BINARY=./buildtools/bin/waf
+PYTHON?=python
+WAF_BINARY=$(PYTHON) ./buildtools/bin/waf
WAF=WAF_MAKE=1 $(WAF_BINARY)
all:
diff --git a/VERSION b/VERSION
index 946f6fa..ac19dd5 100644
--- a/VERSION
+++ b/VERSION
@@ -87,7 +87,7 @@ SAMBA_VERSION_PRE_RELEASE=
# e.g. SAMBA_VERSION_RC_RELEASE=1 #
# -> "3.0.0rc1" #
########################################################
-SAMBA_VERSION_RC_RELEASE=5
+SAMBA_VERSION_RC_RELEASE=6
########################################################
# To mark SVN snapshots this should be set to 'yes' #
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index b1a2b7e..355de80 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,11 +1,27 @@
Release Announcements
=====================
-This is the fifth release candidate of Samba 4.0. This is *not*
+This is the sixth release candidate of Samba 4.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/.
+In this release candidate, we have a significant number of improvements
+to our Access Control List (ACL) code, particularly for the Active
+Directory Domain Controller, but also in our general purpose file
+server.
+
+These changes are important, as they enable Group Policy Objects to work
+correctly, allow administrators to impose restrictions on some users
+reading certain parts of the directory and correctly propagating
+inherited ACLs down the LDAP directory tree.
+
+Users of the Active Directory Domain Controller upgrading from any
+previous release should run 'samba-tool ntacl sysvolreset' to re-sync
+ACLs on the sysvol share with those matching the GPOs in LDAP and the
+defaults from an initial provision. This will set an underlying POSIX
+ACL if required.
+
Samba 4.0 will be the next version of the Samba suite and incorporates
all the technology found in both the Samba4 series and the
stable 3.x series. The primary additional features over Samba 3.6 are
@@ -105,6 +121,7 @@ smb.conf changes
Parameter Name Description
-------------- -----------
+ acl compatibility Removed
allow dns updates New
announce as Removed
announce version Removed
@@ -164,6 +181,119 @@ smb.conf changes
winbindd socket directory New
+CHANGES SINCE 4.0.0rc5
+======================
+
+With this release candidate the ACLs in the Active Directory
+are also checked on searches by default. The automatic inheritance
+of ACLs is also correctly recalculated on changes now.
+
+o Michael Adam <obnox at samba.org>
+ * BUG 9350: Fail "configure --with-ads" if ads support is not available.
+ * BUG 9446: Id mapping code delivers inconsistent results.
+ * BUG 9453: Fix building pdb_ldap as shared module.
+
+
+o Jeremy Allison <jra at samba.org>
+ * BUG 9236: ACL masks incorrectly applied when setting ACLs.
+ * BUG 9374: Allow smb2.acls torture test to pass against smbd with a POSIX
+ ACLs backend.
+
+
+o Christian Ambach <ambi at samba.org>
+ * BUG 9178: Add DMAPI configure option and checks.
+ * BUG 9274: Document shadow:snapdirseverywhere option of vfs_shadow_copy2.
+ * BUG 9339: Backport build fixes from master.
+ * BUG 9411: aio read marks the file as modified.
+ * BUG 9413: Fix waf build on AIX6.
+
+
+o Andrew Bartlett <abartlet at samba.org>
+ * BUG 9121: Provide and use setproctitle replacement function for samba4
+ processes on linux.
+ * BUG 9271: samba-tool: Rework ldap attribute fetch in classicupgrade for
+ missing attributes.
+ * BUG 9421: Fix several build issues.
+ * BUG 9448: Backport several crash bugs from master.
+
+
+o Sumit Bose <sbose at redhat.com>
+ * BUG 9367: Use work around for 'winbind use default domain' only if it
+ is set.
+
+
+o Kai Blin <kai at samba.org>
+ * BUG 9399 - 'samba-tool dns serverinfo localhost' returns 'Memory
+ allocation error'.
+ * BUG 9449: Remove unused samba-dig tool.
+
+
+o Günther Deschner <gd at samba.org>
+ * BUG 9426: rpc_client: lookup nametype 0x20 in rpc_pipe_open_tcp_port().
+ * BUG 9439: Fix ncacn_ip_tcp reconnection code for lsa lookups.
+ * BUG 9451: Allow to force DNS updates using net.
+
+
+o David Disseldorp <ddiss at samba.org>
+ * BUG 9433: spoolss: Fix segfault when "default devmode" is disabled.
+
+
+o Amitay Isaacs <amitay at gmail.com>
+ * BUG 9265: Bind dlz fails to start if there is a trustedanchors zone.
+ * BUG 9354: Fix format string vulnerability in an error message.
+
+
+o Volker Lendecke <vl at samba.org>
+ * BUG 9422: Large read requests cause server to issue malformed reply.
+ * BUG 9440: Do not rely on dbwrap_record_get_value to return a talloc
+ object.
+
+
+o Stefan Metzmacher <metze at samba.org>
+ * BUG 8620: Read ACL are not enabled by default on DS.
+ * BUG 8621: ACL are not recalculated if parent is changed and inherit is
+ enabled.
+ * BUG 9373: samba-tool: Report a CommandError if loading of the config file
+ fails.
+ * BUG 9385: Add missing newline in the output of ldb_ldif_write_trace().
+ * BUG 9390: Fix segfaults in "log level = 10" on Solaris.
+ * BUG 9402: lib/addns: Fix working with a bind9 server.
+ * BUG 9406: ACL fixes since 4.0 rc1.
+ * BUG 9447: Backport tests from master.
+ * BUG 9448: Backport several crash bugs from master.
+
+
+o Ricky Nance <ricky.nance at weaubleau.k12.mo.us>
+ * BUG 9449: Remove phpldapadmin inclusion.
+
+
+o Matthieu Patou <mat at matws.net>
+ * BUG 9418: Fix MD5 detection in the autoconf build.
+
+
+o Arvid Requate <requate at univention.de>
+ * BUG 9376: Fix typo in got_duplicate_group check.
+ * BUG 9392: Fix 'samba-tool fsmo --role=schema'.
+
+
+o Andreas Schneider <asn at samba.org>
+ * BUG 9386: Failover if netlogon pipe is not available.
+ * BUG 9436: Fix leaking sockets of SMB connections to a DC.
+
+
+o Karolin Seeger <kseeger at samba.org>
+ * BUG 9425: Do not build ntdb by default.
+ * BUG 9437: Warnings when building manpages with waf.
+ * BUG 9443: Manpages of the libraries are located in different
+ subdirectories.
+ * BUG 9444: Merge both samba.8 manpages.
+ * BUG 9445: Update man 7 samba.
+
+
+o Jelmer Vernooij <jelmer at samba.org>
+ * BUG 9339: Backport build fixes from master.
+
+
CHANGES SINCE 4.0.0rc4
======================
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 441e727..17aef27 100755
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -322,7 +322,7 @@ def configure(conf):
else:
conf.env.HAVE_LD_VERSION_SCRIPT = False
- if sys.platform == "aix5":
+ if sys.platform == "aix5" or sys.platform == "aix6":
conf.DEFINE('_ALL_SOURCE', 1, add_to_cflags=True)
# Might not be needed if ALL_SOURCE is defined
# conf.DEFINE('_XOPEN_SOURCE', 600, add_to_cflags=True)
diff --git a/configure b/configure
index 72f758e..30858df 100755
--- a/configure
+++ b/configure
@@ -10,5 +10,5 @@ JOBS=1
export JOBS
cd . || exit 1
-$WAF configure "$@" || exit 1
+${PYTHON:=python} $WAF configure "$@" || exit 1
cd $PREVPATH
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml b/docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml
index f2f3a30..2b12e11 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml
@@ -309,7 +309,7 @@ Ideally, the implementation of SSO should reduce complexity and reduce administa
The initial goal of many network administrators is often to create and use a centralized identity management
system. It is often assumed that such a centralized system will use a single authentication infrastructure
that can be used by all information systems. The Microsoft Windows NT4 security domain architecture and the
-Micrsoft active directory service are often put forward as the ideal foundation for such a system. It is
+Microsoft active directory service are often put forward as the ideal foundation for such a system. It is
conceptually simple to install an external authentication agent on each of the disparate infromation systems
that can then use the Microsoft (NT4 domain or ads service) for user authentication and access control. The
wonderful dream of a single centralized authentication service is commonly broken when realities are realized.
diff --git a/docs-xml/manpages/samba.7.xml b/docs-xml/manpages/samba.7.xml
index aa7684b..9299660 100644
--- a/docs-xml/manpages/samba.7.xml
+++ b/docs-xml/manpages/samba.7.xml
@@ -13,7 +13,7 @@
<refnamediv>
<refname>samba</refname>
- <refpurpose>A Windows SMB/CIFS fileserver for UNIX</refpurpose>
+ <refpurpose>A Windows AD and SMB/CIFS fileserver for UNIX</refpurpose>
</refnamediv>
<refsynopsisdiv>
@@ -22,51 +22,80 @@
<refsect1>
<title>DESCRIPTION</title>
-
- <para>The Samba software suite is a collection of programs
- that implements the Server Message Block (commonly abbreviated
- as SMB) protocol for UNIX systems. This protocol is sometimes
- also referred to as the Common Internet File System (CIFS). For a
- more thorough description, see <ulink url="http://www.ubiqx.org/cifs/">
+
+ <para>The Samba software suite is a collection of programs
+ that implements the Server Message Block (commonly abbreviated
+ as SMB) protocol for UNIX systems and provides Active Directory
+ services. This protocol is sometimes also referred to as the
+ Common Internet File System (CIFS). For a more thorough description,
+ see <ulink url="http://www.ubiqx.org/cifs/">
http://www.ubiqx.org/cifs/</ulink>. Samba also implements the NetBIOS
protocol in nmbd.</para>
-
+
<variablelist>
<varlistentry>
+ <term><citerefentry><refentrytitle>samba</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry></term>
+ <listitem><para>The <command>samba</command> daemon provides the
+ Active Directory services and file and print services to
+ SMB clients. The configuration file
+ for this daemon is described in <citerefentry><refentrytitle>smb.conf</refentrytitle>
+ <manvolnum>5</manvolnum></citerefentry>.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><citerefentry><refentrytitle>smbd</refentrytitle>
<manvolnum>8</manvolnum></citerefentry></term>
- <listitem><para>The <command>smbd</command> daemon provides the file and print services to
- SMB clients, such as Windows 95/98, Windows NT, Windows
- for Workgroups or LanManager. The configuration file
+ <listitem><para>The <command>smbd</command> daemon provides the file and print services to
+ SMB clients, such as Windows 95/98, Windows NT, Windows
+ for Workgroups or LanManager. The configuration file
for this daemon is described in <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry>
+ <manvolnum>5</manvolnum></citerefentry>.
</para></listitem>
</varlistentry>
-
+
<varlistentry>
<term><citerefentry><refentrytitle>nmbd</refentrytitle>
<manvolnum>8</manvolnum></citerefentry></term>
<listitem><para>The <command>nmbd</command>
daemon provides NetBIOS nameservice and browsing
- support. The configuration file for this daemon
+ support. The configuration file for this daemon
is described in <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry></para>
+ <manvolnum>5</manvolnum></citerefentry>.</para>
</listitem>
</varlistentry>
<varlistentry>
+ <term><citerefentry><refentrytitle>winbindd</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry></term>
+ <listitem><para><command>winbindd</command> is a daemon
+ that is used for integrating authentication and
+ the user database into unix.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><citerefentry><refentrytitle>smbclient</refentrytitle>
<manvolnum>1</manvolnum></citerefentry></term>
<listitem><para>The <command>smbclient</command>
- program implements a simple ftp-like client. This
+ program implements a simple ftp-like client. This
is useful for accessing SMB shares on other compatible
- servers (such as Windows NT), and can also be used
- to allow a UNIX box to print to a printer attached to
+ servers (such as Windows NT), and can also be used
+ to allow a UNIX box to print to a printer attached to
any SMB server (such as a PC running Windows NT).</para>
</listitem>
</varlistentry>
<varlistentry>
+ <term><citerefentry><refentrytitle>samba-tool</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry></term>
+ <listitem><para>The <command>samba-tool</command>
+ is the main Samba Administration tool regarding
+ Acitive Directory services.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><citerefentry><refentrytitle>testparm</refentrytitle>
<manvolnum>1</manvolnum></citerefentry></term>
<listitem><para>The <command>testparm</command>
@@ -79,7 +108,7 @@
<term><citerefentry><refentrytitle>smbstatus</refentrytitle>
<manvolnum>1</manvolnum></citerefentry></term>
<listitem><para>The <command>smbstatus</command>
- tool provides access to information about the
+ tool provides access to information about the
current connections to <command>smbd</command>.</para>
</listitem>
</varlistentry>
@@ -88,7 +117,7 @@
<term><citerefentry><refentrytitle>nmblookup</refentrytitle>
<manvolnum>1</manvolnum></citerefentry></term>
<listitem><para>The <command>nmblookup</command>
- tools allows NetBIOS name queries to be made
+ tools allows NetBIOS name queries to be made
from a UNIX host.</para>
</listitem>
</varlistentry>
@@ -97,7 +126,7 @@
<term><citerefentry><refentrytitle>smbpasswd</refentrytitle>
<manvolnum>8</manvolnum></citerefentry></term>
<listitem><para>The <command>smbpasswd</command>
- command is a tool for changing LanMan and Windows NT
+ command is a tool for changing LanMan and Windows NT
password hashes on Samba and Windows NT servers.</para>
</listitem>
</varlistentry>
@@ -105,7 +134,7 @@
<varlistentry>
<term><citerefentry><refentrytitle>smbcacls</refentrytitle>
<manvolnum>1</manvolnum></citerefentry></term>
- <listitem><para>The <command>smbcacls</command> command is
+ <listitem><para>The <command>smbcacls</command> command is
a tool to set ACL's on remote CIFS servers. </para>
</listitem>
</varlistentry>
@@ -113,22 +142,22 @@
<varlistentry>
<term><citerefentry><refentrytitle>smbtree</refentrytitle>
<manvolnum>1</manvolnum></citerefentry></term>
- <listitem><para>The <command>smbtree</command> command
+ <listitem><para>The <command>smbtree</command> command
is a text-based network neighborhood tool.</para></listitem>
</varlistentry>
<varlistentry>
<term><citerefentry><refentrytitle>smbtar</refentrytitle>
<manvolnum>1</manvolnum></citerefentry></term>
- <listitem><para>The <command>smbtar</command> can make
+ <listitem><para>The <command>smbtar</command> can make
backups of data on CIFS/SMB servers.</para></listitem>
</varlistentry>
<varlistentry>
<term><citerefentry><refentrytitle>smbspool</refentrytitle>
<manvolnum>8</manvolnum></citerefentry></term>
- <listitem><para><command>smbspool</command> is a
- helper utility for printing on printers connected
+ <listitem><para><command>smbspool</command> is a
+ helper utility for printing on printers connected
to CIFS servers. </para></listitem>
</varlistentry>
@@ -136,7 +165,9 @@
<term><citerefentry><refentrytitle>smbcontrol</refentrytitle>
<manvolnum>1</manvolnum></citerefentry></term>
<listitem><para><command>smbcontrol</command> is a utility
- that can change the behaviour of running samba daemons.
+ that can change the behaviour of running
+ <command>smbd</command>, <command>nmbd</command> and
+ <command>winbindd</command> daemons.
</para></listitem>
</varlistentry>
@@ -144,28 +175,28 @@
<term><citerefentry><refentrytitle>rpcclient</refentrytitle>
<manvolnum>1</manvolnum></citerefentry></term>
<listitem><para><command>rpcclient</command> is a utility
- that can be used to execute RPC commands on remote
+ that can be used to execute RPC commands on remote
CIFS servers.</para></listitem>
</varlistentry>
<varlistentry>
<term><citerefentry><refentrytitle>pdbedit</refentrytitle>
<manvolnum>8</manvolnum></citerefentry></term>
- <listitem><para>The <command>pdbedit</command> command
- can be used to maintain the local user database on
+ <listitem><para>The <command>pdbedit</command> command
+ can be used to maintain the local user database on
a samba server.</para></listitem></varlistentry>
<varlistentry>
<term><citerefentry><refentrytitle>findsmb</refentrytitle>
<manvolnum>1</manvolnum></citerefentry></term>
- <listitem><para>The <command>findsmb</command> command
+ <listitem><para>The <command>findsmb</command> command
can be used to find SMB servers on the local network.
</para></listitem></varlistentry>
<varlistentry>
<term><citerefentry><refentrytitle>net</refentrytitle>
<manvolnum>8</manvolnum></citerefentry></term>
- <listitem><para>The <command>net</command> command
+ <listitem><para>The <command>net</command> command
is supposed to work similar to the DOS/Windows
NET.EXE command.</para></listitem>
</varlistentry>
@@ -179,17 +210,9 @@
</varlistentry>
<varlistentry>
- <term><citerefentry><refentrytitle>winbindd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry></term>
- <listitem><para><command>winbindd</command> is a daemon
- that is used for integrating authentication and
- the user database into unix.</para></listitem>
- </varlistentry>
-
- <varlistentry>
<term><citerefentry><refentrytitle>wbinfo</refentrytitle>
<manvolnum>1</manvolnum></citerefentry></term>
- <listitem><para><command>wbinfo</command> is a utility
+ <listitem><para><command>wbinfo</command> is a utility
that retrieves and stores information related to winbind.
</para></listitem>
</varlistentry>
@@ -206,8 +229,8 @@
<varlistentry>
<term><citerefentry><refentrytitle>log2pcap</refentrytitle>
<manvolnum>1</manvolnum></citerefentry></term>
- <listitem><para><command>log2pcap</command> is a utility
- for generating pcap trace files from Samba log
+ <listitem><para><command>log2pcap</command> is a utility
+ for generating pcap trace files from Samba log
files.</para></listitem>
</varlistentry>
@@ -228,7 +251,7 @@
<varlistentry>
<term><citerefentry><refentrytitle>smbcquotas</refentrytitle>
<manvolnum>1</manvolnum></citerefentry></term>
- <listitem><para><command>smbcquotas</command> is a tool that
+ <listitem><para><command>smbcquotas</command> is a tool that
can set remote QUOTA's on server with NTFS 5. </para>
</listitem>
</varlistentry>
@@ -237,11 +260,11 @@
<refsect1>
<title>COMPONENTS</title>
-
- <para>The Samba suite is made up of several components. Each
- component is described in a separate manual page. It is strongly
- recommended that you read the documentation that comes with Samba
- and the manual pages of those components that you use. If the
+
+ <para>The Samba suite is made up of several components. Each
+ component is described in a separate manual page. It is strongly
+ recommended that you read the documentation that comes with Samba
+ and the manual pages of those components that you use. If the
manual pages and documents aren't clear enough then please visit
<ulink url="http://devel.samba.org/">http://devel.samba.org</ulink>
for information on how to file a bug report or submit a patch.</para>
@@ -254,79 +277,79 @@
--
Samba Shared Repository
More information about the samba-cvs
mailing list