[SCM] Samba Shared Repository - branch v4-0-stable updated
Karolin Seeger
kseeger at samba.org
Tue Feb 5 06:15:00 MST 2013
The branch, v4-0-stable has been updated
via 11319b5 VERSION: Disable git snapshots for the 4.0.3 release.
via 5f1ce72 WHATSNEW: Update release notes.
via e828bb4 WHATSNEW: Update release notes.
via 21fa32f samba-tool/domain provision: add support for utf-8 passwords for --adminpass
via 5eba557 samba-tool/user setpassword: fix help message
via 7c91895 s4:scripting/python: add support for utf-8 passwords from the command line
via 02ffca3 lib/util: improve check_password_quality() to handle utf8
via 55ed62e dsdb/util: rework samdb_check_password() to support utf8
via 4889c31 dsdb/password_hash: rename variable 'stat' to 'vstat'
via 34410fa dsdb/password_hash: make sure that io->n.cleartext_utf8.data is a null terminated string
via a8e865c s3: use generate_random_password() instead of generate_random_str()
via ad6b3e8 WHATSNEW: Start release notes for Samba 4.0.3.
via 4eadddc VERSION: Bump version number up to 4.0.3.
via baacf3e Merge commit 'samba-4.0.2' into v4-0-test
via 7ba52a1 Regression test for bug #9571 - Unlink after open causes smbd to panic
via 35f2333 Fix bug #9571 - Unlink after open causes smbd to panic.
via 0b7a432 Fix bug #9588 - ACLs are not inherited to directories for DFS shares.
via 8464023 ldb: Ensure to decrement the transaction_active whenever we delete a transaction
via 2156d54 ldb: fix a warning by converting from TDB_DATA to struct ldb_val
via d59bd3a ldb: Move doxygen comments for ldb_connect to the right place
via 37447a0 ldb: fix a typo in the comment for ldb_req_is_untrusted()
via 60a3157 ldb: fixed callers for ldb_pack_data() and ldb_unpack_data()
via 3d1d95f ldb: move ldb_pack.c into common
via 65629e8 ldb: Add ldbdump, based on tdbdump
via 4b0ec2b ldb: Remove no-longer-existing ltdb_unpack_data_free from ldb_tdb.h (cherry picked from commit 4b2f3c6dec997b0dd4bcafeae662a71ebd34e12b)
via 7bce044 ldb: Change ltdb_unpack_data to take an ldb_context
via a43b395 tdb: add -e option to tdbdump (and docment it).
via 2bd35b4 tdb: tdbdump should log errors, and fail in that case.
via 095419d tdb: add tdb_rescue()
via 0b1a583 tdb: Fix a typo
via 070e3ad s4:service_task: add missing imessaging_cleanup() to task_server_terminate()
via 7e79f7f s4:service_task: prevent a segfault if task->msg_ctx is not initialized yet
via f8890a4 selftest: rename 'promoted_vampire_dc' to 'promoted_dc'
via cb3da6f s4-process_single: Use pid,task_id as cluster_id in process_single just like process_prefork
via d00ec76 pymessaging: Pass around the server_id struct to python callbacks rather than the tuple
via fd6537b pymessaging: Use correct unsigned types for server ID tuple elememnts
via 9c5492c bug9598: s4-process_single: Use pid,fd as cluster_id in process_single just like process_prefork
via 0d68008 Regression test for bug #9587 - archive flag is always set on directories.
via 468f9ed Fix bug #9587 - archive flag is always set on directories.
via 6f49537 Fix bug #9586 - smbd[29175]: disk_free: sys_popen() failed" message logged in /var/log/message many times.
via a8deb91 Fix bug #9572 - File corruption during SMB1 read by Mac OSX 10.8.2 clients.
via 67536fd Revert "s3:smbd: SMB ReadX with size > 0xffff should only possible for samba clients."
via 41fd28c wafsamba: python-config is not always a script.
via b3d4e7f dsdb: Make secrets_tdb_sync cope with -H secrets.ldb
via 2b6fec0 dsdb: Make linked_attributes module GUID based for renames
via b6266a1 s3-winbind: fix the build of idmap_ldap.
via 545e4c5 Tests: Fix the display of test vars in screen --testenv
via 75588b4 Tests: avoid adding python options that are functions in the env
via 6abfae1 heimdal_build: Try again to sort out the strerror_r mess
via 2f51286 build(waf): fix the abi_match for the pdb library
via f81c8be build(waf)-libreplace: remove redundant check for flistea function
via 1d1b79f build: Make install_with_python.sh more portable
via d938268 build: In install_with_python.sh force using the python from the install we just made
via 626ef69 build: Make install_with_python.sh executable
via cfd1e5b swat: move russian swat files alongside ja and tr
via 63a5d7f passdb: Add discard_const_p() to pdb_samba_dsdb
via 0047295 build: Remove bashism from SAMBAMANPAGES rule
via 017ea7b replace: Fix compilation of rep_mkstemp
via 666dcca s3: Fix vfs_zfsacl to compile.
via 9bab305 docs: ldbsearch.1.xml: Correct meta data.
via 2e79e55 docs: ldbrename.1.xml: Correct meta data.
via 1e9aa0c docs: ldbmodify.1.xml: Correct meta data.
via 2361c2a docs: ldbedit.1.xml: Correct meta data.
via 6c76344 docs: ldbdel.1.xml: Correct meta data.
via 60910e1 docs: ldbadd.1.xml: Correct meta data.
via 6a11d7f docs: ldb.3.xml: Correct meta data.
via 3c70668 gensec: Allow login without a PAC by default (bug #9581)
via 1fa859a dbcheck: look in hasMasterNCs as well for determining the instance type of a NC
via 940daaa selftest: Add test of upgradeprovision using the old alpha13 tree
via a60792c samba_upgradeprovision: detect dns_backend for the reference provision
via 41af100 provision: setup names.dns_backend
via 6b0951a samba_upgradeprovision: fix the nTSecurityDescriptor on more containers (bug #9481)
via 5fd59ef provision: fix nTSecurityDescriptor of containers in the DnsZones (bug #9481)
via fc6e513 provision: fix nTSecurityDescriptor attributes of CN=*,${CONFIGDN} (bug #9481)
via 950e45f provision: fix nTSecurityDescriptor of CN={LostAndFound,System},${DOMAINDN} (bug #9481)
via d9b6c19 provision: setup names.name_map['DnsAdmins']
via 47cd0dd provision: introduce names.name_map = {}
via 75d0f27 provision: add get_dns_{forest,domain}_microsoft_dns_descriptor()
via 281708e provision: add get_config_ntds_quotas_descriptor()
via 3b006e2 provision: add get_{config,domain}_delete_protected*_descriptor()
via 8f9e8dc schema.py: add optional name_map={} to get_schema_descriptor()
via 138b2a8 provision: add optional name_map={} argument to get_*_descriptor()
via 2e8043e provision: import/export get_dns_partition_descriptor()
via 4f878d7 provision: setup names.dns{forest,domain}dn
via 15e5263 samba_upgradeprovision: fix resetting of 'nTSecurityDescriptor' on schema objects
via a3bbdd1 samba_upgradeprovision: don't reset 'whenCreated' when resetting 'nTSecurityDescriptor'
via 237375c dbckecker: fix nTSecurityDescriptor values from before 4.0.0rc6 (bug #9481)
via 68bb9bf dsdb-descriptor: get_default_group() should always return the DAG sid (bug #9481)
via a0c0b34 tests/sec_descriptor: the default owner behavior depends on domainControllerFunctionality (bug #9481)
via 0bc0e06 libcli/security: calculate INHERIT_ONLY correcty for AUDIT and ALARM aces (bug #9481)
via 0affb0c s4-resolve: Fix parsing of IPv6/AAAA in dns_lookup (bug #9555)
via 5acbb6f torture: Fix fsmo test to use correct -H samba-tool syntax
via c9fec2e dsdb: Do not hold the transaction over the IRPC call to perform a role transfer
via d743ba2 drs-fsmo: Improve handling of FSMO role takeover.
via c7ea247 libcli-acl: add documentation
via 3faabb4 drsuapi: Add documentation
via d4cf396 security: Add documentation
via 418d3b9 libcli-security: Add documentation for object_tree_modify_access
via 8b12ff6 dsdb: Fix warning about unused var
via 52dd9db dsdb: Explain ordering constraints on the ACL module as well.
via 5da10d8 dsdb: Ensure "authenticated users" is processed for group memberships
via 66e22b4 libcli/security: remove useless if (root->num_of_children > 0) statements
via cb22b49 libcli/security: add init_mask to existing children in insert_in_object_tree
via d0496c9 libcli/security: handle node initialisation in one spot in insert_in_object_tree()
via 4f3f51e libcli/security: avoid usage of dom_sid_parse_talloc() in sec_access_check_ds()
via ed19440 libcli/security: simplify get_ace_object_type()
via 7be082d libcli/security: fix formating in access_check.c
via 681e831 libcli/security: fix whitespaces in access_check.c
via c617e9c dsdb-acl: the SEC_ADS_DELETE_CHILD checks need objectclass->schemaIDGUID
via 319c128 dsdb-acl: make use of acl_check_access_on_objectclass() for the object in acl_delete()
via 133aa07 dsdb-acl: make use of acl_check_access_on_{attribute,objectclass} in acl_rename()
via a3a0810 dsdb-acl: make use of acl_check_access_on_attribute() in acl_modify()
via a96f171 dsdb-acl: remove unused acl_check_access_on_class()
via afbd774 dsdb-acl: use acl_check_access_on_objectclass() instead of acl_check_access_on_class()
via 8ae4759 dsdb-acl: Use the structural objectClass in acl_check_access_on_attribute()
via b0a0e14 dsdb-acl: Pass the structural objectClass into acl_check_access_on_attribute
via e8d389a dsdb-acl: Remove unused get_oc_guid_from_message()
via 5927b59 dsdb-acl: ask for the objectClass attribute if it's not in the scope of the clients search
via d76b803 dsdb-acl: use dsdb_get_structural_oc_from_msg() rather than class_schemaid_guid_by_lDAPDisplayName
via 128c31c dsdb-acl: Use dsdb_get_structural_oc_from_msg() in acl_rename()
via 512a21f dsdb-acl: Use dsdb_get_structural_oc_from_msg() in acl_modify()
via e320678 dsdb-acl: add acl_check_access_on_objectclass() helper
via 3600752 dsdb-acl: Add helper function dsdb_get_structural_oc_from_msg()
via 67046e4 dsdb-acl: attr is not optional to acl_check_access_on_attribute()
via 55dfcda dsdb-acl: dsdb_attribute_by_lDAPDisplayName() is needed for all attributes
via 8e2d5a1 dsdb-acl: introduce a 'el' helper variable to acl_modify()
via 3814767 dsdb-acl: introduce a 'msg' helper variable to acl_modify()
via f9345da dsdb-schema: make sure we build [system]PossibleInferiors completely
via 9d5071a dsdb-schema: make sure use clean caches in schema_inferiors.c
via d6a6978 dsdb-schema: make schema_subclasses_order_recurse() static
via eb81e02 dsdb-acl: calculate sDRightsEffective based on "nTSecurityDescriptor"
via 5f37d8f dsdb-acl: add helper variable 'ldb' in acl_sDRightsEffective
via 8c2de7d libcli/security: don't look at the inherited type in get_ace_object_type()
via 5247f3d dsdb-acl: fix the order of special and system checks
via ccc9038 dsdb-acl: Do not apply ACL on special DNs to hide attributes that the user shouldn't see
via 62cc9ad dsdb-acl: talloc_free the private context when we pass to the next module
via 95edd37 dsdb-acl: don't call dsdb_user_password_support() if we don't use the result
via c5fe4e2 dsdb-acl: give error string if we can not obtain the schema
via 517cf18 BUG 9474: Downgrade v4 printer driver requests to v3.
via 681f463 spoolss: add SPOOLSS_DRIVER_VERSION_2012 (4) define to IDL.
via 6221480 BUG 9378: Add extra attributes for AD printer publishing.
via 68bb358 printing: Remove invalid free from error path.
via 61c00ee BUG 9574: Fix a possible null pointer dereference in spoolss.
via afbdb30 s3-rpc_server: Fix a possible null pointer dereference.
via 0c29da8 samr: Fix bug 9541, make use of posix_openpt
via 4063f9e samr: Split up an assignment from an if condition
via da9d6c8 docs: document the command line options in dbwrap_tool(1)
via fa0e1dc docs: add popt.common.samba.server and popt.common.samba.client entities
via 3a70b74 docs: fix the stdarg.configfile entity to print a "=" sign after the long option
via 94b7d3b docs: use the stdarg.option entity in the popt.common.samba entity
via 5ca8907 docs: add an entity stdarg.option for the "--option" command line parameter
via 6916daa build(waf): docs-xml: build new dbwrap_tool.8 manual page (fix bug #9568 [2/2])
via 1c6a561 docs-xml: add dbwrap_tool.1 manual page (fix bug #9568 [1/2])
via b247db7 nsswitch: Fix two bitfield constants being the same.
via 2a9528e Sort winbind request flags. Ira saw we have a duplicate.
via 78f4e66 vfs: Fix compilation of solaris ACL module
via adc62f7 wafsamba: use additional xml catalog file (bug #9512)
via 7610b4f ntlm_auth(1): fix format and make examples visible (bug #9569)
via 097690e Fix bug 9550 - sigprocmask does not work on FreeBSD to stop further signals in a signal handler
via c95f929 Include sys/ucontext.h if available.
via b3db042 Add ucontext configure autoconf checks.
via ae05343 Add ucontext configure waf checks.
via a2f577d Add missing check for sys/wait.h
via a950974 configure: Fix bug 9546, aio_suspend detection on FreeBSD
via c5495c3 smbd: Fix bug 9544, part 2
via 787ba45 smbd: Fix bug 9544, part 1
via aa32e49 smbd: Always compile vfs_commit
via 46473b4 Fix bug 9548: Correctly detect O_DIRECT
via 6907b3f VERSION: Bump version number up to 4.0.2.
via 9712362 Merge tag 'samba-4.0.1' into v4-0-test
via 15652ef selftest: show that Samba honours "write list" and valid users
via eeab8bb Fixup the change_to_user_by_session() case as called from become_user_by_session()
via 456d4eb Move create_share_access_mask() from smbd/service.c to smbd/uid.c
via 2c16104 Fix bug #9518 - conn->share_access appears not be be reset between users.
via a6a7041 Factor code out of check_user_ok() into a call to check_user_share_access().
via 57aa765 Initialize stack variables. Prelude to factoring out calls to check_user_share_access().
via c1292fa Add check_user_share_access()
via c03fd9c Correctly setup the conn->share_access based on the current user token.
via bb7cdda Add parallel cache for share_access entries, one per connection struct.
via 4fa8368 Change API for create_share_access_mask() - remove conn struct.
via ced2c1d Change API for create_share_access_mask() to pass in the token.
via 3016cff Fix API for create_share_access_mask().
via 76b214f Remove static from create_share_access_mask().
via ff2e3e2 Remove unneeded variable "const struct auth_session_info *session_info"
via c261e70 Remove dead code now vuser can no longer be NULL.
via 7fe1f1f Remove the second set of {} braces, no longer needed. (cherry picked from commit ed0a34d163f777b2a0d4a2b358b7fb1b170d7686)
via b6c5860 Remove one set of enclosing {} braces, no longer needed.
via 8dcf29e Move the definition of struct vuid_cache_entry *ent outside blocks.
via 9b1cc0b Start to tidy-up check_user_ok().
via 46d52b3 s3:smb2_negprot: set the 'remote_proto' value (bug #9499)
via e663d18 smb.conf(5): update list of available protocols (bug #9552)
via 6817ae1 samba_dnsupdate: set KRB5_CONFIG for nsupdate command (bug #9517)
via 0843231 s4:drsuapi: try to behave more like windows for usn order (bug #9508)
via 4a876d3 s4:drsuapi: make use of LDB_TYPESAFE_QSORT() and pass getnc_state
via 807f319 s4:drsuapi: make sure we report the meta data from the cycle start (bug #9508)
via de07dfc s4:drsuapi: check the source_dsa_invocation_id (bug #9508)
via 6a0fe0a s4:drsuapi: make sure we never return the same highwatermark twice in a replication cycle (bug #9508)
via 5ea3a3d s4:drsuapi: add drsuapi_DsReplicaHighWaterMark_cmp()
via 5da4cb2 s4:drsuapi: always use the current uptodateness_vector
via c6cbf63 s4:drsuapi: avoid a ldb_dn_copy() and use talloc_move() instead
via 9061634 s4:drsuapi: remove unused 'highest_usn' from drsuapi_getncchanges_state
via 3a40d61 s4:drsuapi: move struct drsuapi_getncchanges_state to the top of getncchanges.c
via b308c26 s4:dsdb/drepl: update the source_dsa_obj/invocation_id in repsFrom
via 29cffea s4:dsdb/common: use 01.01.1970 as last_sync_success for our entry in the uptodatevector
via d2b0b9c s4:dsdb/common: use LDB_SEQ_HIGHEST_SEQ for our entry in the uptodatevector
via b7f3b06 s4:dsdb/repl_meta_data: don't merge highwatermark and uptodatevector (bug #9508)
via 9274d76 s4:dsdb/repl_meta_data: also update the last_sync_success in replUpToDateVector
via 834b597 s4:dsdb/repl_meta_data: store the last results and timestamps in the repsFrom
via a749a74 s4:dsdb/repl_meta_data: always treat the highwatermark as opaque (bug #9508)
via 36b44b5 s4:scripting/python: always treat the highwatermark as opaque (bug #9508)
via 4659595 s4:lib/messaging: terminate the irpc_servers_byname() result with server_id_set_disconnected() (bug #9540)
via af61dad smbd: Fix bug 9549 -- Memleak in the async echo handler
via 0d5e2f4 docs: Fix typo in vfs_tsmsm.8.xml.
via e5fe93b docs: Remove superfluous bracket.
via 04388ad Fix bug #9196 - defer_open is triggered multiple times on the same request.
via 9b4bd43 VERSION: Bump version number up to 4.0.1.
from 1c2abd4 VERSION: Bump version number up to 4.0.2.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-stable
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
VERSION | 2 +-
WHATSNEW.txt | 181 ++++++-
auth/gensec/gensec_util.c | 2 +-
buildtools/wafadmin/Tools/python.py | 2 +-
buildtools/wafsamba/wafsamba.py | 6 +-
docs-xml/build/DTD/samba.entities | 26 +-
docs-xml/manpages/dbwrap_tool.1.xml | 164 ++++++
docs-xml/manpages/ntlm_auth.1.xml | 195 ++++---
docs-xml/manpages/samba.8.xml | 2 +-
docs-xml/manpages/smb.conf.5.xml | 2 +-
docs-xml/manpages/vfs_tsmsm.8.xml | 2 +-
docs-xml/wscript_build | 1 +
install_with_python.sh | 5 +-
lib/ldb/ABI/ldb-1.1.14.sigs | 262 +++++++++
lib/ldb/ABI/ldb-1.1.15.sigs | 262 +++++++++
...ldb-util-1.1.10.sigs => pyldb-util-1.1.14.sigs} | 0
...ldb-util-1.1.10.sigs => pyldb-util-1.1.15.sigs} | 0
lib/ldb/common/ldb.c | 3 +-
lib/ldb/common/ldb_pack.c | 287 ++++++++++
lib/ldb/include/ldb.h | 25 +-
lib/ldb/include/ldb_private.h | 11 +
lib/ldb/ldb_tdb/ldb_index.c | 3 +-
lib/ldb/ldb_tdb/ldb_pack.c | 292 ----------
lib/ldb/ldb_tdb/ldb_search.c | 7 +-
lib/ldb/ldb_tdb/ldb_tdb.c | 5 +-
lib/ldb/ldb_tdb/ldb_tdb.h | 11 -
lib/ldb/man/ldb.3.xml | 4 +-
lib/ldb/man/ldbadd.1.xml | 6 +-
lib/ldb/man/ldbdel.1.xml | 6 +-
lib/ldb/man/ldbedit.1.xml | 6 +-
lib/ldb/man/ldbmodify.1.xml | 6 +-
lib/ldb/man/ldbrename.1.xml | 6 +-
lib/ldb/man/ldbsearch.1.xml | 6 +-
lib/ldb/tools/ldbdump.c | 230 ++++++++
lib/ldb/wscript | 10 +-
lib/replace/libreplace.m4 | 36 +-
lib/replace/replace.c | 4 +-
lib/replace/replace.h | 3 +-
lib/replace/system/wait.h | 4 +
lib/replace/wscript | 24 +-
lib/tdb/ABI/tdb-1.2.11.sigs | 67 +++
lib/tdb/common/lock.c | 2 +-
lib/tdb/common/rescue.c | 349 ++++++++++++
lib/tdb/include/tdb.h | 22 +
lib/tdb/libtdb.m4 | 2 +-
lib/tdb/man/tdbdump.8.xml | 31 +
lib/tdb/test/run-rescue-find_entry.c | 50 ++
lib/tdb/test/run-rescue.c | 126 +++++
lib/tdb/tools/tdbdump.c | 65 ++-
lib/tdb/wscript | 10 +-
lib/tevent/tevent_signal.c | 29 +
lib/util/genrand.c | 134 ++++-
lib/util/tests/genrand.c | 5 +-
libcli/security/access_check.c | 228 ++++----
libcli/security/access_check.h | 8 +-
libcli/security/create_descriptor.c | 20 +-
libcli/security/object_tree.c | 94 ++--
libcli/security/security.h | 9 +
librpc/idl/spoolss.idl | 3 +-
nsswitch/winbind_struct_protocol.h | 16 +-
selftest/knownfail | 1 -
selftest/selftest.pl | 15 +-
selftest/target/Samba3.pm | 7 +
selftest/target/Samba4.pm | 18 +-
selftest/tests.py | 1 +
selftest/wscript | 7 +-
source3/configure.in | 5 +-
source3/lib/util_file.c | 2 +-
source3/libads/util.c | 6 +-
source3/libnet/libnet_join.c | 8 +-
source3/libsmb/trusts_util.c | 7 +-
source3/modules/vfs_commit.c | 86 +++-
source3/modules/vfs_solarisacl.c | 2 +-
source3/modules/vfs_zfsacl.c | 4 +-
source3/passdb/pdb_samba_dsdb.c | 4 +-
source3/printing/nt_printing_ads.c | 87 +++-
source3/rpc_server/samr/srv_samr_chgpasswd.c | 7 +-
source3/rpc_server/spoolss/srv_spoolss_nt.c | 15 +-
.../script/tests/test_smbclient_machine_auth.sh | 4 +
source3/script/tests/test_smbclient_s3.sh | 194 +++++++-
source3/selftest/tests.py | 5 +
source3/smbd/conn.c | 85 +++-
source3/smbd/msdfs.c | 13 +
source3/smbd/process.c | 2 +-
source3/smbd/proto.h | 9 +
source3/smbd/reply.c | 30 +-
source3/smbd/service.c | 64 +--
source3/smbd/smb2_create.c | 6 +-
source3/smbd/smb2_negprot.c | 8 +
source3/smbd/trans2.c | 6 +-
source3/smbd/uid.c | 225 ++++++---
source3/torture/torture.c | 45 ++
source3/utils/net_rpc_join.c | 4 +-
source3/utils/net_rpc_trust.c | 8 +-
source3/winbindd/wscript_build | 3 +-
source3/wscript | 5 +-
source3/wscript_build | 2 +-
source4/auth/session.c | 44 ++-
source4/dsdb/common/dsdb_access.c | 5 +-
source4/dsdb/common/util.c | 32 +-
source4/dsdb/common/util_groups.c | 25 +
source4/dsdb/repl/drepl_fsmo.c | 5 +-
source4/dsdb/repl/drepl_out_helpers.c | 4 +
source4/dsdb/samdb/ldb_modules/acl.c | 590 +++++++++++---------
source4/dsdb/samdb/ldb_modules/acl_read.c | 32 +-
source4/dsdb/samdb/ldb_modules/acl_util.c | 95 +++-
source4/dsdb/samdb/ldb_modules/descriptor.c | 15 +-
source4/dsdb/samdb/ldb_modules/extended_dn_out.c | 2 -
source4/dsdb/samdb/ldb_modules/linked_attributes.c | 77 +++-
source4/dsdb/samdb/ldb_modules/password_hash.c | 33 +-
source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 49 +--
source4/dsdb/samdb/ldb_modules/rootdse.c | 38 ++-
source4/dsdb/samdb/ldb_modules/samba_dsdb.c | 4 +-
source4/dsdb/samdb/ldb_modules/secrets_tdb_sync.c | 5 +-
source4/dsdb/samdb/ldb_modules/util.c | 13 +
source4/dsdb/samdb/samdb.c | 31 -
source4/dsdb/schema/schema.h | 11 +-
source4/dsdb/schema/schema_inferiors.c | 59 ++-
source4/dsdb/tests/python/sec_descriptor.py | 8 +-
source4/heimdal_build/roken.h | 8 -
source4/heimdal_build/wscript_build | 1 +
source4/heimdal_build/wscript_configure | 7 +
source4/lib/messaging/messaging.c | 4 +-
source4/lib/messaging/pymessaging.c | 24 +-
source4/libcli/resolve/dns_ex.c | 1 +
source4/rpc_server/drsuapi/getncchanges.c | 232 ++++++---
source4/rpc_server/drsuapi/updaterefs.c | 21 +-
source4/scripting/bin/samba_dnsupdate | 9 +-
source4/scripting/bin/samba_upgradeprovision | 150 ++++--
source4/scripting/devel/getncchanges | 2 +-
source4/scripting/devel/repl_cleartext_pwd.py | 2 +-
source4/scripting/python/samba/dbchecker.py | 195 +++++++-
source4/scripting/python/samba/drs_utils.py | 2 +-
source4/scripting/python/samba/netcmd/user.py | 6 +-
.../scripting/python/samba/provision/__init__.py | 92 +++-
.../scripting/python/samba/provision/descriptor.py | 118 +++--
.../scripting/python/samba/provision/sambadns.py | 30 +-
source4/scripting/python/samba/samdb.py | 3 +-
source4/scripting/python/samba/schema.py | 2 +-
source4/scripting/python/samba/upgradehelpers.py | 3 +-
.../provisions/alpha13/etc/smb.conf.template | 10 +-
source4/selftest/tests.py | 4 +-
source4/setup/provision.ldif | 2 +
source4/setup/provision_configuration.ldif | 6 +
source4/setup/provision_configuration_modify.ldif | 6 +
source4/setup/provision_dnszones_add.ldif | 4 +
source4/setup/provision_well_known_sec_princ.ldif | 1 +
source4/smbd/process_single.c | 32 +-
source4/smbd/service_task.c | 4 +-
source4/torture/drs/python/fsmo.py | 4 +-
.../lang}/ru/help/welcome-no-samba-doc.html | 0
{source3/po => swat/lang}/ru/help/welcome.html | 0
{source3/po => swat/lang}/ru/images/globals.gif | Bin 2041 -> 2041 bytes
{source3/po => swat/lang}/ru/images/home.gif | Bin 2190 -> 2190 bytes
{source3/po => swat/lang}/ru/images/passwd.gif | Bin 1936 -> 1936 bytes
{source3/po => swat/lang}/ru/images/printers.gif | Bin 2139 -> 2139 bytes
{source3/po => swat/lang}/ru/images/shares.gif | Bin 2081 -> 2081 bytes
{source3/po => swat/lang}/ru/images/status.gif | Bin 2305 -> 2305 bytes
{source3/po => swat/lang}/ru/images/viewconfig.gif | Bin 2096 -> 2096 bytes
{source3/po => swat/lang}/ru/images/wizard.gif | Bin 2605 -> 2605 bytes
{source3/po => swat/lang}/ru/include/header.html | 0
testprogs/blackbox/upgradeprovision-alpha13.sh | 135 +++++
162 files changed, 5149 insertions(+), 1527 deletions(-)
create mode 100644 docs-xml/manpages/dbwrap_tool.1.xml
mode change 100644 => 100755 install_with_python.sh
create mode 100644 lib/ldb/ABI/ldb-1.1.14.sigs
create mode 100644 lib/ldb/ABI/ldb-1.1.15.sigs
copy lib/ldb/ABI/{pyldb-util-1.1.10.sigs => pyldb-util-1.1.14.sigs} (100%)
copy lib/ldb/ABI/{pyldb-util-1.1.10.sigs => pyldb-util-1.1.15.sigs} (100%)
create mode 100644 lib/ldb/common/ldb_pack.c
delete mode 100644 lib/ldb/ldb_tdb/ldb_pack.c
create mode 100644 lib/ldb/tools/ldbdump.c
create mode 100644 lib/tdb/ABI/tdb-1.2.11.sigs
create mode 100644 lib/tdb/common/rescue.c
create mode 100644 lib/tdb/test/run-rescue-find_entry.c
create mode 100644 lib/tdb/test/run-rescue.c
create mode 100644 source4/setup/provision_configuration_modify.ldif
rename {source3/po => swat/lang}/ru/help/welcome-no-samba-doc.html (100%)
rename {source3/po => swat/lang}/ru/help/welcome.html (100%)
rename {source3/po => swat/lang}/ru/images/globals.gif (100%)
rename {source3/po => swat/lang}/ru/images/home.gif (100%)
rename {source3/po => swat/lang}/ru/images/passwd.gif (100%)
rename {source3/po => swat/lang}/ru/images/printers.gif (100%)
rename {source3/po => swat/lang}/ru/images/shares.gif (100%)
rename {source3/po => swat/lang}/ru/images/status.gif (100%)
rename {source3/po => swat/lang}/ru/images/viewconfig.gif (100%)
rename {source3/po => swat/lang}/ru/images/wizard.gif (100%)
rename {source3/po => swat/lang}/ru/include/header.html (100%)
create mode 100755 testprogs/blackbox/upgradeprovision-alpha13.sh
Changeset truncated at 500 lines:
diff --git a/VERSION b/VERSION
index f1cc2a6..90929b7 100644
--- a/VERSION
+++ b/VERSION
@@ -25,7 +25,7 @@
########################################################
SAMBA_VERSION_MAJOR=4
SAMBA_VERSION_MINOR=0
-SAMBA_VERSION_RELEASE=2
+SAMBA_VERSION_RELEASE=3
########################################################
# If a official release has a serious bug #
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 0711f96..5464717 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,4 +1,181 @@
=============================
+ Release Notes for Samba 4.0.3
+ February 05, 2013
+ =============================
+
+
+This is is the latest stable release of Samba 4.0.
+
+Major enhancements in Samba 4.0.3 include:
+
+o check_password_quality: Handle non-ASCII characters properly (bug #9105).
+o Fix ACL problem with delegation of privileges and deletion of accounts
+ over LDAP interface (bug #8909).
+o Fix 'smbd' panic triggered by unlink after open (bug #9571).
+o smbd: Fix memleak in the async echo handler (bug #9549).
+
+Known issues:
+-------------
+
+o For more details concerning the ACL problem with delegation of privileges
+ and deletion of accounts over LDAP interface (bugs #8909 and #9267)
+ regarding upgrades from older 4.0.x versions, please see
+
+ http://wiki.samba.org/index.php/Samba_AD_DC_HOWTO#Upgrading
+
+ which will be filled with details once we have worked out an upgrade
+ strategy.
+
+Changes since 4.0.2:
+--------------------
+
+o Michael Adam <obnox at samba.org>
+ * BUG 9568: Document the command line options in dbwrap_tool(1).
+
+
+o Jeremy Allison <jra at samba.org>
+ * BUG 9196: defer_open is triggered multiple times on the same request.
+ * BUG 9518: conn->share_access appears not be be reset between users.
+ * BUG 9550: sigprocmask does not work on FreeBSD to stop further signals in
+ a signal handler.
+ * BUG 9572: Fix file corruption during SMB1 read by Mac OSX 10.8.2 clients.
+ * BUG 9586: smbd[29175]: disk_free: sys_popen() failed" message logged in
+ /var/log/message many times.
+ * BUG 9587: Archive flag is always set on directories.
+ * BUG 9588: ACLs are not inherited to directories for DFS shares.
+
+
+o Andrew Bartlett <abartlet at samba.org>
+ * BUG 8909: Fix ACL problem with delegation of privileges and deletion of
+ accounts over LDAP interface.
+ * BUG 9461: FSMO seize of naming role fails: NT_STATUS_IO_TIMEOUT.
+ * BUG 9564: Fix compilation of Solaris ACL module.
+ * BUG 9581: gensec: Allow login without a PAC by default.
+ * BUG 9596: Linked attribute handling should be by GUID.
+ * BUG 9598: Use pid,task_id as cluster_id in process_single just like
+ process_prefork.
+ * BUG 9609: ldb: Ensure to decrement the transaction_active whenever we
+ delete a transaction.
+ * BUG 9609: Add 'ldbdump' tool.
+ * BUG 9609: ldb: Remove no-longer-existing ltdb_unpack_data_free from
+ ldb_tdb.h.
+ * BUG 9609: ldb: Change ltdb_unpack_data to take an ldb_context.
+ * BUG 9610: dsdb: Make secrets_tdb_sync cope with -H secrets.ldb.
+
+
+o Björn Baumbach <bb at sernet.de>
+ * BUG 9512: wafsamba: Use additional xml catalog file.
+ * BUG 9517: samba_dnsupdate: Set KRB5_CONFIG for nsupdate command.
+ * BUG 9552: smb.conf(5): Update list of available protocols.
+ * BUG 9568: Add dbwrap_tool.1 manual page.
+ * BUG 9569: ntlm_auth(1): Fix format and make examples visible.
+
+
+o Ira Cooper <ira at samba.org>
+ * BUG 9575: Duplicate flags defined in the winbindd protocol.
+
+
+o Günther Deschner <gd at samba.org>
+ * BUG 9474: Downgrade v4 printer driver requests to v3.
+ * BUG 9595: s3-winbind: Fix the build of idmap_ldap.
+
+
+o David Disseldorp <ddiss at samba.org>
+ * BUG 9378: Add extra attributes for AD printer publishing.
+
+
+o Stephen Gallagher <sgallagh at redhat.com>
+ * BUG 9609: ldb: Move doxygen comments for ldb_connect to the right place.
+
+
+o Volker Lendecke <vl at samba.org>
+ * BUG 9541: Make use of posix_openpt.
+ * BUG 9544: Fix build of vfs_commit and plug in async pwrite support.
+ * BUG 9546: Fix aio_suspend detection on FreeBSD.
+ * BUG 9548: Correctly detect O_DIRECT.
+ * BUG 9549: smbd: Fix memleak in the async echo handler.
+
+
+o Stefan Metzmacher <metze at samba.org>
+ * BUG 8909: Fix ACL problem with delegation of privileges and deletion of
+ accounts over LDAP interface.
+ * BUG 9105: check_password_quality: Handle non-ASCII characters properly.
+ * BUG 9481: samba_upgradeprovision: fix the nTSecurityDescriptor on more
+ containers.
+ * BUG 9499: s3:smb2_negprot: set the 'remote_proto' value.
+ * BUG 9508: s4:drsuapi: Make sure we report the meta data from the cycle
+ start.
+ * BUG 9540: terminate the irpc_servers_byname() result with
+ server_id_set_disconnected().
+ * BUG 9598: Fix timeouts of some IRPC calls.
+ * BUG 9609: Fix a warning by converting from TDB_DATA to struct ldb_val.
+
+
+o Matthieu Patou <mat at matws.net>
+ * BUG 8909: Add documentation.
+ * BUG 9565: Adding additional Samba 4.0 DC to W2k8 srv AD domain (in win200
+ functional level) produces dbcheck errors.
+
+
+o Arvid Requate <requate at univention.de>
+ * BUG 9555: s4-resolve: Fix parsing of IPv6/AAAA in dns_lookup.
+
+
+o Rusty Russell <rusty at rustcorp.com.au>
+ * BUG 9609: tdb: Add '-e' option to tdbdump (and document it).
+ * BUG 9609: tdb: 'tdbdump' should log errors, and fail in that case.
+ * BUG 9609: tdb: Add tdb_rescue() to allow an emergency best-effort dump.
+
+
+o Samba-JP oota <ribbon at samba.gr.jp>
+ * BUG 9528: Remove superfluous bracket in samba.8.xml.
+ * BUG 9530: Fix typo in vfs_tsmsm.8.xml.
+
+
+o Andreas Schneider <asn at samba.org>
+ * BUG 9574: Fix a possible null pointer dereference in spoolss.
+
+
+o Karolin Seeger <kseeger at samba.org>
+ * BUG 9591: Correct meta data in ldb manpages.
+
+
+o Pavel Shilovsky <piastry at etersoft.ru>
+ * BUG 9571: Fix 'smbd' panic triggered by unlink after open.
+
+
+o Andrew Tridgell <tridge at samba.org>
+ * BUG 9609: ldb: Fix callers for ldb_pack_data() and ldb_unpack_data().
+ * BUG 9609: ldb: move ldb_pack.c into common.
+
+
+o Jelmer Vernooij <jelmer at samba.org>
+ * BUG 9503: waf assumes that pythonX.Y-config is a Python script.
+
+
+######################################################################
+Reporting bugs & Development Discussion
+#######################################
+
+Please discuss this release on the samba-technical mailing list or by
+joining the #samba-technical IRC channel on irc.freenode.net.
+
+If you do report problems then please try to send high quality
+feedback. If you don't provide vital information to help us track down
+the problem then you will probably be ignored. All bug reports should
+be filed under the Samba 3.6 product in the project's Bugzilla
+database (https://bugzilla.samba.org/).
+
+
+======================================================================
+== Our Code, Our Bugs, Our Responsibility.
+== The Samba Team
+======================================================================
+
+Release notes for older releases follow:
+----------------------------------------
+
+ =============================
Release Notes for Samba 4.0.2
January 30, 2013
=============================
@@ -61,8 +238,8 @@ database (https://bugzilla.samba.org/).
======================================================================
-Release notes for older releases follow:
-----------------------------------------
+----------------------------------------------------------------------
+
=============================
Release Notes for Samba 4.0.1
diff --git a/auth/gensec/gensec_util.c b/auth/gensec/gensec_util.c
index d732213..64952b1 100644
--- a/auth/gensec/gensec_util.c
+++ b/auth/gensec/gensec_util.c
@@ -42,7 +42,7 @@ NTSTATUS gensec_generate_session_info_pac(TALLOC_CTX *mem_ctx,
session_info_flags |= AUTH_SESSION_INFO_DEFAULT_GROUPS;
if (!pac_blob) {
- if (!gensec_setting_bool(gensec_security->settings, "gensec", "require_pac", false)) {
+ if (gensec_setting_bool(gensec_security->settings, "gensec", "require_pac", false)) {
DEBUG(1, ("Unable to find PAC in ticket from %s, failing to allow access\n",
principal_string));
return NT_STATUS_ACCESS_DENIED;
diff --git a/buildtools/wafadmin/Tools/python.py b/buildtools/wafadmin/Tools/python.py
index c2af312..a15e1f6 100644
--- a/buildtools/wafadmin/Tools/python.py
+++ b/buildtools/wafadmin/Tools/python.py
@@ -259,7 +259,7 @@ MACOSX_DEPLOYMENT_TARGET = %r
includes = []
if python_config:
- for incstr in Utils.cmd_output("%s %s --includes" % (python, python_config)).strip().split():
+ for incstr in Utils.cmd_output("%s --includes" % (python_config,)).strip().split():
# strip the -I or /I
if (incstr.startswith('-I')
or incstr.startswith('/I')):
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 9409669..dcbb047 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -790,14 +790,16 @@ def SAMBAMANPAGES(bld, manpages):
'''build and install manual pages'''
bld.env.SAMBA_EXPAND_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/expand-sambadoc.xsl'
bld.env.SAMBA_MAN_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/man.xsl'
- bld.env.SAMBA_CATALOGS = 'file:///etc/xml/catalog file://' + bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml'
+ bld.env.SAMBA_CATALOGS = 'file:///etc/xml/catalog file:///usr/local/share/xml/catalog file://' + bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml'
+
for m in manpages.split():
source = m + '.xml'
bld.SAMBA_GENERATOR(m,
source=source,
target=m,
group='final',
- rule='''export XML_CATALOG_FILES="${SAMBA_CATALOGS}"
+ rule='''XML_CATALOG_FILES="${SAMBA_CATALOGS}"
+ export XML_CATALOG_FILES
${XSLTPROC} --xinclude --stringparam noreference 0 -o ${TGT}.xml --nonet ${SAMBA_EXPAND_XSL} ${SRC}
${XSLTPROC} --nonet -o ${TGT} ${SAMBA_MAN_XSL} ${TGT}.xml'''
)
diff --git a/docs-xml/build/DTD/samba.entities b/docs-xml/build/DTD/samba.entities
index c7e46c2..c9c6744 100644
--- a/docs-xml/build/DTD/samba.entities
+++ b/docs-xml/build/DTD/samba.entities
@@ -214,7 +214,7 @@ in the &smb.conf; file.</para>
<!ENTITY stdarg.configfile '
<varlistentry>
-<term>-s|--configfile <configuration file></term>
+<term>-s|--configfile=<configuration file></term>
<listitem><para>The file specified contains the
configuration details required by the server. The
information in this file includes server-specific
@@ -241,12 +241,36 @@ log.smbd, etc...). The log file is never removed by the client.
</para></listitem>
</varlistentry>'>
+<!ENTITY stdarg.option '
+<varlistentry>
+<term>--option=<name>=<value></term>
+<listitem><para>Set the
+<citerefentry><refentrytitle>smb.conf</refentrytitle>
+<manvolnum>5</manvolnum></citerefentry>
+option "<name>" to value "<value>" from the command line.
+This overrides compiled-in defaults and options read from the configuration
+file.
+</para></listitem>
+</varlistentry>'>
+
<!ENTITY popt.common.samba '
&stdarg.version;
&stdarg.configfile;
&stdarg.log-basename;
+&stdarg.option;
'>
+<!ENTITY popt.common.samba.client '
+&stdarg.client.debug;
+&popt.common.samba;
+'>
+
+<!ENTITY popt.common.samba.server '
+&stdarg.server.debug;
+&popt.common.samba;
+'>
+
+
<!ENTITY stdarg.resolve.order '
<varlistentry>
<term>-R|--name-resolve <name resolve order></term>
diff --git a/docs-xml/manpages/dbwrap_tool.1.xml b/docs-xml/manpages/dbwrap_tool.1.xml
new file mode 100644
index 0000000..f4a6388
--- /dev/null
+++ b/docs-xml/manpages/dbwrap_tool.1.xml
@@ -0,0 +1,164 @@
+<?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="dbwrap_tool.1">
+
+<refmeta>
+ <refentrytitle>dbwrap_tool</refentrytitle>
+ <manvolnum>1</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+ <refmiscinfo class="version">4.0</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+ <refname>dbwrap_tool</refname>
+ <refpurpose>low level TDB/CTDB manipulation tool using the dbwrap interface</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <cmdsynopsis>
+ <command>dbwrap_tool</command>
+ <arg choice="opt">-d <debug level></arg>
+ <arg choice="opt">-s <config file></arg>
+ <arg choice="opt">-l <log file base></arg>
+ <arg choice="opt">-V</arg>
+ <arg choice="opt">--option=<name>=<value></arg>
+ <arg choice="req"><database></arg>
+ <arg choice="req"><operation></arg>
+ <arg choice="opt"><key>
+ <arg choice="opt"><type>
+ <arg choice="opt"><value></arg>
+ </arg>
+ </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 dbwrap_tool program is used to read and manipulate
+ TDB/CTDB databases using the dbwrap interface.</para>
+
+ <para>The following database operations are available:
+ <itemizedlist>
+ <listitem><para>fetch: fetch a record</para></listitem>
+ <listitem><para>store: create or modify a record</para></listitem>
+ <listitem><para>delete: remove a record</para></listitem>
+ <listitem><para>erase: remove all records</para></listitem>
+ <listitem><para>listkeys: list all available records</para></listitem>
+ <listitem><para>listwatchers: list processes, which are waiting for changes in a record</para></listitem>
+ </itemizedlist>
+ </para>
+ <para>The following types are available:
+ <itemizedlist>
+ <listitem><para>int32: signed 32bit integer</para></listitem>
+ <listitem><para>uint32: unsigned 32bit integer</para></listitem>
+ <listitem><para>string: "hello world"</para></listitem>
+ <listitem><para>hex: hex strings like "68656C6C6F20776F726C6400" ("hello world")</para></listitem>
+ </itemizedlist>
+ </para>
+</refsect1>
+
+<refsect1>
+ <title>OPTIONS</title>
+
+ <variablelist>
+ &popt.common.samba.client;
+ &stdarg.help;
+ </variablelist>
+</refsect1>
+
+<refsect1>
+ <title>COMMANDS</title>
+ <refsect2>
+ <title>fetch</title>
+ <cmdsynopsis>
+ <command>dbwrap_tool</command> <database> fetch <key> <type>
+ </cmdsynopsis>
+ </refsect2>
+ <refsect2>
+ <title>store</title>
+ <cmdsynopsis>
+ <command>dbwrap_tool</command> <database> store <key> <type> <value>
+ </cmdsynopsis>
+ </refsect2>
+ <refsect2>
+ <title>delete</title>
+ <cmdsynopsis>
+ <command>dbwrap_tool</command> <database> delete <key>
+ </cmdsynopsis>
+ </refsect2>
+ <refsect2>
+ <title>erase</title>
+ <cmdsynopsis>
+ <command>dbwrap_tool</command> <database> erase </cmdsynopsis>
+ </refsect2>
+ <refsect2>
+ <title>listkeys</title>
+ <cmdsynopsis>
+ <command>dbwrap_tool</command> <database> listkeys
+ </cmdsynopsis>
+ </refsect2>
+ <refsect2>
+ <title>listwatchers</title>
+ <cmdsynopsis>
+ <command>dbwrap_tool</command> <database> listwatchers
+ </cmdsynopsis>
+ </refsect2>
+</refsect1>
+
+<refsect1>
+ <title>EXAMPLES</title>
+ <variablelist>
+ <varlistentry><term>List all keys from winbindd_idmap.tdb</term>
+ <listitem><para><command>dbwrap_tool</command> winbindd_idmap.tdb listkeys</para></listitem>
+ </varlistentry>
+ <varlistentry><term>Fetch record with key "USER HWM" as uint32</term>
+ <listitem><para><command>dbwrap_tool</command> winbindd_idmap.tdb fetch "USER HWM" uint32</para></listitem>
+ </varlistentry>
+ <varlistentry><term>Remove record with key "USER HWM"</term>
+ <listitem><para><command>dbwrap_tool</command> winbindd_idmap.tdb remove "USER HWM"</para></listitem>
+ </varlistentry>
+ <varlistentry><term>Store and overwrite record "USER HWM" with value 214</term>
+ <listitem><para>uint32: <command>dbwrap_tool</command> winbindd_idmap.tdb store "USER HWM" uint32 214</para></listitem>
+ <listitem><para>hex: <command>dbwrap_tool</command> winbindd_idmap.tdb store "USER HWM" hex D6000000</para></listitem>
+ </varlistentry>
+ </variablelist>
+</refsect1>
+
+<refsect1>
+ <title>NOTES</title>
+
+ <para>Use with caution!</para>
+</refsect1>
+
+
+<refsect1>
+ <title>VERSION</title>
+
+ <para>This man page is correct for version 3 of the Samba suite.</para>
+</refsect1>
+
+<refsect1>
+ <title>SEE ALSO</title>
+ <para><citerefentry><refentrytitle>smbd</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>samba</refentrytitle>
+ <manvolnum>7</manvolnum></citerefentry></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>
+
+ <para>The dbwrap_tool manpage was written by Bjoern Baumbach.</para>
+</refsect1>
+
+</refentry>
diff --git a/docs-xml/manpages/ntlm_auth.1.xml b/docs-xml/manpages/ntlm_auth.1.xml
index 8bd77bd..619e713 100644
--- a/docs-xml/manpages/ntlm_auth.1.xml
+++ b/docs-xml/manpages/ntlm_auth.1.xml
@@ -160,111 +160,132 @@
external program to the helper are:</para>
<variablelist>
<varlistentry>
- <term>Username</term>
-
- <listitem><para>The username, expected to be in
- Samba's <smbconfoption name="unix charset"/>.
- </para>
-
- <para><example>Username: bob</example></para>
- <para><example>Username:: Ym9i</example></para>
- </listitem></varlistentry>
+ <term>Username</term>
+ <listitem><para>The username, expected to be in
+ Samba's <smbconfoption name="unix charset"/>.
+ </para>
--
Samba Shared Repository
More information about the samba-cvs
mailing list