[SCM] Samba Shared Repository - branch v3-6-stable updated

Karolin Seeger kseeger at samba.org
Tue Jul 26 14:19:49 MDT 2011


The branch, v3-6-stable has been updated
       via  64a03c4 WHATSNEW: Update changes since rc2.
       via  71fca9b s3:utils/net_afs fix compiler warnings
       via  dccfe81 s3:lib/afs fix the build with --with-vfs-afsacl
       via  dac65be s3:lib/afs fix the build with --with-fake-kaserver
       via  1bb400c Fix bug 8314] - smbd crash with unknown user.
       via  21d43b8 s3 swat: Create random nonce in CGI mode
       via  dc63c21 s3 swat: Add time component to XSRF token
       via  0904dd5 s3 swat: Add XSRF protection to printer page
       via  b0f0f91 s3 swat: Add XSRF protection to password page
       via  d229cee s3 swat: Add XSRF protection to shares page
       via  08973ee s3 swat: Add XSRF protection to globals page
       via  f41da84 s3 swat: Add XSRF protection to wizard page
       via  6bdd87c s3 swat: Add XSRF protection to wizard_params page
       via  d210791 s3 swat: Add XSRF protection to viewconfig page
       via  fc6d525 s3 swat: Add XSRF protection to status page
       via  5da66b1 s3 swat: Add support for anti-XSRF token
       via  025dd2e s3 swat: Allow getting the user's HTTP auth password
       via  10eb79a s3-swat: Fix typo.
       via  0be407a s3 swat: Fix possible XSS attack (bug #8289)
       via  69ceb11 release-scripts/create-tarball: always create a tag in form of samba-${version}
       via  669c6b0 Second part of fix for bug 8310 - toupper_ascii() is broken on big-endian systems.
       via  9deadb6 First part of fix for bug 8310 - toupper_ascii() is broken on big-endian systems
       via  9f9873c Fix bug #8307 - brl_close_fnum does not call SMB_VFS_BRL_UNLOCK_WINDOWS on all locks
       via  bca5caa WHATSNEW: Update changes since rc2.
       via  c0a2ffc s3:smb2_create: use smbd_calculate_access_mask() instead of smbd_check_open_rights()
       via  0ea90e4 s3:smb2_tcon: return the correct maximal_access on the share
       via  6802d90 s3:smbd: return the real share access mask in the SMBtconX response
       via  7ed7dc8 s3:smbd: use smbd_calculate_access_mask() also for fake_files
       via  c752911 s3:smbd: check the share level access mask in smbd_calculate_access_mask()
       via  6271906 s3:smbd: make smbd_calculate_access_mask() non-static
       via  d838f98 s3:smbd/msdfs: let create_conn_struct() check the share security descriptor
       via  29e04df s3: Fix bug 8102
       via  969a509 s3: Calculate&store the maximum share access mask
       via  c3866d1 s3: Return "granted" from share_access_check
       via  e411ce3 s3:smb2_server: add some comments about change_to_user() and change_to_root_user()
       via  72f0b1d s3:smb2_server: call change_to_root_user() or smbd_smb2_request_check_tcon()
       via  cacaa3b s3:smb2_server: there's no reason to check the session id twice on a smb2_tcon request
       via  9986235 WHATSNEW: Update changes since rc2.
       via  3ad6453 VERSION: Set version to 3.6.0rc3.
       via  d4dc24d Fix bug #Bug 8304 - Uninitialized variable referenced in error path.
       via  1deaa86 Fix bug 8305 - nmbd segfaults - when using "smbtree ..." (cherry picked from commit 102a931c8081559423fb25b3a4d445b6f2e790ac) (cherry picked from commit e5f4b6e7aa1d102db023a491991684118875ee38)
       via  93b0f1e s3-docs: Remove manpages for ldb tools.
       via  37401f5 Fix bug #8293 - SMB2 doesn't rotate the log files often enough.
       via  cc23bb6 s3-waf: split out LIBCLI_WINREG_INTERNAL as LIBCLI_WINREG was pulling in rpc server code in undesired places.
       via  a395d86 s3-printing: remove tdb migration invalid printer name checks
       via  be92377 s3-printing: fill info2_mask in printer migration
       via  4110411 s3-printing: make sure to first migrate the printers then the security descriptor.
       via  0aec19d s3-printing: remove spoolss pipe from migration library, only using winreg finally.
       via  ab2f735 s3-printing: use winreg interface for migration, instead of spoolss.
       via  b30e296 s3-printing: safe a ton of roundtrips by reusing existing winreg binding_handles.
       via  9603b3c s3-printing: use winreg_internal functions.
       via  27aa927 s3-printing: add winreg_internal functions.
       via  d664c58 s3-printing: add winreg_printer_binding_handle and remove most of srv_spoolss_util.c.
       via  11e1e80 s3-printing: add rpc_client/cli_winreg_spoolss.c
       via  1c8731f s3-waf: make LIBCLI_SPOOLSS a shared library
       via  28d730e s3-printing: move spoolss_create_default_devmode/secdesc to init_spoolss.h
       via  c028b22 s3-printing: move driver_info_ctr_to_info8 to init_spoolss.h
       via  96d340c s3-printing: move os2 related functions to printing/nt_printing_os2.c.
       via  097dd6b s3-printing: open up a winreg pipe handle for the migration code.
       via  25b8c5e s3-net: use printing_migrate library, and eliminate duplicate code.
       via  a65bf45 s3-printing: split out printing migration code into a smaller library.
       via  0dc1ac9 s3-printing: skip migration of non-existent printers
       via  1da6fe2 s3-printing: fill devicemode size in migrate_printer()
       via  6bf4143 s3-waf: stop building smbtortre4.
       via  1f8ab1e WHATSNEW: Add changes since rc2.
       via  32845e1 s3:smb2 fix smbd crash on premature end of smb2 conn (Bug 8286)
       via  807cc2c s3:nmbd_subnetdb: close all sockets attached to a subnet in close_subnet() (bug #8276)
       via  00836e6 s3:smbldap: make smbldap_connect_system self contained
       via  104a0e4 s3:smbldap: add a destructor to smbldap_state, just in case (cherry picked from commit 56bc5c73eaa7509d4e58ed010c834304b238c72c)
       via  410b9f1 s3:smbldap: let smbldap_free_struct do what it claims to (cherry picked from commit 66e853875ec13481093bf79522004665fe66260d)
       via  9bd77d9 s3:smbldap: free the idle event scheduled in smbldap_open in smbldap_close (cherry picked from commit 56e9ad4aa736875ac5666a9c3e33ae3d94fb2f5c)
       via  5300e26 s3:smbldap: use smbldap_state as memory context for idle event
       via  705451c s3:smbd do not panic when CTDB is unhealthy (Bug #8278)
       via  3a2c31f s3:build: add vfs_examples to the everything target
       via  9c68a15 s3:build: add a vfs_examples target. (cherry picked from commit 737a1c9b96a4ba8d8688f4dba1df6d931e10e64d)
       via  0500907 examples/VFS: fix skel_transparent.c in reference to shadow_copy changes
       via  fd17a43 examples/VFS: fix skel_opaque.c in reference to shadow_copy changes
       via  a2e3053 examples/VFS: fix shadow_copy_test.c in reference to shadow_copy changes
       via  5b58467 s3-winbind: Fix bug 7888 -- deal with buggy 3.0 based PDCs
       via  4c71aec Second part of fix for bug #8219 - SMB Panic from Windows 7 Client.
       via  4d189bb Fix bug #8219 - SMB Panic from Windows 7 Client
       via  de94873 s3: explicitly pass domain_sid to wbint_LookupRids() (bug #7841)
       via  825e13b s3:rpc_server/svcctl: fix valgrind bug in _svcctl_QueryServiceObjectSecurity()
       via  22b392a s3:rpc_server/svcctl: fix valgrind bugs in _svcctl_QueryServiceConfig2W()
       via  410219b s3:rpc_server/svcctl: don't allocate return values on a temporary stackframe
       via  e84a0ff Fix bug #8254 - "acl check permissions = no" does not work in all cases
       via  d89076c s3:test: don't rely on pyhton being in /usr/bin/python in the sids2xids test
       via  fb8a4c2 s3:test: fix the smbclient_s3 test on older systems
       via  ee38ae0 s3:test: fix the net registry roundtrip test on older systems
       via  a10029b s3-autconf Move nmbd socket directory to PREFIX/var/nmbd
       via  ec22832 s3-buildoptions Show compiled-in location of the new ncaclrpc and nmbd sockets (cherry picked from commit c558775713e505cfc1db5af417cc7b792dfc310e)
       via  4c0cab5 s3:docs: fix the example in the idmap_autorid manpage to use "idmap config * : rangesize" (cherry picked from commit a2fa00e4ea6f3a99953f4ec3214d68a07223b910)
       via  49fdf84 s3:vfs_commit: fix build
       via  e46161e s3:smb2_ioctl/FSCTL_PIPE_TRANSCEIVE: generate STATUS_BUFFER_OVERFLOW if needed (bug #8260)
       via  dbc561e s3:modules fix Bug 8244 - Cannot copy files larger than 2 GB to Samba share
       via  3eb24c4 s3: Fix Coverity ID 2582: FORWARD_NULL
       via  b48945b s3-spoolss: Fix some valgrind warnings.
       via  1a548f7 s3-rpc_client: Fix some valgrind warnings.
       via  6902bdb s3:idmap_autorid: remove redundant code
       via  0ee9d73 s3:idmap_autorid: in initialize, don't leak storedconfig to talloc_tos() in the success case (cherry picked from commit 496e472894c3fbd543fac88c0c2d304116d64ff8)
       via  4f16f9e s3:idmap_autorid: use "idmap config * : rangesize" instead of "autorid : rangesize" (cherry picked from commit ea0b87a6e9857c27383ae3fac2c37c61427d31fc)
       via  ccbcfbf s3:idmap_autorid: fail initialization if the domain is not "*"
       via  2718f63 s3:net-man: registry enumerate_recursive
       via  0440703 s3:net-man: registry deletekey & deletekey_recursive
       via  98cdbdf s3:net-man: missing dot
       via  56733bd s3:net registry: polish output of net registry enumerate[_recursive]
       via  15c3be2 s3:net: registry: use recursive implementation for enumerate
       via  c382a4e s3:net: registry: add new command enumerate_recursive
       via  3726e18 s3: improve WHATSNEW around kerberos changes (cherry picked from commit b08149c6b8ddcac1399808b1b96e1fc08d382318)
       via  035ba6f s3:wb_lookupsids: add some paranoia checks to wb_lookupsids_recv()
       via  ddd0a57 s3:wb_lookupsids: don't ignore 'result' and check if we got useable values
       via  d8c3819 Revert "s3-winbind: Fix paranoia checks in winbindd_samr.c."
       via  d5ed016 s3:utils/net_*registry: use c99 initializers which are supported by old gcc 2.95 compilers (bug #8226)
       via  4c6ce77 s3:libsmb/clireadwrite: calculate cli_write_max_bufsize() correct based on max_xmit
       via  64c10ec s3:libsmb/clireadwrite: calculate cli_read_max_bufsize() correct based on max_xmit
       via  0c77030 s3:libsmb/clitrans: correctly transfer the seqnum between secondary and primary requests
       via  9d4264b s3:libsmb/clitrans: fix handling of multi pdu [nt]trans[s][2] calls
       via  abdc6f2 s3:libsmb/clitrans: use subreq2 as variable for the secondary requests
       via  ac0b57f s3:libsmb/clitrans: move MID handling to the end of cli_trans_send() and add a comment
       via  75a4f63 s3:libsmb/clitrans: correctly marshall [nt]trans[s][2] requests
       via  cd77368 s3:libsmb/clitrans: marshall SMBnttrans[2] as the others
       via  c72aec93 s3:libsmb/clitrans: use uint32_t for param and data variables
       via  55bbc86 s3:libsmb/clitrans: remove unused secondary_request_ctx
       via  2d3ec59 s3:libsmb/async_smb: add helpers to get and set the seqnum for signing
       via  a846cac s3:libsmb/async_smb: don't remove pending requests if the mid is set
       via  98154a3 s3:libsmb/async_smb: call cli_smb_req_unset_pending() instead of destructor directly
       via  89ad32e s3:libsmb/async_smb: let cli_smb_recv() initialize output values for one way requests
       via  babaa74 s3:libsmb/cli_np_tstream: s/TSTREAM_CLI_NP_BUF_SIZE/TSTREAM_CLI_NP_MAX_BUF_SIZE
       via  56cdf40 s3:libsmb:cli_np_tstream: use dynamic talloc buffers
       via  4e82537 s3:libsmb/cli_np_tstream: use larger buffers to avoid a bug NT4 servers (bug #8195)
       via  12f6e4b s3:librpc/ndr/util.h: add license/copyright header and inclusion guard
       via  32df25a s3:registry/reg_parse_internal.c: add copyright information (cherry picked from commit 8d3242ecdca4e3b4a3ed4ada76b57e702106c5cc)
       via  7e41167 s3:registry/reg_parse_internal.h: add copyright information (cherry picked from commit 8e41d9e29ba0d62105beacda976962d4f24150ed)
       via  d1bb923 source3/rpc_client/util_netlogon.h: fix licence/copyright
       via  425eb3a source3/rpc_client/init_spoolss.h: fix licence/copyright
       via  6a434b4 source3/rpc_client/init_samr.h: fix licence/copyright
       via  8c586ec source3/rpc_client/init_netlogon.h: fix licence/copyright
       via  101d95b source3/rpc_client/init_lsa.h: fix licence/copyright
       via  806c54c source3/rpc_client/cli_spoolss.h: fix licence/copyright
       via  7ad21c0 source3/rpc_client/cli_netlogon.h: fix licence/copyright
       via  7fc754b source3/printing/pcap.h: fix licence/copyright
       via  4de1549 source3/printing/load.h: fix licence/copyright
       via  a218817 source3/libsmb/proto.h: fix licence/copyright
       via  fde7758 source3/libsmb/nmblib.h: fix licence/copyright
       via  03e3d2c source3/libsmb/libsmb.h: fix licence/copyright
       via  773394c source3/libsmb/errormap_wbc.h: fix licence/copyright
       via  7ec6748 source3/libsmb/clidgram.h: fix licence/copyright
       via  02bab26 source3/libnet/libnet_join.h: fix licence/copyright
       via  605b360 source3/libads/ldap_schema.h: fix licence/copyright
       via  04ae046 source3/libads/cldap.h: fix licence/copyright
       via  76f310c source3/libads/ads_status.h: fix licence/copyright
       via  972d2ce source3/libads/ads_ldap_protos.h: fix licence/copyright
       via  9583db7 source3/lib/privileges.h: fix licence/copyright
       via  0e2ba3e source3/lib/netapi/libnetapi.h: fix licence/copyright
       via  8336557 source3/intl/lang_tdb.h: fix licence/copyright
       via  3ec1648 source3/include/smb_ldap.h: fix licence/copyright
       via  027d033 source3/include/smb_krb5.h: fix licence/copyright
       via  a96e80a source3/include/mangle.h: fix licence/copyright
       via  36492c8 source3/include/krb5_protos.h: fix licence/copyright
       via  4e1993c source3/include/krb5_env.h: fix licence/copyright
       via  d182f01 nsswitch/winbind_client.h: fix licence/copyright
       via  4a568f5 nsswitch/pam_winbind.h: fix licence/copyright.
       via  4c7a5dd librpc/ndr/ndr_table.h: fix licence/copyright
       via  555da03 librpc/ndr/ndr_spoolss_buf.h: fix licence/copyright
       via  7b16cb2 librpc/ndr/ndr_dns.h: fix licence/copyright
       via  6b23112 librpc/ndr/ndr_compression.h: fix licence/copyright
       via  d16872c librpc/ndr/ndr_backupkey.h: fix licence/copyright
       via  4343e9f libds/common/flag_mapping.h: fix licence/copyright
       via  a8893da libcli/smbreadline/smbreadline.h: fix licence/copyright
       via  edb338a libcli/nbt/nbt_proto.h: fix licence/copyright
       via  1be9c1c libcli/ldap/ldap_ndr.h: fix licence/copyright
       via  084007f libcli/auth/msrpc_parse.h: fix licence/copyright
       via  7ffb733 lib/util/wrap_xattr.h: fix licence/copyright
       via  5c25db1 lib/util/util_tdb.h: fix licence/copyright
       via  10a0cf6 lib/util/util_ldb.h: fix licence/copyright
       via  df24dd2 lib/util/time.h: fix licence/copyright
       via  13dd28a lib/util/data_blob.h: fix licence/copyright
       via  4b86417 auth/auth_sam_reply.h: fix licence/copyright
       via  57012d3 s3:passdb: add GPL/copyright header to machine_sid.h (cherry picked from commit c0fc7aa129c25664c76b3fdb4b9150c63fe3dd70) (cherry picked from commit 47e78003507f14c9d104fa089dc1b28e45c42ee1)
       via  f22a39c s3:nmbd: add _NMBD_NMBD_H_ guard to nmbd.h (cherry picked from commit fdd225c3e41ed5a81ef02d39ac037818bde49c03) (cherry picked from commit 7aeb6d8ffd19d58d5a0bcc7c1c700641a60d2066)
       via  3b022ed s3:nmbd: add GPL/Copyright header to nmbd.h (cherry picked from commit 75cfafd69864fccacd1e6c3ca8d27b42a48dbe1c) (cherry picked from commit 17567a592f16fe30afb7e8e252c95103ee2d67bb)
       via  82ac48c s3:rpc_server: add _RPC_SERVER_SRV_ACCESS_CHECK_H_ guard to srv_access_check.h (cherry picked from commit e40331552137f513c6c2404d96adcf421212ec86) (cherry picked from commit 290352d3a706f8d30df927cbb9293e3c50d91200)
       via  a684c39 s3:rpc_server: add GPL/Copyright header to rpc_server/srv_access_check.h (cherry picked from commit 942ae874b85570f44b3257c8d229792ede7f8fd9) (cherry picked from commit b39087cbdf6cd6a7d7ceef1272ea56d22969df03)
       via  db558ff s3: add _LIB_IDMAP_CACHE_H_ guard to lib/idmap_cache.h (cherry picked from commit c2887f060954bd0e77bc6f3ac8fedec38e26c168) (cherry picked from commit 6c837effd131aef1bdd1c1273e441244c003dd12)
       via  97ce696 s3: add GPL/Copyright header to lib/idmap_cache.h (cherry picked from commit 2b8803d458465508d0f4299248d858b9c393323e) (cherry picked from commit addf5ff8503f57c0e815b47346d62484c8029f1e)
       via  752a69e s3:lib/eventlog/proto.h: add _LIB_EVENTLOG_PROTO_H_ guard (cherry picked from commit 36feb8a240a7f061e25223364c1f7ca8476a029f) (cherry picked from commit ee0bc9e8d1bed88b20c945bf21a032181cf8f1bc)
       via  74a6298 s3:lib/eventlog/proto.h: add GPL/Copyright header (cherry picked from commit 00530e3d0166641a4f9716067e3c5d1146b0db17) (cherry picked from commit 93891332630601b51e07da922a8c06224a7c0840)
       via  9724ddd s3:libgpo/gpo_proto.h: add _LIBGPO_GPO_PROTO_H_ guard (cherry picked from commit 6ef8122cba3566d4ed177612066cbbe1b8684677) (cherry picked from commit c833668e0a1044faf4d0f9326f6c206c28c7f8b3)
       via  adbc584 s3:libgpo/gpo_proto.h: add GPL/Copyright header (cherry picked from commit 59950faddc898ea97171d2eac5759314cc1cbeb9) (cherry picked from commit 8347a0475956cec29a16e47ff05f6cf40b986336)
       via  2044a63 s3:libads/kerberos_proto.h: add _LIBADS_KERBEROS_PROTO_H_ guard (cherry picked from commit 4c542015a1a36a230a1a5b6f4ba6b643494e1185) (cherry picked from commit dffdec55a0c188c9e7cfa8862b02bee23b6f27ba)
       via  bc7db25 s3:libads/kerberos_proto.h: add GPL/Copyright header (cherry picked from commit 6bf3228f2850b2960276f683e51ccfd6c952a62d) (cherry picked from commit b21ebf9dc92b6d07f2147950e7d18c8ad406d8cf)
       via  462df48 s3:libads/ads_proto.h: add _LIBADS_ADS_PROTO_H_ guard (cherry picked from commit eb5db22771d1c700f881f879b98ae08c69d2203b) (cherry picked from commit aa1f48dba19d75fcbcd3ff145d9810c014ec7d3d)
       via  6d7421b s3:libads/ads_proto.h: add GPL/Copyright header (cherry picked from commit 6e9c055ce28d66be76957dc0bde87655190bc622) (cherry picked from commit a8fce72987aa707d04e991d4ff509ece32e604cc)
       via  ad939a0 s3:nmbd/nmbd_proto.h: add GPL/Copyright header (cherry picked from commit d8f269feefc3891c01788d5c74cf0954702c6022) (cherry picked from commit 5c7a01f246a19faeb3db5eb88543b11f04ee07c0)
       via  f8ab3f9 s3:winbindd/idmap_proto.h: add _WINBINDD_IDMAP_PROTO_H_ guard (cherry picked from commit b88d80a97572a9d7730830f09b25a7d6dc655653) (cherry picked from commit a9a64b9af3a5c2506df50511123b1786c7ced24f)
       via  5e29113 s3:winbindd/idmap_proto.h: add GPL/Copyright header (cherry picked from commit 88078c856976ebcad68251129ddc0556663dcf9c) (cherry picked from commit 9f5c52d4b216261275764d90a030dbc724eab22e)
       via  2b24c1a s3:groupdb/proto.h: add _GROUPDB_PROTO_H_ guard (cherry picked from commit 447f0d356b4cef3e8501923d040146e782022d44) (cherry picked from commit 7bd3a59f7d3e69c9185c2c5fc00ff3ac51e06331)
       via  36e49b2 s3:groupdb/proto.h: add GPL/Copyright header (cherry picked from commit f2cbced75e33c5467672b8eb5c9bc2fc82a2f7da) (cherry picked from commit 7182ce8b116152027fc58018f642e0fec72a454a)
       via  7da2adb s3:smbd/proto.h: add _SMBD_PROTO_H_ guard (cherry picked from commit 2e6f8f7bdadd4b6e8b8c9ff2adf3dc1275c50430) (cherry picked from commit 618559feef0ff2a73427b120f685468c35df8f7a)
       via  35b8438 s3:smbd/proto.h: add GPL/Copyright header (cherry picked from commit e1bad49f3e6490ac7ff28b7bf8ddb8fb1447c7bd) (cherry picked from commit 72377abf4fc0eaa3d8b52737e29e052698024eca)
       via  ac55574 s3:locking/proto.h: add _LOCKING_PROTO_H_ guard (cherry picked from commit ff82f77796f0d867089962f7970efbe53c51289d) (cherry picked from commit 4f47d4f76401da5b0e140d51ca41e890b8887692)
       via  3434896 s3:locking/proto.h: add GPL/Copyright header (cherry picked from commit 93b8e90b5beb5704807834bb710f3b4f303ba5a8) (cherry picked from commit 7bcf99d6ec58190cf84368fdc5a3848579c0783d)
       via  194b254 s3:auth/proto.h: add _AUTH_PROTO_H_ guard (cherry picked from commit 9cc1410718ae16bd30a7aa24878901dd70c19f75)
       via  3046fa5 s3:auth/proto.h: add GPL/Copyright header (cherry picked from commit 1b7077204d30c4151662cf2f4547bf22baaae6fe) (cherry picked from commit 931956476be2ececdede9dc4d50ec79dd701882b)
       via  da52536 s3:passdb/proto.h: add _PASSDB_PROTO_H_ guard (cherry picked from commit 7d40c88695173e93606546e895731f66b87381d2) (cherry picked from commit 316e6c3734091a417f2ce6bfc939e287681d77f8)
       via  a1f2a71 s3:passdb/proto.h: add GPL/copyright comment header (cherry picked from commit b3cbcd0eda4fdb993acc63c8cb6923feea067a7d) (cherry picked from commit df756b54410dcb34340d20147a463e029562d361)
       via  ec9917f s3:smbd/quotas: add #include "system/filesys.h" (bug #8224)
       via  095e9c6 s3-utils: fix crash in net cache get
       via  b492e4e Remove Samba4-specific documentation from the 3.6 release tree
       via  aaa57b5 Remove Makefile and configure for top level build in v3-6-test
       via  639c3e9 s3-param Mark 'time offset' as deprecated
       via  1318661 s3:net conf addshare: do not stat-check the share path.
       via  dfcc2fb bug in source3/winbindd/winbindd_sids_to_xids.c
       via  5b7c946 s3-winbind: Fix paranoia checks in winbindd_samr.c.
       via  5935768 Fix re-opened bug 8083 - "inherit owner = yes" doesn't interact correctly with vfs_acl_xattr or vfs_acl_tdb module.
       via  794f0bd Part 5 of bugfix for #8211 - "inherit owner = yes" doesn't interact correctly with "inherit permissions = yes" and POSIX ACLs
       via  814103b Part 4 of bugfix for #8211 - "inherit owner = yes" doesn't interact correctly with "inherit permissions = yes" and POSIX ACLs
       via  2b24d7a Part 3 of bugfix for #8211 - "inherit owner = yes" doesn't interact correctly with "inherit permissions = yes" and POSIX ACLs
       via  568111c Part 2 of bugfix for #8211 - "inherit owner = yes" doesn't interact correctly with "inherit permissions = yes" and POSIX ACLs
      from  d46a3a2 VERSION: Bump version up to 3.6.0.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-stable


- Log -----------------------------------------------------------------
commit 64a03c4212f21e674da7bc4256ba097c6e1c69fa
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Jul 26 22:06:04 2011 +0200

    WHATSNEW: Update changes since rc2.
    
    Karolin
    (cherry picked from commit 1a045c461ec74001596e9ccf8a676328216e547f)

commit 71fca9b43afe6fd65ad0b45c3adac8a8748f24d1
Author: Christian Ambach <ambi at samba.org>
Date:   Fri Jul 15 15:44:36 2011 +0200

    s3:utils/net_afs fix compiler warnings
    
    this also fixes the usage displays of net afs
    (cherry picked from commit 7738d8b89bcf2b43d65f1bf4599a688cb4143768)

commit dccfe81a604e09ac23549f8dd0c23fd7da053c48
Author: Christian Ambach <ambi at samba.org>
Date:   Fri Jul 15 15:54:25 2011 +0200

    s3:lib/afs fix the build with --with-vfs-afsacl
    
    This fixes the second piece of Bug #8263
    (cherry picked from commit 8a14ccb99388e31b366fc84060186be1ea708d75)

commit dac65bee277617363a74acb0804a922048539137
Author: Christian Ambach <ambi at samba.org>
Date:   Fri Jul 15 15:27:07 2011 +0200

    s3:lib/afs fix the build with --with-fake-kaserver
    
    This fixes one piece of Bug #8263
    (cherry picked from commit caa4226c315a70138016cf8fae13ce3f050057e7)

commit 1bb400c280cb984930c62b901348ed73140369d2
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Jul 22 16:42:51 2011 -0700

    Fix bug 8314] - smbd crash with unknown user.
    
    All other auth modules code with being called with
    auth_method->private_data being NULL, make the auth_server
    module cope with this too.
    (cherry picked from commit e173f04a822944e96171866d9fbf43301cd611a4)

commit 21d43b8594f9ea1eb204f2716bdd34581bb01ccf
Author: Kai Blin <kai at samba.org>
Date:   Tue Jul 12 08:08:24 2011 +0200

    s3 swat: Create random nonce in CGI mode
    
    In CGI mode, we don't get access to the user's password, which would
    reduce the hash used so far to parameters an attacker can easily guess.
    To work around this, read the nonce from secrets.tdb or generate one if
    it's not there.
    Also populate the C_user field so we can use that for token creation.
    
    Signed-off-by: Kai Blin <kai at samba.org>
    (cherry picked from commit 589bc35590aebfdd20fe786c08005bb43ef47d94)

commit dc63c218b730fa62e3257f5a91b7146c02c42cf3
Author: Kai Blin <kai at samba.org>
Date:   Sat Jul 9 09:52:07 2011 +0200

    s3 swat: Add time component to XSRF token
    
    Signed-off-by: Kai Blin <kai at samba.org>
    (cherry picked from commit fb0d393a1972c28ecd6e49959c8c5b7900e1b574)

commit 0904dd584c3903130a1a1142b478397040fe8b6c
Author: Kai Blin <kai at samba.org>
Date:   Fri Jul 8 15:06:13 2011 +0200

    s3 swat: Add XSRF protection to printer page
    
    Signed-off-by: Kai Blin <kai at samba.org>
    (cherry picked from commit 3b138403ea157f1c6b8dfc40016f293831765948)

commit b0f0f919a1ecc936705e5735aabcdf52c7668134
Author: Kai Blin <kai at samba.org>
Date:   Fri Jul 8 15:05:38 2011 +0200

    s3 swat: Add XSRF protection to password page
    
    Signed-off-by: Kai Blin <kai at samba.org>
    (cherry picked from commit 395503b9f51445d9ca493c2fc7e6022ee75cb743)

commit d229cee9600658db4349593c33db2210bffa7bae
Author: Kai Blin <kai at samba.org>
Date:   Fri Jul 8 15:04:48 2011 +0200

    s3 swat: Add XSRF protection to shares page
    
    Signed-off-by: Kai Blin <kai at samba.org>
    (cherry picked from commit 869590cc3a0c09e11f77277af1d3b7334b718ce0)

commit 08973ee4c77c199507a88099fee2cffea0d871c9
Author: Kai Blin <kai at samba.org>
Date:   Fri Jul 8 15:04:12 2011 +0200

    s3 swat: Add XSRF protection to globals page
    
    Signed-off-by: Kai Blin <kai at samba.org>
    (cherry picked from commit dc3aa10bbc5936aebab88db2ea34b46648839745)

commit f41da840569fa72e3fc1d841fa80cb273a7cec45
Author: Kai Blin <kai at samba.org>
Date:   Fri Jul 8 15:03:44 2011 +0200

    s3 swat: Add XSRF protection to wizard page
    
    Signed-off-by: Kai Blin <kai at samba.org>
    (cherry picked from commit e33970f1c60451a063bb2eeb64f9515c64722508)

commit 6bdd87c37f2de221ede8b0a7cd00c586e00643aa
Author: Kai Blin <kai at samba.org>
Date:   Fri Jul 8 15:03:15 2011 +0200

    s3 swat: Add XSRF protection to wizard_params page
    
    Signed-off-by: Kai Blin <kai at samba.org>
    (cherry picked from commit a887d8446bc74b255682a4047cb5616fe236bcaf)

commit d21079132424254512d98a540cbb766f5ce93f37
Author: Kai Blin <kai at samba.org>
Date:   Fri Jul 8 15:02:53 2011 +0200

    s3 swat: Add XSRF protection to viewconfig page
    
    Signed-off-by: Kai Blin <kai at samba.org>
    (cherry picked from commit bb9bb437fc3685879f5b34c444d58c4a564f148d)

commit fc6d5251e6b33fe5d5feb81eb429c249973aff63
Author: Kai Blin <kai at samba.org>
Date:   Fri Jul 8 12:58:53 2011 +0200

    s3 swat: Add XSRF protection to status page
    
    Signed-off-by: Kai Blin <kai at samba.org>
    (cherry picked from commit d240094fbe7b581a6c97f506fa17747e21180598)

commit 5da66b10b866f56565cdd770f074e50d4cb17611
Author: Kai Blin <kai at samba.org>
Date:   Fri Jul 8 12:57:43 2011 +0200

    s3 swat: Add support for anti-XSRF token
    
    Signed-off-by: Kai Blin <kai at samba.org>
    (cherry picked from commit 5e32110742a310aff6946acd34b0dca3a3fc8130)

commit 025dd2ea43fc28e08b4f021f2cd2ad891c7120e1
Author: Kai Blin <kai at samba.org>
Date:   Fri Jul 8 12:56:21 2011 +0200

    s3 swat: Allow getting the user's HTTP auth password
    
    Signed-off-by: Kai Blin <kai at samba.org>
    (cherry picked from commit 4592956a35d700aaf4ec2be7fc183f42fbe14fba)

commit 10eb79a046a6c3cdcb21cf65caf0d42de16770de
Author: Karolin Seeger <kseeger at samba.org>
Date:   Sun Jul 24 21:09:38 2011 +0200

    s3-swat: Fix typo.
    
    Thanks to Simo for reporting!
    
    Karolin
    (cherry picked from commit 9f73c1990a19daa899fa5345530a867e69a5be94)
    (cherry picked from commit bcb052c29212954a3ed10c9f095c51e4e0a96af5)
    (cherry picked from commit 43cf67654ebcfd3f0a8298af7f6cf15cd5f2d981)

commit 0be407ad30cb9e02b47a8caaa8497ad1525a6f97
Author: Kai Blin <kai at samba.org>
Date:   Thu Jul 7 10:03:33 2011 +0200

    s3 swat: Fix possible XSS attack (bug #8289)
    
    Nobuhiro Tsuji of NTT DATA SECURITY CORPORATION reported a possible XSS attack
    against SWAT, the Samba Web Administration Tool. The attack uses reflection to
    insert arbitrary content into the "change password" page.
    
    This patch fixes the reflection issue by not printing user-specified content on
    the website anymore.
    
    Signed-off-by: Kai Blin <kai at samba.org>
    (cherry picked from commit d88744f460a2a65d4e0cfb6c944f90f09e15d3b4)

commit 69ceb111a498fd206f86883e06eef63f791f592d
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Jun 28 12:52:37 2011 +0200

    release-scripts/create-tarball: always create a tag in form of samba-${version}
    
    metze
    (cherry picked from commit 84d9cdb5112e55ae8a1e525ca2b8cef2ae606f22)
    (cherry picked from commit d7242cb7fcfca687a4b9c20c4084c74b12fc5aad)

commit 669c6b00753487955a03312f5aab3a455b04df61
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jul 19 13:08:31 2011 -0700

    Second part of fix for bug 8310 - toupper_ascii() is broken on big-endian systems.
    
    Re-add:
        smb_ucs2_t toupper_w(smb_ucs2_t v);
        bool isupper_w(smb_ucs2_t v);
        smb_ucs2_t tolower_w(smb_ucs2_t v);
        bool islower_w(smb_ucs2_t v);
    
    and ensure they are called whenever we are operating on smb_ucs2_t
    variables. I'd like to make the definition of smb_ucs2_t incompatible
    with int and codepoint_t so they can't be mixed, but that's a patch
    for another time.
    (cherry picked from commit bdc078a81e49bce3b51560a75984e0306c387573)

commit 9deadb668d82a0b608123c3940075e92ea93c009
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jul 19 12:21:23 2011 -0700

    First part of fix for bug 8310 - toupper_ascii() is broken on big-endian systems
    
    Remove
    int toupper_ascii(int c);
    int tolower_ascii(int c);
    int isupper_ascii(int c);
    int islower_ascii(int c);
    
    and replace with their _m equivalents, as they are identical.
    (cherry picked from commit 5b6a34128a0e0bc33c255dc53c9fb9fd8e6d34d8)

commit 9f9873c0aaee4e64ead5a60a76174d2f9c1406f0
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Jul 15 21:36:13 2011 -0700

    Fix bug #8307 - brl_close_fnum does not call SMB_VFS_BRL_UNLOCK_WINDOWS on all locks
    
    Reported by herb at samba.org. Remove the (premature) optimization
    on file close.
    (cherry picked from commit c5b272a05c4bd9d7f70c14fe307b8da46b9e607e)

commit bca5caadbda9fc590c44f9a6acc109e6d5ddc746
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Jul 13 21:52:32 2011 +0200

    WHATSNEW: Update changes since rc2.
    
    Karolin
    (cherry picked from commit 8585ac3635e9ae284a5b35dba2412d996a73f7ad)

commit c0a2ffc80e2aafba7010564e0cf56e3807155d4b
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sun Jul 10 13:09:06 2011 +0200

    s3:smb2_create: use smbd_calculate_access_mask() instead of smbd_check_open_rights()
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Mon Jul 11 22:45:01 CEST 2011 on sn-devel-104
    (cherry picked from commit f5d320ac0fb74d4ad95a03969366096e9b074379)
    
    The last 10 patches address bug #8102 (domuser can change ACL from his files
    over the network).
    (cherry picked from commit d43d147c9d69dd23296677f9ae998c9362771682)

commit 0ea90e47525ab18b8b28e496a03df8788a1d878f
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sun Jul 10 13:02:11 2011 +0200

    s3:smb2_tcon: return the correct maximal_access on the share
    
    metze
    (cherry picked from commit a1046389ffcc476456ac76cb701a4325d1c42ef9)
    (cherry picked from commit 89a05c3a54239d384317f9881430fac264138f3f)

commit 6802d903e10a0977cbae50013dad488f442a4fbc
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Jul 11 16:12:57 2011 +0200

    s3:smbd: return the real share access mask in the SMBtconX response
    
    metze
    (cherry picked from commit 58eed1b295afeff6acfb8c1f10b0bb02280fd491)
    (cherry picked from commit c384bf75284fa7280b9279d305c5404f9f1066df)

commit 7ed7dc83900620cc0789083694af117bbc6513dc
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sun Jul 10 13:59:40 2011 +0200

    s3:smbd: use smbd_calculate_access_mask() also for fake_files
    
    metze
    (cherry picked from commit 581d8fa36b73abab030168dc35fb631ccd42a388)
    (cherry picked from commit 3e8770619c53c956f623ae852f97e6226513898d)

commit c752911b9c82183d1bccdee02fbeb8821b193abd
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sun Jul 10 13:03:51 2011 +0200

    s3:smbd: check the share level access mask in smbd_calculate_access_mask()
    
    I think we should reject invalid access early,
    before we might create new files.
    
    Also smbd_check_open_rights() is only called if the file existed.
    
    metze
    (cherry picked from commit 896f105ed40dc04f83bcbfac367b309c8d957f86)
    (cherry picked from commit d43f7ffb9fa8449a954d2e9fc9012a00289b41e2)

commit 6271906316f2f371a4a9672808aee5d214d3db04
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sun Jul 10 13:00:25 2011 +0200

    s3:smbd: make smbd_calculate_access_mask() non-static
    
    metze
    (cherry picked from commit ce66d4e4a885add09edfa8e6d5eab0f3b5d63081)
    (cherry picked from commit 5a1c2b4774c914a45bf2da7e666f6acf7f6927c6)

commit d838f98b83d9f1edeccd48f3696c7dfc9048c954
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Jul 12 17:31:13 2011 +0200

    s3:smbd/msdfs: let create_conn_struct() check the share security descriptor
    
    metze
    (cherry picked from commit 18f967a24881aa899b39f7676fc70a7f7aaca07b)
    (cherry picked from commit bd91cb862c4ceb3955c742d1c516e51733a19e6e)

commit 29e04dfa5245c06ee9c3e35891d0c344898fa11d
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Jul 5 11:13:07 2011 +0200

    s3: Fix bug 8102
    
    We can't allow open with access that has been denied via the share
    security descriptor
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Tue Jul  5 16:21:54 CEST 2011 on sn-devel-104
    (cherry picked from commit 4deca5d72804a40e68158a1183f5633dabf24761)
    (cherry picked from commit b3a035005ef98bcb31bade50a9e3ddf088302779)

commit 969a50998d526c890af0db149999a16e7764f8e3
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Jul 4 18:35:21 2011 +0200

    s3: Calculate&store the maximum share access mask
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 720fa46f9443ccbe471b265f1c2b9cb9782a3c26)
    (cherry picked from commit 83c6e9d3ad76e8009778e5ba0bf22e256d06ad48)

commit c3866d10822db00566b4110f20cb0612fc9685b9
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Jul 4 17:02:34 2011 +0200

    s3: Return "granted" from share_access_check
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 1c022d2e414607633323e65abbc63bb3aeaaa6a4)
    (cherry picked from commit 283f76c06308eaeaf9d134e0bfb45188ee684fb3)

commit e411ce369114dbac3612006bfab65420de257455
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Jul 8 09:08:39 2011 +0200

    s3:smb2_server: add some comments about change_to_user() and change_to_root_user()
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Fri Jul  8 13:45:46 CEST 2011 on sn-devel-104
    (cherry picked from commit dbfb88aef30a755c29015bff4699eb17925a4988)
    
    The last 3 patches address bug #8292 (Disable SMB2 for 3.6).
    (cherry picked from commit 7b28ae90603ff152e31b2113109bdaebc540810f)

commit 72f0b1dff2a5e984323672c23ce6cec8205886be
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Jul 7 16:38:33 2011 +0200

    s3:smb2_server: call change_to_root_user() or smbd_smb2_request_check_tcon()
    
    For all requests which don't operate on a tcon, we should call
    change_to_root_user(), to match the SMB1 behavior.
    
    For SMB1 we do the following operations without AS_USER:
    
    /* 0x70 */ { "SMBtcon",reply_tcon,0},
    /* 0x71 */ { "SMBtdis",reply_tdis,DO_CHDIR},
    /* 0x72 */ { "SMBnegprot",reply_negprot,0},
    /* 0x73 */ { "SMBsesssetupX",reply_sesssetup_and_X,0},
    /* 0x74 */ { "SMBulogoffX",reply_ulogoffX, 0}, /* ulogoff doesn't give a valid TID */
    /* 0x75 */ { "SMBtconX",reply_tcon_and_X,0},
    ...
    /* 0x2b */ { "SMBecho",reply_echo,0},
    ...
    /* 0xa4 */ { "SMBntcancel",reply_ntcancel, 0 },
    
    For SMB2tdis we still call smbd_smb2_request_check_tcon()
    as close_cnum() calls change_to_root_user() when needed.
    
    metze
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    (cherry picked from commit eea210eba7c20e6d04b13cf8ccd3011ee7c99157)
    (cherry picked from commit 3de9d2204e1f14c8a1d9642f3dc1e1e7e1013210)

commit cacaa3bd0327f4e3eda50f285c2b6d9222e79bb9
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Jul 4 15:57:20 2011 +0200

    s3:smb2_server: there's no reason to check the session id twice on a smb2_tcon request
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Mon Jul  4 17:34:13 CEST 2011 on sn-devel-104
    (cherry picked from commit 7c96e96e9881ec1ad7b41f0ab241a5b0ac17b93f)
    (cherry picked from commit fe6a325226a5fb17e5ccf62c5d0882d97baa35b7)

commit 99862354aff331f9f81962a3bc7158cc476ca4ce
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Jul 13 21:21:23 2011 +0200

    WHATSNEW: Update changes since rc2.
    
    Karolin
    (cherry picked from commit ae414153864100daa616b169b1b55e2d903b590c)

commit 3ad64535b89ed6f253d30702c390d0f9d818f16f
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Jul 13 21:20:56 2011 +0200

    VERSION: Set version to 3.6.0rc3.
    
    Karolin
    (cherry picked from commit 7bbf4bc9870c5a9b02a40d321b2efdb86b0440d2)

commit d4dc24d484203753650a6c1fd55ff92e4bafc9a4
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jul 12 13:06:13 2011 -0700

    Fix bug #Bug 8304 - Uninitialized variable referenced in error path.
    
    princ must not be used uninitialized. auth_data is not used at all.
    (cherry picked from commit ba6f88a6720358bea75b162f193182b724b9411c)

commit 1deaa86ad7c2d1eef179cfdc73703ff51416d394
Author: Günter Kukkukk <linux at kukkukk.com>
Date:   Wed Jul 13 06:10:13 2011 -0700

    Fix bug 8305 - nmbd segfaults - when using "smbtree ..." (cherry picked from commit 102a931c8081559423fb25b3a4d445b6f2e790ac)
    (cherry picked from commit e5f4b6e7aa1d102db023a491991684118875ee38)

commit 93b0f1e6bb6fdbaee29123aef6127d925e68dfdc
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Jul 12 21:11:34 2011 +0200

    s3-docs: Remove manpages for ldb tools.
    
    Fix bug #8297 (ldb tools man pages should be removed from the release tar
    ball).
    
    Thanks to Björn for reporting!
    
    Karolin
    (cherry picked from commit 73e6673078ef8477107cf94a9d53f3d2b42cb6d7)

commit 37401f50b1c0ad4575d36f6c51bd1a07c2502da0
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Jul 7 14:59:41 2011 -0700

    Fix bug #8293 - SMB2 doesn't rotate the log files often enough.
    
    Move the num_requests field out of the smb1 struct into the generic
    struct smbd_server_connection struct. Use it to count SMB2 requests
    as well as SMB1 and ensure that check_log_size() is called every 50
    SMB2 requests.
    (cherry picked from commit b7dbbe1005627932ab959144002f9d41adb04328)

commit cc23bb6b7674f89e8e87048a97bb2d81e989247c
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jul 8 17:17:17 2011 +0200

    s3-waf: split out LIBCLI_WINREG_INTERNAL as LIBCLI_WINREG was pulling in rpc server code in undesired places.
    
    Andreas, please check.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Fri Jul  8 18:34:44 CEST 2011 on sn-devel-104
    (cherry picked from commit f4add4fbf545313f5d24e0d9e5c9eb0f8fac630a)
    
    Conflicts:
    
    	source3/rpc_server/wscript_build
    	source3/wscript_build
    
    The last 21 patches address bug #8214 (printer driver upgrade fails, causing
    smbd to exit on startup).
    (cherry picked from commit 9a555e0271c333d1e33a9f2df435166aa8c6dfde)

commit a395d86d83d86e52b29fd0e10f5fc2f29e2d6ac6
Author: David Disseldorp <ddiss at suse.de>
Date:   Tue Jul 5 15:04:02 2011 +0200

    s3-printing: remove tdb migration invalid printer name checks
    
    WERR_INVALID_PRINTER_NAME only needed to be handled when printing tdb
    migration used spoolss, with winreg such errors are no longer possible.
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Thu Jul  7 19:15:34 CEST 2011 on sn-devel-104
    (cherry picked from commit e5955903fdc5ed6f8660b72db0716d4da25c711c)
    (cherry picked from commit 1822df19e764bce37a4b2c7e212a2bb0c61d1d13)

commit be923773f5f56c036decafee11b95d52656fe1fd
Author: David Disseldorp <ddiss at suse.de>
Date:   Tue Jul 5 11:34:47 2011 +0200

    s3-printing: fill info2_mask in printer migration
    
    Also fix possibly uninitialised status return from
    printing_tdb_migrate_printer().
    (cherry picked from commit 5dd8185d852afc3843253c9471326677f8816a77)
    (cherry picked from commit ec0c13d05962e0e3d92dee811667e2dc6bfa67fc)

commit 4110411f532f340569c4f4dc6aaf21190e409ff3
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jul 5 14:01:40 2011 +0200

    s3-printing: make sure to first migrate the printers then the security descriptor.
    
    Guenther
    
    Pair-Programmed-With: David Disseldorp <ddiss at suse.de>
    (cherry picked from commit cfc3b6e5f79f253e83dfbd13d47b671deb5801b3)
    (cherry picked from commit d967d1b9ac902cd750cc9c43ecce9481c444504b)

commit 0aec19d0181d02eb3ff6e0de7c603671014b4981
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jul 5 02:33:23 2011 +0200

    s3-printing: remove spoolss pipe from migration library, only using winreg finally.
    
    Guenther
    
    Pair-Programmed-With: David Disseldorp <ddiss at suse.de>
    (cherry picked from commit 57bbb32c64db1027e2b9ae1aef7f5f3b33ae3882)
    (cherry picked from commit 4fc35a5cc9db162a6df7b09e70686caaaa6c352c)

commit ab2f7354f7acadcc5c7c1fce418b40aafa7896f7
Author: Günther Deschner <gd at samba.org>
Date:   Mon Jul 4 19:47:07 2011 +0200

    s3-printing: use winreg interface for migration, instead of spoolss.
    
    Guenther
    
    Pair-Programmed-With: David Disseldorp <ddiss at suse.de>
    (cherry picked from commit 8f3d5f5333a61922c4ea7ff1e1d244978958e857)
    
    Conflicts:
    
    	source3/printing/nt_printing_migrate.c
    (cherry picked from commit 8ca35cd86041d197f3bf377cc0afabe5e2cd4ceb)

commit b30e29630db2dd7694292688406f05bc1d8acfe7
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jul 5 00:55:35 2011 +0200

    s3-printing: safe a ton of roundtrips by reusing existing winreg binding_handles.
    
    Guenther
    
    Pair-Programmed-With: David Disseldorp <ddiss at suse.de>
    (cherry picked from commit 72b1f8be5619ed778c4aa0b967f6a4f34d7e9de8)
    
    Conflicts:
    
    	source3/rpc_server/spoolss/srv_spoolss_nt.c
    (cherry picked from commit 5bab2244e5893ae6f470299b4efcabd54dc23fcc)

commit 9603b3c3c3b04e24dedba7ba48925f988f7b3ea7
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jul 5 00:16:03 2011 +0200

    s3-printing: use winreg_internal functions.
    
    Guenther
    
    Pair-Programmed-With: David Disseldorp <ddiss at suse.de>
    (cherry picked from commit 0a1ec73b965f66977a90fb7febb3b56b52ebab20)
    
    Conflicts:
    
    	source3/rpc_server/spoolss/srv_spoolss_nt.c
    (cherry picked from commit 7c0ab14cc21c47193e7198a01e5ae16052c8d0f9)

commit 27aa927a68227cf9ef2ed1b2f47b0e19b1228136
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jul 5 00:16:47 2011 +0200

    s3-printing: add winreg_internal functions.
    
    Guenther
    
    Pair-Programmed-With: David Disseldorp <ddiss at suse.de>
    (cherry picked from commit ada5380d2090179fc57eee66e2b46788f4944db0)
    
    Conflicts:
    
    	source3/rpc_server/spoolss/srv_spoolss_nt.c
    	source3/rpc_server/spoolss/srv_spoolss_util.c
    (cherry picked from commit 77ccfc6f41ca615911d49039046502fcf8e23cee)

commit d664c5869ed33ef7bd0b8cc476a13cd41f1e4b3a
Author: Günther Deschner <gd at samba.org>
Date:   Mon Jul 4 20:09:54 2011 +0200

    s3-printing: add winreg_printer_binding_handle and remove most of srv_spoolss_util.c.
    
    Guenther
    
    Pair-Programmed-With: David Disseldorp <ddiss at suse.de>
    (cherry picked from commit a762eda519c995214c041170e2615c5c51b2a2b1)
    
    Conflicts:
    
    	source3/rpc_server/spoolss/srv_spoolss_util.c
    (cherry picked from commit 6bc840366b9c421f742467ef337c8703a8d365ea)

commit 11e1e80b9c067b8350a3b1815f0a9cbddaa2fd63
Author: Günther Deschner <gd at samba.org>
Date:   Mon Jul 4 19:47:29 2011 +0200

    s3-printing: add rpc_client/cli_winreg_spoolss.c
    
    Guenther
    
    Pair-Programmed-With: David Disseldorp <ddiss at suse.de>
    (cherry picked from commit f2be8378b92669092f8444df038f769fc9312ff4)
    (cherry picked from commit 3c29f9b015809840aaf4de75186536f6f5e91bd9)

commit 1c8731f564934b97a403f3faea9ad94c149381f2
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jul 5 11:29:37 2011 +0200

    s3-waf: make LIBCLI_SPOOLSS a shared library
    
    Guenther
    
    Pair-Programmed-With: David Disseldorp <ddiss at suse.de>
    (cherry picked from commit a0fc64a88ee6f1f45d4c2b95d6773eccab50ebb4)
    (cherry picked from commit d53dbd8e66b45195c4879a4bb1b9a659b4bf4f99)

commit 28d730e63e59a2bd64fb22895ee0919332c0a971
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jul 5 02:15:35 2011 +0200

    s3-printing: move spoolss_create_default_devmode/secdesc to init_spoolss.h
    
    Guenther
    
    Pair-Programmed-With: David Disseldorp <ddiss at suse.de>
    (cherry picked from commit 43cf3a28dc539351da8a316e0e52a8292ec40cc7)
    (cherry picked from commit dd21eaa11c919935f959941aefbba454a272119b)

commit c028b22f8d1b678f333f3934594c8929b92a1f2d
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jul 5 02:12:24 2011 +0200

    s3-printing: move driver_info_ctr_to_info8 to init_spoolss.h
    
    Guenther
    
    Pair-Programmed-With: David Disseldorp <ddiss at suse.de>
    (cherry picked from commit 74e416031b2fc5d9c6af30f692d5b73cb1942cf4)
    (cherry picked from commit 2e86c3ffac47bdb43ddc0012d96bd4d489658774)

commit 96d340c751de0ae3c2b612f735abbcd3765846b1
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jul 5 01:24:48 2011 +0200

    s3-printing: move os2 related functions to printing/nt_printing_os2.c.
    
    Guenther
    
    Pair-Programmed-With: David Disseldorp <ddiss at suse.de>
    (cherry picked from commit dd5375b4a1798c856fa9c104baa36c137d664b9d)
    
    Conflicts:
    
    	source3/rpc_server/spoolss/srv_spoolss_util.c
    (cherry picked from commit b039a965488aba0e8d31abe0a389e6ddef99d8b9)

commit 097dd6b62b7de568a4149f382131d7c055b6c7d8
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jul 1 15:39:11 2011 +0200

    s3-printing: open up a winreg pipe handle for the migration code.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Mon Jul  4 15:06:41 CEST 2011 on sn-devel-104
    (cherry picked from commit ff94539f276bdef73bd12c67bff1f34e697ccbfc)
    (cherry picked from commit b1aca06b1823601a5942ead53ed66ca95bd3b8c4)

commit 25b8c5eaa99892e8847b410aa1c7bcf2ef9d4226
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jul 1 15:02:26 2011 +0200

    s3-net: use printing_migrate library, and eliminate duplicate code.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Fri Jul  1 17:57:09 CEST 2011 on sn-devel-104
    (cherry picked from commit bafd7212eb4c82e86874b2f80ddf5c04b2d180b9)
    
    Conflicts:
    
    	source3/utils/net_printing.c
    (cherry picked from commit 35de817734fec9dcb0197c20b9c308df2ac7dccc)

commit a65bf45c4112f7a004923bc7765261575cbe06fb
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jul 1 14:57:32 2011 +0200

    s3-printing: split out printing migration code into a smaller library.
    
    Guenther
    (cherry picked from commit e02abd6c83708f297b1985bb1bdc7d5dfbc924b2)
    
    Conflicts:
    
    	source3/printing/nt_printing_migrate.c
    	source3/wscript_build
    (cherry picked from commit cb1368f19148b30c515f0632fdeb32ef127fa0c7)

commit 0dc1ac903016ea456df02a2909395be640d7c155
Author: David Disseldorp <ddiss at suse.de>
Date:   Wed Jun 15 14:59:49 2011 +0200

    s3-printing: skip migration of non-existent printers
    
    Skip tdb migration of printer and security descriptor entries which
    refer to non-existent printers.
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Thu Jun 30 10:54:23 CEST 2011 on sn-devel-104
    (cherry picked from commit c9e3f6ab02bdc354a9b656f62744ee66fe9e9e67)
    (cherry picked from commit d24c4ef87ff02975cdb024e01b067107c60050cc)

commit 1da6fe27409388ecb96e3dce7268b44066e31401
Author: David Disseldorp <ddiss at suse.de>
Date:   Wed Jun 15 12:46:55 2011 +0200

    s3-printing: fill devicemode size in migrate_printer()
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    (cherry picked from commit a36ce0735ff6cad8124bd63a056a71d9495b238c)
    (cherry picked from commit 8245acab26a83a006d04626f15d5a47dcb71053e)

commit 6bf4143a0dedbf86ba693856084b36bb101ac9c7
Author: Günther Deschner <gd at samba.org>
Date:   Thu May 12 14:33:15 2011 +0200

    s3-waf: stop building smbtortre4.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Thu May 12 15:35:02 CEST 2011 on sn-devel-104
    (cherry picked from commit c1ac023b588e1ca676cbbf542ca6f93aa199ad32)
    (cherry picked from commit f1196b1edc30549d36cc1d8a66541d79a65f31ce)

commit 1f8ab1eadd244bbc5443b083c74c3fb931cb0e03
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Jul 5 20:39:53 2011 +0200

    WHATSNEW: Add changes since rc2.
    
    Karolin
    (cherry picked from commit 75785ccbf6d7f633837ae65b2deac0c9bf8cd858)

commit 32845e1f23c508d24d9deb900a8dabd559219a92
Author: Christian Ambach <ambi at samba.org>
Date:   Mon Jul 4 17:55:54 2011 +0200

    s3:smb2 fix smbd crash on premature end of smb2 conn (Bug 8286)
    
    when smbd tries to clean up locks after a premature end of a smb2
    connection, lock_db has already been freed and so it crashes
    
    this patch changes the order in which items are freed so that
    lock_db is still around when it is needed
    (cherry picked from commit 2c94ff10332f4be909a158329c41e2f5db035949)

commit 807cc2ced529ced8a40ff65f11b8748c9abb3761
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Jun 30 10:09:56 2011 +0200

    s3:nmbd_subnetdb: close all sockets attached to a subnet in close_subnet() (bug #8276)
    
    metze
    (cherry picked from commit 75e9f2110876137a57632d223248ac51dbfc4569)
    (cherry picked from commit 1c8690c82905ff55ed9eafd02df295edf79e7943)

commit 00836e62ae58ca687b2ad6ed509b9ca4bf1009c4
Author: Gregor Beck <gbeck at sernet.de>
Date:   Tue Jun 21 08:16:56 2011 +0200

    s3:smbldap: make smbldap_connect_system self contained
    
    The last patches address bug #8253 (winbindd panics if verify_idpool() fails).
    (cherry picked from commit c6d5c7cc830d59e7b6f0fa5a38eae27b0f1aa4bb)

commit 104a0e419d3f9c23e688e1b7d75e5d5fa9a55695
Author: Gregor Beck <gbeck at sernet.de>
Date:   Tue Jun 21 08:06:28 2011 +0200

    s3:smbldap: add a destructor to smbldap_state, just in case
    (cherry picked from commit 56bc5c73eaa7509d4e58ed010c834304b238c72c)

commit 410b9f1a1302abf7ce364c7c5d8a438a23999e5d
Author: Gregor Beck <gbeck at sernet.de>
Date:   Tue Jun 21 08:02:53 2011 +0200

    s3:smbldap: let smbldap_free_struct do what it claims to
    (cherry picked from commit 66e853875ec13481093bf79522004665fe66260d)

commit 9bd77d905ccd1140f7934430f96190ede87d3b56
Author: Gregor Beck <gbeck at sernet.de>
Date:   Tue Jun 21 08:00:59 2011 +0200

    s3:smbldap: free the idle event scheduled in smbldap_open in smbldap_close
    (cherry picked from commit 56e9ad4aa736875ac5666a9c3e33ae3d94fb2f5c)

commit 5300e26c97c2087b6a6c4f0605517480577aa27b
Author: Gregor Beck <gbeck at sernet.de>
Date:   Tue Jun 21 07:51:41 2011 +0200

    s3:smbldap: use smbldap_state as memory context for idle event
    
    ensure the event is canceled if the smbldap_state gets freed
    this fixes a panic of winbindd if verify_idpool fails
    (cherry picked from commit 119a45e9f8e4fdc17417a1b618094e3280add584)

commit 705451c05db8150cf760056aea29cccc6ab827bb
Author: Christian Ambach <ambi at samba.org>
Date:   Wed Jun 29 15:01:16 2011 +0200

    s3:smbd do not panic when CTDB is unhealthy (Bug #8278)
    
    when CTDB is unhealthy, log a message and exit cleanly
    instead of creating a core file
    
    Autobuild-User: Christian Ambach <ambi at samba.org>
    Autobuild-Date: Thu Jun 30 13:18:12 CEST 2011 on sn-devel-104
    (cherry picked from commit 847ca0a5d791d881be8d9a0721bf30399c80013b)
    (cherry picked from commit e282a816d45b750293c14fbd6de4569f7270107a)

commit 3a2c31f5c17e4676e0d7eaeab37e787783d0091f
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jun 30 15:15:22 2011 +0200

    s3:build: add vfs_examples to the everything target
    
    So that one can not pass autobuild without keeping the vfs examples intact.
    
    Autobuild-User: Michael Adam <obnox at samba.org>
    Autobuild-Date: Thu Jun 30 16:52:48 CEST 2011 on sn-devel-104
    
    The last 5 patches address bug #8281 (examples/VFS/* does not build).
    (cherry picked from commit f28ec1da9e51d53f4e93a23088a7c7c4ab2c109f)

commit 9c68a15b73d7b188086012dd6e23200af8b45d34
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jun 30 13:54:52 2011 +0200

    s3:build: add a vfs_examples target.
    (cherry picked from commit 737a1c9b96a4ba8d8688f4dba1df6d931e10e64d)

commit 0500907f6e69e37f510ded7a64580375b6020a4b
Author: Björn Baumbach <bb at sernet.de>
Date:   Wed Jun 29 16:57:27 2011 +0200

    examples/VFS: fix skel_transparent.c in reference to shadow_copy changes
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit d57a51093e526d7aac05f3d210ab7aee5e2036aa)

commit fd17a432ff307d74a8791867f32de5b016cc56c1
Author: Björn Baumbach <bb at sernet.de>
Date:   Wed Jun 29 16:56:45 2011 +0200

    examples/VFS: fix skel_opaque.c in reference to shadow_copy changes
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 180749b898c4491e04c2a11d4b39b2833e3602e6)

commit a2e3053a3c95b6de8a795602d8d8b9004664fb09
Author: Björn Baumbach <bb at sernet.de>
Date:   Wed Jun 29 16:53:57 2011 +0200

    examples/VFS: fix shadow_copy_test.c in reference to shadow_copy changes
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit e21d132cc98abe03247f91b27b098ec83b8d08e2)

commit 5b58467f29e2df578e6376568238f47002eaef6a
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jun 28 23:59:11 2011 +0200

    s3-winbind: Fix bug 7888 -- deal with buggy 3.0 based PDCs
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Thu Jun 30 00:42:23 CEST 2011 on sn-devel-104
    (cherry picked from commit 97055cee026b4f1b0e2730786a94390f6515593e)

commit 4c71aecabe32fa7bca1ce1e6d75762947b9c8e22
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Jun 29 09:56:47 2011 -0700

    Second part of fix for bug #8219 - SMB Panic from Windows 7 Client.
    
    Pass in the correct vector to the signing algorithm in an async
    response - we must start with vector[1] which has the SMB2_HDR_BODY
    length, not vector[0] which is the 4 byte packet length. Also
    note we're passing in 2 vectors not 3.
    
    Metze please review.
    (cherry picked from commit 4b094c2acdfe93fdce80adc6dc3df73cf2d3fae1)

commit 4d189bbb6495b98b0a2e99a20dea5ddb06e80dd7
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jun 28 17:45:49 2011 -0700

    Fix bug #8219 - SMB Panic from Windows 7 Client
    
    Caused by referencing an uninitialized variable in the
    duplicated struct smbd_smb2_request when sending a signed
    intermediate reply.
    (cherry picked from commit 501969a2b95b15fd9f8602b14a391e5096b17183)

commit de948736c1b7f5a33735fafc526dc0ebc7ba4ebf
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Jun 27 14:34:39 2011 +0200

    s3: explicitly pass domain_sid to wbint_LookupRids() (bug #7841)
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Mon Jun 27 18:21:30 CEST 2011 on sn-devel-104
    (cherry picked from commit 0a74caa473f491050bc5f64b6d6956c00088c5cd)
    (cherry picked from commit 44cfdd92e73d9ecb68b5a0ee1167f9e64c2aebeb)

commit 825e13bcf3215b69485afc3a154417ae0ad6a4ab
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Jun 16 12:47:22 2011 +0200

    s3:rpc_server/svcctl: fix valgrind bug in _svcctl_QueryServiceObjectSecurity()
    
    r->out.buffer needs to stay in its size, as it will be marshalled completely.
    As it's preallocated and initialized with zeros, we just need to copy
    the payload into it, even if it's smaller than the offered buffer size.
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Thu Jun 16 14:15:47 CEST 2011 on sn-devel-104
    (cherry picked from commit 67512152c007bb186e4fd8dac5d1aab89bce0689)
    
    The last 3 patches address bug #8264 (svcctl valgrind fixes).
    (cherry picked from commit 355ffd89e54dea15bf94b93f59c321109e951cad)

commit 22b392ab6eac0c8e2dcdefe2229410d7a00de7ed
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Jun 16 12:34:42 2011 +0200

    s3:rpc_server/svcctl: fix valgrind bugs in _svcctl_QueryServiceConfig2W()
    
    r->out.buffer needs to stay in its size, as it will be marshalled completely.
    As it's preallocated and initialized with zeros, we just need to copy
    the payload into it.
    
    If we always marshall the return buffer, we already have the needed
    buffer size and don't need to call ndr_size_* functions.
    
    metze
    (cherry picked from commit 11683ccf3e68606ecb1cdfa455f7921b119803c6)
    (cherry picked from commit 04b62ec0168e84c00fd08f0695b94ec5ca80ba88)

commit 410219be0346043a954a4a367a839941bb41330a
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Jun 16 08:33:09 2011 +0200

    s3:rpc_server/svcctl: don't allocate return values on a temporary stackframe
    
    And always initialize the whole return structure.
    
    This caused samba3.posix_s3.rpc.svcctl to be flakey.
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Thu Jun 16 11:34:34 CEST 2011 on sn-devel-104
    (cherry picked from commit 48de3e51eacbd1051f79dc99aaac8a4ec988fde5)
    (cherry picked from commit 7008fc0028993e98b335cf8533481073a5bd82df)

commit e84a0ffa93a117076f71c1558e3fbe2974147320
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Jun 23 15:06:16 2011 -0700

    Fix bug #8254 - "acl check permissions = no" does not work in all cases
    
    Move lp_acl_check_permissions() into can_delete_file_in_directory()
    where it makes sense. Remove ACL check when requesting DELETE_ACCESS
    when lp_acl_check_permissions is false.
    
    Thanks to John Janosik @ IBM for noticing this.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Fri Jun 24 01:18:11 CEST 2011 on sn-devel-104
    (cherry picked from commit 863548647dabca2c9706fbc48b4ae72277fc8c11)

commit d89076c06150fee77b0a5ae8a1ca4f6320be92b4
Author: Michael Adam <obnox at samba.org>
Date:   Fri Jun 24 16:40:17 2011 +0200

    s3:test: don't rely on pyhton being in /usr/bin/python in the sids2xids test
    
    "/usr/bin/env pyhton" should always work as long as pyhton is in the path.
    (cherry picked from commit d8d18fa66464b780818807a4fb50bf458158714a)

commit fb8a4c2e1b0ed9f149976a4abb712b9ef4c04074
Author: Michael Adam <obnox at samba.org>
Date:   Fri Jun 24 16:38:07 2011 +0200

    s3:test: fix the smbclient_s3 test on older systems
    
    mktemp requires precisely six Xs at the end of the template name
    (cherry picked from commit 0892313b4b1bdcab671e18db58d7758fe87a0efd)

commit ee38ae0db9a7c69c5aa26b754616e9c6aca65699
Author: Michael Adam <obnox at samba.org>
Date:   Fri Jun 24 16:37:20 2011 +0200

    s3:test: fix the net registry roundtrip test on older systems
    
    mktemp requires exactly Xs at the end of the template name on SLES8
    (cherry picked from commit aa2dd250abd392b9ce77d35af7d3f4827326559b)

commit a10029b854a7bfb536b9ed1cd0c4383f9ff8b3c0
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Jun 14 15:00:32 2011 +1000

    s3-autconf Move nmbd socket directory to PREFIX/var/nmbd
    
    This is consistent with the new ncalrpc socket directory, also added
    in this release.
    
    Andrew Bartlett
    
    Signed-off-by: Andrew Tridgell <tridge at samba.org>
    
    The last 2 patches address bug #8230 (Move .nmbd socket directory to non-hidden
    name PREFIX/var/nmbd).
    (cherry picked from commit 833fdb5b3693a7c9111bb98e5bc9a29d29be9d1d)

commit ec228328cbf9af0c347db92f72736c9a5850fbd5
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Jun 14 14:56:30 2011 +1000

    s3-buildoptions Show compiled-in location of the new ncaclrpc and nmbd sockets
    (cherry picked from commit c558775713e505cfc1db5af417cc7b792dfc310e)

commit 4c0cab5d60a5ad370cccd12564ff93d1d49a7728
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jun 7 15:21:34 2011 +0200

    s3:docs: fix the example in the idmap_autorid manpage to use "idmap config * : rangesize"
    (cherry picked from commit a2fa00e4ea6f3a99953f4ec3214d68a07223b910)

commit 49fdf848ac15e4337a386984c084b4d8d7204dd4
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Jun 24 13:37:16 2011 +0200

    s3:vfs_commit: fix build
    
    fix build
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User: Björn Jacke <bj at sernet.de>
    Autobuild-Date: Fri Jun 24 14:51:31 CEST 2011 on sn-devel-104
    (cherry picked from commit d4ea319e7ad9ee2fc2fad0c016845f820681569a)
    
    Fix bug #8262 (vfs_commit doesn't compile).
    (cherry picked from commit 45a6fa93c79ea7ec378dbdb1d9c6da019dc0545a)

commit e46161e283885c23a04592289e2a8d24bb755264
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Jun 24 08:54:02 2011 +0200

    s3:smb2_ioctl/FSCTL_PIPE_TRANSCEIVE: generate STATUS_BUFFER_OVERFLOW if needed (bug #8260)
    
    This should fix DCERPC responses with fragments larger than 1024 bytes.
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Fri Jun 24 11:25:36 CEST 2011 on sn-devel-104
    (cherry picked from commit 2bb325ad913c1cff88faab55102cef75d14c04a6)
    (cherry picked from commit 093ba63588022e3f9df81edc3393ef552e0f9825)

commit dbc561e64bd7d1320e7fc1ac6d2343f03cb9eb44
Author: Christian Ambach <ambi at samba.org>
Date:   Fri Jun 17 21:54:30 2011 +0200

    s3:modules fix Bug 8244 - Cannot copy files larger than 2 GB to Samba share
    
    the time_audit module uses int instead of uint64 as return value
    in get_alloc_size so that sizes of files larger than 2 GB are
    cut of leading to wrong replies to NtCreateAndX and Windows
    clients giving up
    
    While checking the types of all functions, I found two more wrong
    return value types that needed correction
    
    Autobuild-User: Christian Ambach <ambi at samba.org>
    Autobuild-Date: Fri Jun 17 23:11:10 CEST 2011 on sn-devel-104
    (cherry picked from commit bb66504dadf56366ea30697ae73673de3df08132)
    (cherry picked from commit 11008f1c73afdd86e7fa929fe37675c57ae2c32c)

commit 3eb24c4700e3049b4c6d153284e1e5e1a9c77506
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Jun 19 19:23:47 2011 +0200

    s3: Fix Coverity ID 2582: FORWARD_NULL
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Sun Jun 19 20:46:43 CEST 2011 on sn-devel-104
    (cherry picked from commit 5290faca7a5ae5f3f0309a42586768a5c93bfb9d)
    
    Fix bug #8247 (SMB2 shadow copy can be crashed remotely).
    (cherry picked from commit 8a7a3c6704d8f2c48c8fbc2ad1bddb5b67131b4c)

commit b48945b5c098710a2acbfdb269b3e92be4cc0873
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Jun 20 19:27:01 2011 +0200

    s3-spoolss: Fix some valgrind warnings.
    
    These are in/out values and need to be initialized.
    
    The last 2 patches address bug #8240 (valgrind warnings in winreg/spoolss
    code).
    (cherry picked from commit 229c7246823f3c156d065546b526f11d1298210e)

commit 1a548f747fd589220e0b718c91f84a24d5399da4
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Jun 20 15:39:36 2011 +0200

    s3-rpc_client: Fix some valgrind warnings.
    
    These are in/out values and need to be initialized.
    (cherry picked from commit 7bf1418e9cfe313ee4873853d2ee41ca344f8ee0)

commit 6902bdb2423dd0f39477017180908b16b1914bd2
Author: Michael Adam <obnox at samba.org>
Date:   Fri Jun 10 00:50:42 2011 +0200

    s3:idmap_autorid: remove redundant code
    
    The last 4 patches address bug #8213 (Fixes in idmap_autorid).
    (cherry picked from commit a1a1a58101319034ea437544313591cb0fd7e7f3)

commit 0ee9d73274206da9e4127a0ebe72ca205bc94177
Author: Michael Adam <obnox at samba.org>
Date:   Fri Jun 10 00:49:37 2011 +0200

    s3:idmap_autorid: in initialize, don't leak storedconfig to talloc_tos() in the success case
    (cherry picked from commit 496e472894c3fbd543fac88c0c2d304116d64ff8)

commit 4f16f9e10de15050119047732991f1fa40342cfe
Author: Michael Adam <obnox at samba.org>
Date:   Fri Jun 10 00:46:19 2011 +0200

    s3:idmap_autorid: use "idmap config * : rangesize" instead of "autorid : rangesize"
    (cherry picked from commit ea0b87a6e9857c27383ae3fac2c37c61427d31fc)

commit ccbcfbfb7e247dda020afbad969d33a3354d11f7
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jun 7 15:53:49 2011 +0200

    s3:idmap_autorid: fail initialization if the domain is not "*"
    
    autorid can only be used as a backend for the default idmap configuration.
    (cherry picked from commit 06c5f80ff079c39a3cea10f8a8fc3cc86e04c571)

commit 2718f63032510468560c116c68e604563b13bb40
Author: Gregor Beck <gbeck at sernet.de>
Date:   Tue May 31 18:26:12 2011 +0200

    s3:net-man: registry enumerate_recursive
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    
    Autobuild-User: Michael Adam <obnox at samba.org>
    Autobuild-Date: Wed Jun  1 17:16:05 CEST 2011 on sn-devel-104
    (cherry picked from commit 4b414fbdf8741f0eada3593c9f4f86fa86d363ef)

commit 0440703b3965ee2ddfbdc87837fbd7b528f2ed2c
Author: Gregor Beck <gbeck at sernet.de>
Date:   Tue May 31 18:25:53 2011 +0200

    s3:net-man: registry deletekey & deletekey_recursive
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 60dc766070bd04735cf33b27fb207a8107831257)

commit 98cdbdfc2454ff06bd2d626bff2b3bfeee12e33b
Author: Gregor Beck <gbeck at sernet.de>
Date:   Tue May 31 18:15:38 2011 +0200

    s3:net-man: missing dot
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit c890198f9635332525c22783ee72088fd8b0e8c8)

commit 56733bd6428ab4d3892ab65c4f6718b2095ca17f
Author: Michael Adam <obnox at samba.org>
Date:   Mon May 30 16:54:47 2011 +0200

    s3:net registry: polish output of net registry enumerate[_recursive]
    
    so that net registry enumerate output is as before, and
    net registry enumerate_recursive is formatted more nicely
    (cherry picked from commit 0d746f653e76de52985d543a15fd6ee3bf2f4823)
    
    Fix bug: #8193
    (cherry picked from commit 6c165c84e3482264d9bd6475cb6bc08ad170e268)

commit 15c3be24efd690d2bf925941bce5c89396d6b3a7
Author: Gregor Beck <gbeck at sernet.de>
Date:   Mon May 30 10:24:16 2011 +0200

    s3:net: registry: use recursive implementation for enumerate
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 5ec479fa0c9db4072541d46345164542d037cfc9)
    
    Fix bug: #8193
    (cherry picked from commit d4faa39a76c0c594683fdb6496edbc5f967b24a6)

commit c382a4edf83700cab9a129919cb1c31b825a6e7c
Author: Gregor Beck <gbeck at sernet.de>
Date:   Mon May 30 08:58:34 2011 +0200

    s3:net: registry: add new command enumerate_recursive
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 22011ddc9e72c8a201e3ca6e01745a68738d5916)
    
    Fix bug: #8193
    (cherry picked from commit 901544fcc736457f234c250850819cc2cf3fcc14)

commit 3726e18967aed844a23190393ff66e4589aafc49
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Jun 14 21:51:36 2011 +1000

    s3: improve WHATSNEW around kerberos changes
    (cherry picked from commit b08149c6b8ddcac1399808b1b96e1fc08d382318)

commit 035ba6f1a70b9bf7378dd150ad15d7bb77099e5e
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Jun 16 18:25:15 2011 +0200

    s3:wb_lookupsids: add some paranoia checks to wb_lookupsids_recv()
    
    This hopefully catches future bugs.
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Thu Jun 16 19:50:16 CEST 2011 on sn-devel-104
    (cherry picked from commit 5961852d9c0e5cf64cea988586d610af9d63d487)
    (cherry picked from commit df0a827e74096b295c7624278ca5f0b7b7e8d6e5)

commit ddd0a5772833b3ab0b5adbd6e79f9069c50f0e0f
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Jun 16 18:16:15 2011 +0200

    s3:wb_lookupsids: don't ignore 'result' and check if we got useable values
    
    The wrong fix for bug #8215 discovered this bug, as it caused
    sam_rids_to_names() to always return NT_STATUS_NONE_MAPPED.
    
    metze
    (cherry picked from commit 85809ccbe3a79f307af1fdd227f33b899d8db1b4)
    (cherry picked from commit e26fb591060b10880b25f6b0a4437f9c9052dab4)

commit d8c3819e50ce378ef352f3562a5c2256f5110c54
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Jun 16 18:40:04 2011 +0200

    Revert "s3-winbind: Fix paranoia checks in winbindd_samr.c."
    
    This reverts commit 207a84d725b905c2b119d2ef0f4f4d4eb391140d.
    
    This is the wrong fix for the problem, see bug #8215.
    
    metze
    (cherry picked from commit 283f8a7fb5089a7126f07e26315fd06ab59997d8)
    (cherry picked from commit 1269dec1b0121fcbf6dda36a385a4a510232124e)

commit d5ed016bc32b3c7cb35082b0e70a27614d3301e8
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Jun 15 02:34:53 2011 +0200

    s3:utils/net_*registry: use c99 initializers which are supported by old gcc 2.95 compilers (bug #8226)
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Wed Jun 15 03:48:41 CEST 2011 on sn-devel-104
    (cherry picked from commit 5d736d87778754de7043d902c7d1d5db1c46cb02)
    (cherry picked from commit df22e635f51d3423e8e8a810de57270b3c13edd3)

commit 4c6ce77e6c8ec9269a14a38831bd480660731455
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Jun 8 19:01:13 2011 +0200

    s3:libsmb/clireadwrite: calculate cli_write_max_bufsize() correct based on max_xmit
    
    This is important in order to support DCERPC over ncacn_np against NT4 servers,
    where max_xmit is just 4356.
    
    metze
    (cherry picked from commit f0ba1afe5f7dbafaf22c3028864de0f3910f675f)
    
    The last 14 patches address the generic part of bug #8195
    (rpc client code doesn't work against NT4, when we need to fragment requests).
    (cherry picked from commit 4a9a11c0398692fe103597c8694867d6b6184134)

commit 64c10ec9db05c9ed9748a39584cf1b01f0bfb951
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Jun 8 18:59:39 2011 +0200

    s3:libsmb/clireadwrite: calculate cli_read_max_bufsize() correct based on max_xmit
    
    This is important in order to support DCERPC over ncacn_np against NT4 servers,
    where max_xmit is just 4356.
    
    metze
    (cherry picked from commit 73128b7cc7f536f80072a19cb69527c53d9a6c2f)
    (cherry picked from commit 01448363c55ea890c7c6733213681cb3c4165fc3)

commit 0c77030e3a23311c7c10560605c7150d08683521
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Jun 9 11:57:55 2011 +0200

    s3:libsmb/clitrans: correctly transfer the seqnum between secondary and primary requests
    
    This is needed to implement SMB signing correct.
    
    metze
    (cherry picked from commit 5d06b2197b5fd95aaf0394d1bdba957bac6c3570)
    (cherry picked from commit ed31c08d2aa59ec81dbcc747cfe7f0d42f9d9e3b)

commit 9d4264be7b22a1cc9a06d3a8db683e1b09e25b37
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Jun 8 10:31:23 2011 +0200

    s3:libsmb/clitrans: fix handling of multi pdu [nt]trans[s][2] calls
    
    We now keep the primary request open for the whole logical request.
    The primary request is the one that gets all incoming replies.
    While secondary requests are handled as separate one-way requests.
    
    metze
    (cherry picked from commit 1dd24ac06a7472f53b06bc0aaa54cb22c8da0f78)
    (cherry picked from commit fa1ff15b19df1e0cf2a2616bdcb28554a8e2458b)

commit abdc6f2f598a5d3531c05ba2d83d70021aa3a00d
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Jun 8 16:41:11 2011 +0200

    s3:libsmb/clitrans: use subreq2 as variable for the secondary requests
    
    metze
    (cherry picked from commit 10bb088cf1e005fd047c09afcf6b5b8999d416fe)
    (cherry picked from commit 09da3b1fa685973619c833cc14e375abf859b5c1)

commit ac0b57fb9b3b3e9a7ff618a6c13ead27a800c62e
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Jun 8 16:11:00 2011 +0200

    s3:libsmb/clitrans: move MID handling to the end of cli_trans_send() and add a comment
    
    metze
    (cherry picked from commit 5146c9ba9df063d6611abe356f9262adb027b091)
    (cherry picked from commit 036c8b736852d002e0806f5c36b698c19b42ec98)

commit 75a4f63937c9249bbcc0c06230d0b9d27a76ae0a
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Jun 8 00:44:34 2011 +0200

    s3:libsmb/clitrans: correctly marshall [nt]trans[s][2] requests
    
    We need to align params and data to 4 byte offsets.
    
    This also correctly recalculates the useable space after each step.
    
    metze
    (cherry picked from commit 0a8fd50bd806e925a915c74cb86733481b2144f6)
    (cherry picked from commit da5870b0073ad2a8b3f1bd3957551283a5f0da33)

commit cd77368b083516179c287de5426777220f862c96
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Jun 9 12:22:59 2011 +0200

    s3:libsmb/clitrans: marshall SMBnttrans[2] as the others
    
    This is just to make the code more readable
    and easier to notice how many words we're using in vwv.
    
    metze
    (cherry picked from commit 6f7af1b0388d30c8a06c495713066b90ded00780)
    (cherry picked from commit 6e3eefad3a265e7417ab9393fe8fc276523efd8a)

commit c72aec93f4ff162c70fea93a02603ec3c653f688
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Jun 8 17:08:00 2011 +0200

    s3:libsmb/clitrans: use uint32_t for param and data variables
    
    SMBnttrans uses 32-bit values there.
    
    metze
    (cherry picked from commit 428a86c92b5b35e28c7d6921f2999616cdc1bc20)
    (cherry picked from commit 0440d3cb3585ceb636d7945c10d1a2b269401312)

commit 55bbc869d1d6614c6e593a95b7b3d438d7115921
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Jun 8 00:37:24 2011 +0200

    s3:libsmb/clitrans: remove unused secondary_request_ctx
    
    metze
    (cherry picked from commit 2ae565b681a6307886b888ee5b576c12916eb0db)
    (cherry picked from commit c5434b570d44c8292792c8c4874414bf33c25c4d)

commit 2d3ec59c25c0c9ac5e6693702d8f231b6b89ad4e
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Jun 9 11:49:48 2011 +0200

    s3:libsmb/async_smb: add helpers to get and set the seqnum for signing
    
    This will be used for correct signing in [nt]trans[2][s] requests.
    
    metze
    (cherry picked from commit 3dd1ebd21ee99d130f6dd30326ddafe3f00a50d0)
    (cherry picked from commit bad85df320f05215d85f5f25c15a5ddda84755f3)

commit a846cac44dbe67ed88042b5b5e2385ffee167bd2
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Jun 8 10:20:25 2011 +0200

    s3:libsmb/async_smb: don't remove pending requests if the mid is set
    
    If the mid was set explicitly, it means the request expects more than
    one reply, so leave it in the pending array.
    
    metze
    (cherry picked from commit a25936f1b1300a76b08a6bd435bd7ccc388279d5)
    (cherry picked from commit 60932bc009aa1ed0a8895fc1f62a6e461765a7da)

commit 98154a3638fa37e97cf58c0ee5c8b2957d0c5b7b
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Jun 8 14:14:24 2011 +0200

    s3:libsmb/async_smb: call cli_smb_req_unset_pending() instead of destructor directly
    
    metze
    (cherry picked from commit 173fc258e443d97e4ea37f2bee99c21ad15ab484)
    (cherry picked from commit 43f383b60b5581f7e4e5b547ed1a67afe48f4df0)

commit 89ad32e24d19c5baf3ddda24f52768c453c130b2
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Jun 8 00:40:54 2011 +0200

    s3:libsmb/async_smb: let cli_smb_recv() initialize output values for one way requests
    
    metze
    (cherry picked from commit 49cdf171a5198495aead9ace43963e805331e20b)
    (cherry picked from commit 956bbf76ce5b251d7ea07a7d2ee58c90e174db1b)

commit babaa7498217f8cb7369acd6745fb86388c9c0d4
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Jun 7 18:49:55 2011 +0200

    s3:libsmb/cli_np_tstream: s/TSTREAM_CLI_NP_BUF_SIZE/TSTREAM_CLI_NP_MAX_BUF_SIZE
    
    This isn't the fixed buffer size anymore, as we use dynamic beffer
    it's just the maximum size.
    
    metze
    (cherry picked from commit 957cfd23e1781e342edde07fc01dbec279088afa)
    
    The last 3 patches address bug #8195 (rpc client code doesn't work against NT4,
    when we need to fragment requests).
    (cherry picked from commit 2dec07d94d9616501ce84c53896179c764949f93)

commit 56cdf40e3e2bf827bdd412a544a06bbd328ff93d
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Jun 7 18:45:54 2011 +0200

    s3:libsmb:cli_np_tstream: use dynamic talloc buffers
    
    Having 8192 bytes on an idle connection is a bit to much,
    so we better use dynamic buffers using talloc, which also
    avoids a memcpy in the common SMBtrans readv codepath.
    
    metze
    (cherry picked from commit ad1cf187fdbcd726c6c74085308784fe4ecca883)
    (cherry picked from commit b13df1f6b987148d6743703929b9112cb25e2338)

commit 4e82537543eb7691e02c1207b0290ac541519432
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Jun 7 18:27:41 2011 +0200

    s3:libsmb/cli_np_tstream: use larger buffers to avoid a bug NT4 servers (bug #8195)
    
    NT4 servers return NT_STATUS_PIPE_BUSY if we try a SMBtrans
    and the SMBwriteX before hasn't transmited the whole DCERPC fragment.
    
    W2K and above is happy with that.
    
    As a result we try to match the behavior of Windows and older Samba clients,
    they use write and read buffers of 4280 bytes instead of 1024 bytes.
    On Windows only the SMBtrans based read uses 1024 (while we also use 4280
    there).
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Tue Jun  7 20:25:32 CEST 2011 on sn-devel-104
    (cherry picked from commit c3ac298a1fe4f5cada6d09376e2d4a3df271a093)
    (cherry picked from commit a64603f6633d61036fc6a7e626a4738cfe413b52)

commit 12f6e4bc9853c84d0e6bce205e6e0560da3ec0aa
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jun 13 00:07:29 2011 +0200

    s3:librpc/ndr/util.h: add license/copyright header and inclusion guard
    
    The last patches fix bug #8196 (Many (newer) header files don't have copyright /
    GPL header comments).
    (cherry picked from commit ea2b9ca7d7bacccfcec28a57689fe18d33469c09)

commit 32df25a645d257446d2dbd325898c2f835b91426
Author: Michael Adam <obnox at samba.org>
Date:   Sat Jun 11 00:20:57 2011 +0200

    s3:registry/reg_parse_internal.c: add copyright information
    (cherry picked from commit 8d3242ecdca4e3b4a3ed4ada76b57e702106c5cc)

commit 7e4116742ffe9f3c32c712dbd05cd97142a54942
Author: Michael Adam <obnox at samba.org>
Date:   Sat Jun 11 00:20:32 2011 +0200

    s3:registry/reg_parse_internal.h: add copyright information
    (cherry picked from commit 8e41d9e29ba0d62105beacda976962d4f24150ed)

commit d1bb923fe6abbb41bbc9cff2d95dee9848f45147
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:08:17 2011 +0200

    source3/rpc_client/util_netlogon.h: fix licence/copyright
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Fri Jun 10 16:27:24 CEST 2011 on sn-devel-104
    (cherry picked from commit cd16a1be9371448532be7362d3e5d3f2a1ae3df3)
    (cherry picked from commit 223ac5611f320c5941406b1af0daab1ee31cc965)

commit 425eb3a8aff511aef5f550f900b8acc0a172d791
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:08:07 2011 +0200

    source3/rpc_client/init_spoolss.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit 4942aeb9b562f3621cbe6adc8e79366887f0d4b9)
    (cherry picked from commit e21b603935e0b9a92bcda8d6fb79c9afd8b8e418)

commit 6a434b47bc012cefbe5f69513535388b70deb1ca
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:07:57 2011 +0200

    source3/rpc_client/init_samr.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit 054e54e881eeab18387ae6e94cf04ecf205ebe64)
    (cherry picked from commit c36af8aee8dfef03ab916faeb8e7f34970ddf537)

commit 8c586ece131a030e3c0b5adf8371950abbbbd978
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:07:48 2011 +0200

    source3/rpc_client/init_netlogon.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit f3ca8ff2bfb61cfa4b9ce2e4be93653f7b309351)
    (cherry picked from commit 5a46867ac156bbfd964cc2f61d5fc38cf779b963)

commit 101d95bd57241f9c863b187073425cfe292a2a7b
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:07:39 2011 +0200

    source3/rpc_client/init_lsa.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit 9284036ce17b569c1f2203362eacd99ebc362af6)
    (cherry picked from commit bb3bdb2bb68de1c0767c366f35fb272a4b81569c)

commit 806c54c159b95aa9ece40f953f64b9705defe69a
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:07:27 2011 +0200

    source3/rpc_client/cli_spoolss.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit b95b1813b9ab53b9490d8b37af4f6ced7fea7bdb)
    (cherry picked from commit e7026828be5943a846ee2d1ce396016acc7463ba)

commit 7ad21c034543dbba2d275bf68799cd19f1918a38
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:07:16 2011 +0200

    source3/rpc_client/cli_netlogon.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit 2d10c48259ec234ae110c60405a9da5e720302cb)
    (cherry picked from commit 166ab6b8f0f21b72d7d867a0d6c9d8cbb5d25dec)

commit 7fc754b5efdcf3a7da81724a93afd6ba8fc0eb5b
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:07:03 2011 +0200

    source3/printing/pcap.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit ef5bcb6e23093086e1450833745b7e5b7b5d46ee)
    (cherry picked from commit cd8c579ac696c91ee8d26e774d8340697da87f09)

commit 4de154979a74f151ed3167d36eddd94fb2562a3a
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:06:49 2011 +0200

    source3/printing/load.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit 942b2d5baf4347c796d823ad72754c302b38cdca)
    (cherry picked from commit 0b6188f6ca3d1f203d3b96eff45f2dd5aba3afcf)

commit a2188174841dd1ab0f85ed68dce8acfe198023fc
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:06:36 2011 +0200

    source3/libsmb/proto.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit ed10726abca2194d21ea5174c2ff2cda79db499e)
    (cherry picked from commit 8a7b04560893f11eae14d7e6920843cf4b78685a)

commit fde7758aeb0c24eac3783819b541a8f57503e681
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:06:27 2011 +0200

    source3/libsmb/nmblib.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit 005930411ccbb2793023d2a4d29bdb536d822aba)
    (cherry picked from commit 7f9deab80c4140a5f60d292ba0e706eaf0fd61df)

commit 03e3d2c177a9cf4b6752d655ede2146186776c17
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:06:17 2011 +0200

    source3/libsmb/libsmb.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit 81b5d8538a00181af814e98af83718ef5f413868)
    (cherry picked from commit 2cba14c0ae1e315e8167b9d406b472995111d233)

commit 773394c425d2fbb7b8f239313f443d4cd80f0048
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:06:07 2011 +0200

    source3/libsmb/errormap_wbc.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit c1058ad47607c089ba630b21df1f6b72a24a861c)
    (cherry picked from commit db27eca4cce52eaba787e48f22974dc78ca813c7)

commit 7ec67489dbc151037a7feff87f636d45c7db7dca
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:05:57 2011 +0200

    source3/libsmb/clidgram.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit 1e9f2bdb2f7f9e809dd3044dc94018e0b5b6e8d3)
    (cherry picked from commit 13fd0465d9a463003e26d7c1e7fa015dfb88fc4d)

commit 02bab2661744470d8758205b1bcc50d581368b54
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:05:47 2011 +0200

    source3/libnet/libnet_join.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit 81f269211a80c17a33ec9f05c7847dd29b8c4251)
    (cherry picked from commit 694a4ad14ea60a45978ea203815c47b2cd0b0aee)

commit 605b3606704a633e405741d364bd6aac53cef6b0
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:05:37 2011 +0200

    source3/libads/ldap_schema.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit 183835d05515b5b437bbeff5ff7685a4f08415ad)
    (cherry picked from commit 1bcd966ed1316ae94db05a0de0370670dd30ad41)

commit 04ae046bdd4b9db9b616e6ac6dffb066f63770e0
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:05:27 2011 +0200

    source3/libads/cldap.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit 59e878ff625989d4d2e04ea017f92d29a40f4c44)
    (cherry picked from commit 8c48a805d0ba1b7c5b06dacfcd2f0ca8c641cc64)

commit 76f310c5bf0f43656d2f1464c2de79dd55929b87
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:05:18 2011 +0200

    source3/libads/ads_status.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit d5c5aa1c5fcc0e3c74cf1216cce7a8c767a6df2a)
    (cherry picked from commit 59b7746d45b54bb7104f02b22ebb7f4951271b42)

commit 972d2ceaf98e622abf6c27d749c5d29a20c4f66c
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:05:09 2011 +0200

    source3/libads/ads_ldap_protos.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit f2d4252dfa790b65031fe3221afe89d0e285ebd7)
    (cherry picked from commit b589dcb6fc7249694d76c36b2988fe42ec9f6e85)

commit 9583db7139990edbf3953a45c2ce94c0f5b39c70
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:04:59 2011 +0200

    source3/lib/privileges.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit 5672d83b23e89f716300940126bef0a738aa3599)
    (cherry picked from commit de5a6d0c6617a6306958a1c8ab3b37a6c547d933)

commit 0e2ba3ed249e719adbf6e478012a150cad02ffe2
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:04:48 2011 +0200

    source3/lib/netapi/libnetapi.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit 387ddc2c295e92363c83dcd29353cdd4c56984ab)
    (cherry picked from commit e1e0d228b64589ab3324d28782f8e5424fd7e572)

commit 8336557287e477d3a63c48481c4309d5fac709c3
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:04:36 2011 +0200

    source3/intl/lang_tdb.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit 3ec4966942dc468cfd6e32bf221d4427cc6aba86)
    (cherry picked from commit c1376d940fd9db0d69fdb049bd2356d852c77a4a)

commit 3ec16489ecff6cf343c0eb99640e3048fd204c44
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:04:26 2011 +0200

    source3/include/smb_ldap.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit e14b60c7ee6a76c444f12b8987740602c7b5f1d3)
    (cherry picked from commit 5abff6867f8cc9856c81deffe7dbf38ee4e277eb)

commit 027d033e59fe0b2a8483dba36d162810138cc047
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:04:16 2011 +0200

    source3/include/smb_krb5.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit 769f8793cff7d336ab04442208039f87147388bd)
    (cherry picked from commit 7f7913531cd37ab1dac9c2b8dbf1ac83d3129735)

commit a96e80aae802182a63726cc806eb29962ebdd1ba
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:04:05 2011 +0200

    source3/include/mangle.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit d357b5ce2a1eeead19760ecfad8c7d2bbf9e7622)
    (cherry picked from commit be6e87a5f58ee9341332d48b2def45c4dd8ce0aa)

commit 36492c867d353f47f8ccfca3a5b0d992de01be68
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:03:55 2011 +0200

    source3/include/krb5_protos.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit ef84a5b2aafa7c90c2aaff82006a69dec485d2ab)
    (cherry picked from commit ce2e6c24140c31ec2a6398868c36f5129ec0bc99)

commit 4e1993c3c8b7094a120fd4c1a5c0400bdb7b6791
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:03:43 2011 +0200

    source3/include/krb5_env.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit 0d7581b22b76774a1ef58a7eeb71df9c5bd69943)
    (cherry picked from commit dddb41627da880a872ed26cb3d91486c37d36736)

commit d182f017ab734f69489f0fda352100c04b2a3dbf
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:03:31 2011 +0200

    nsswitch/winbind_client.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit 850460c96c6337695dae8e601d4e1aa9d676f32d)
    (cherry picked from commit 22c72ef13b5aff1d60a478257c438f6a1752af0f)

commit 4a568f5c4f6092f3ad3eac32405bb9a09c777092
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:02:47 2011 +0200

    nsswitch/pam_winbind.h: fix licence/copyright.
    
    Guenther
    (cherry picked from commit acf9ca5f8f9942a94e06d59cf6759837d9e4171a)
    (cherry picked from commit a345094a6bd48a9800688ebd46e5c0f175899e3e)

commit 4c7a5dd71ebc2646966e10448c23e8bc34f44719
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:02:38 2011 +0200

    librpc/ndr/ndr_table.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit 768ed8b98517d0146317fd409ccaede3e53942ef)
    (cherry picked from commit e1caa9acde163ff5844dd907453ea5a8357d1213)

commit 555da0384cf7aaa60450413224b0477d92af8611
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:02:26 2011 +0200

    librpc/ndr/ndr_spoolss_buf.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit 8b75b65b36f79a4d94b11d3fc599d3c884a335e0)
    (cherry picked from commit eea146db63c9bfdcfb1df0a01684c5736e24e93c)

commit 7b16cb25e913b6230156d6ac269beb56c1c82953
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:02:16 2011 +0200

    librpc/ndr/ndr_dns.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit 4dadee3adf4deb212f14c0a574dc0e91baa6589a)
    (cherry picked from commit e7df23090b0088a69edd25c95456a4a739585868)

commit 6b231124c6ebd7c71da9a31458407b7e4a53b553
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:02:06 2011 +0200

    librpc/ndr/ndr_compression.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit e9e2f3034e8771b36cfbd19a661724a6039eaca4)
    (cherry picked from commit e8612ae4a6f811840f9781929c0e6e689f39c248)

commit d16872c8ab9c1df230802575d232a744c5f0bb6e
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:01:56 2011 +0200

    librpc/ndr/ndr_backupkey.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit cfa1507610992b4a3caeb6d35b16ccecf7b86939)
    (cherry picked from commit c24e122730dfccd23b1eb25a1147da6b3fc9d85c)

commit 4343e9faaaff2d7e7f5fdbe4f84d29c9086047a6
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:01:38 2011 +0200

    libds/common/flag_mapping.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit 76f0bf61efb8bd2a1d32a5d150f592f6fb72962c)
    (cherry picked from commit 2a800cba519c9b3331663a8e46f10d77696febb4)

commit a8893daa7e334fcd14f94d1d996d5d15eebd5b15
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:01:27 2011 +0200

    libcli/smbreadline/smbreadline.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit faf73c72af6a3f66fda7dee3cc2ae9b69b472586)
    (cherry picked from commit b072da942370d640f486bc916736779cff2f1540)

commit edb338aaa43c19e31d90fac5d891bb8da2ac6c37
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:01:03 2011 +0200

    libcli/nbt/nbt_proto.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit d41519f99e784f934e025f6d982e9ed681a4adc7)
    (cherry picked from commit 4802e605a89612ffc183fca8dd86405aa2ed22c3)

commit 1be9c1c6a4f2866b7087c0ea558765e910d8c46f
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:00:48 2011 +0200

    libcli/ldap/ldap_ndr.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit 218273841cd4180dbdb662e84d2337eaa03cea7d)
    (cherry picked from commit 6922e32498a92d476885303e1b617340f2fc2d69)

commit 084007f83dbf4a0d2171314ee0feed963ea2cb25
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:00:32 2011 +0200

    libcli/auth/msrpc_parse.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit f04b673aba26404fbf2c19eb57262fd1d9f3fd9d)
    (cherry picked from commit 592aaaff4b38618a324e27e1336db0eb5f058396)

commit 7ffb73307de1bd601a7db15df8876e0a7f82ae6c
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 15:00:10 2011 +0200

    lib/util/wrap_xattr.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit d228fc35f38b77877f0fd07b415df87d4ccdb812)
    (cherry picked from commit 50ba4af1d34692235387e9eed3d14effcf74754a)

commit 5c25db1ea7047f084085104f5f46b9cce7c67154
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 14:59:58 2011 +0200

    lib/util/util_tdb.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit eaa400216570403e67f7f06db509ce90fba02c13)
    (cherry picked from commit 2bd94a7079be9ef2134316e9d99cb4b882f2f466)

commit 10a0cf60deb934b61f0911c8402646050b0efa40
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 14:59:48 2011 +0200

    lib/util/util_ldb.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit 4fe4487cd9391cac813ab94d7002eac6dc722f4c)
    (cherry picked from commit 3f0333d1d13780f83f3fdba296d0f6d7cc756d2a)

commit df24dd2f3fff488bc694d18077eae794e1a4eba7
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 14:59:35 2011 +0200

    lib/util/time.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit 74610109ac3140713140038d10df644024796907)
    (cherry picked from commit 3475b7222b2e291be93facecff878ff9f699b875)

commit 13dd28ac7b606ebb620acd25523bf7fa8d1423d9
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 14:59:23 2011 +0200

    lib/util/data_blob.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit a602cb2a0a0bc19121232444117486d8286e0af9)
    (cherry picked from commit f0a78248e9fb383dcaa9902f3184edfe0ef9eda2)

commit 4b86417b16568d8be54b23d39df24bfb3b8fb176
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jun 10 14:56:50 2011 +0200

    auth/auth_sam_reply.h: fix licence/copyright
    
    Guenther
    (cherry picked from commit 9211f232aa597ccb5802df24c57f3eb03904ec04)
    (cherry picked from commit bc899884babedcb8f1793e84363378c7c7e8d645)

commit 57012d31963afb46e56b5a64c23550016232cb85
Author: Michael Adam <obnox at samba.org>
Date:   Tue May 31 14:32:40 2011 +0200

    s3:passdb: add GPL/copyright header to machine_sid.h (cherry picked from commit c0fc7aa129c25664c76b3fdb4b9150c63fe3dd70)
    (cherry picked from commit 47e78003507f14c9d104fa089dc1b28e45c42ee1)

commit f22a39c8fc2f1501e8cc613765d0676cb22ecf51
Author: Michael Adam <obnox at samba.org>
Date:   Tue May 31 13:30:34 2011 +0200

    s3:nmbd: add _NMBD_NMBD_H_ guard to nmbd.h (cherry picked from commit fdd225c3e41ed5a81ef02d39ac037818bde49c03)
    (cherry picked from commit 7aeb6d8ffd19d58d5a0bcc7c1c700641a60d2066)

commit 3b022ed5cf32d8eae4864c2abaf59a4e38afd5ee
Author: Michael Adam <obnox at samba.org>
Date:   Tue May 31 13:29:34 2011 +0200

    s3:nmbd: add GPL/Copyright header to nmbd.h (cherry picked from commit 75cfafd69864fccacd1e6c3ca8d27b42a48dbe1c)
    (cherry picked from commit 17567a592f16fe30afb7e8e252c95103ee2d67bb)

commit 82ac48ca55f0a3970930608c676d8cbcddce6ae3
Author: Michael Adam <obnox at samba.org>
Date:   Tue May 31 13:25:34 2011 +0200

    s3:rpc_server: add _RPC_SERVER_SRV_ACCESS_CHECK_H_ guard to srv_access_check.h (cherry picked from commit e40331552137f513c6c2404d96adcf421212ec86)
    (cherry picked from commit 290352d3a706f8d30df927cbb9293e3c50d91200)

commit a684c396473d288c640c04a0d247ea1577c6e401
Author: Michael Adam <obnox at samba.org>
Date:   Tue May 31 13:24:24 2011 +0200

    s3:rpc_server: add GPL/Copyright header to rpc_server/srv_access_check.h (cherry picked from commit 942ae874b85570f44b3257c8d229792ede7f8fd9)
    (cherry picked from commit b39087cbdf6cd6a7d7ceef1272ea56d22969df03)

commit db558ff4197a0bd51743ea9551202c767f282ca2
Author: Michael Adam <obnox at samba.org>
Date:   Tue May 31 13:19:52 2011 +0200

    s3: add _LIB_IDMAP_CACHE_H_ guard to lib/idmap_cache.h (cherry picked from commit c2887f060954bd0e77bc6f3ac8fedec38e26c168)
    (cherry picked from commit 6c837effd131aef1bdd1c1273e441244c003dd12)

commit 97ce696f7a9cb5a9eb4a6b92322d3ccae6045e28
Author: Michael Adam <obnox at samba.org>
Date:   Tue May 31 13:18:51 2011 +0200

    s3: add GPL/Copyright header to lib/idmap_cache.h (cherry picked from commit 2b8803d458465508d0f4299248d858b9c393323e)
    (cherry picked from commit addf5ff8503f57c0e815b47346d62484c8029f1e)

commit 752a69e2c07f29113a87fed4fc54715afd79f111
Author: Michael Adam <obnox at samba.org>
Date:   Tue May 31 07:32:15 2011 +0200

    s3:lib/eventlog/proto.h: add _LIB_EVENTLOG_PROTO_H_ guard (cherry picked from commit 36feb8a240a7f061e25223364c1f7ca8476a029f)
    (cherry picked from commit ee0bc9e8d1bed88b20c945bf21a032181cf8f1bc)

commit 74a62988cf5dfd3be8e5cad05aacf7396a4c4926
Author: Michael Adam <obnox at samba.org>
Date:   Tue May 31 07:31:14 2011 +0200

    s3:lib/eventlog/proto.h: add GPL/Copyright header (cherry picked from commit 00530e3d0166641a4f9716067e3c5d1146b0db17)
    (cherry picked from commit 93891332630601b51e07da922a8c06224a7c0840)

commit 9724ddd821c0280ba39fdef7c7dd0e740d0a511e
Author: Michael Adam <obnox at samba.org>
Date:   Tue May 31 00:45:57 2011 +0200

    s3:libgpo/gpo_proto.h: add _LIBGPO_GPO_PROTO_H_ guard (cherry picked from commit 6ef8122cba3566d4ed177612066cbbe1b8684677)
    (cherry picked from commit c833668e0a1044faf4d0f9326f6c206c28c7f8b3)

commit adbc584c0a627fbf194329c96ea6d879cc42cf4f
Author: Michael Adam <obnox at samba.org>
Date:   Tue May 31 00:45:06 2011 +0200

    s3:libgpo/gpo_proto.h: add GPL/Copyright header (cherry picked from commit 59950faddc898ea97171d2eac5759314cc1cbeb9)
    (cherry picked from commit 8347a0475956cec29a16e47ff05f6cf40b986336)

commit 2044a63b94b6f5fa2e69d499af3c3b859fba83ef
Author: Michael Adam <obnox at samba.org>
Date:   Tue May 31 00:39:09 2011 +0200

    s3:libads/kerberos_proto.h: add _LIBADS_KERBEROS_PROTO_H_ guard (cherry picked from commit 4c542015a1a36a230a1a5b6f4ba6b643494e1185)
    (cherry picked from commit dffdec55a0c188c9e7cfa8862b02bee23b6f27ba)

commit bc7db2564d11bca295830d348cb8d6936caca3be
Author: Michael Adam <obnox at samba.org>
Date:   Tue May 31 00:38:18 2011 +0200

    s3:libads/kerberos_proto.h: add GPL/Copyright header (cherry picked from commit 6bf3228f2850b2960276f683e51ccfd6c952a62d)
    (cherry picked from commit b21ebf9dc92b6d07f2147950e7d18c8ad406d8cf)

commit 462df48dd955d53df76669d4d055c463273e9ae8
Author: Michael Adam <obnox at samba.org>
Date:   Tue May 31 00:34:17 2011 +0200

    s3:libads/ads_proto.h: add _LIBADS_ADS_PROTO_H_ guard (cherry picked from commit eb5db22771d1c700f881f879b98ae08c69d2203b)
    (cherry picked from commit aa1f48dba19d75fcbcd3ff145d9810c014ec7d3d)

commit 6d7421b24efe5405a88d6394881f2bf4614243e2
Author: Michael Adam <obnox at samba.org>
Date:   Tue May 31 00:33:13 2011 +0200

    s3:libads/ads_proto.h: add GPL/Copyright header (cherry picked from commit 6e9c055ce28d66be76957dc0bde87655190bc622)
    (cherry picked from commit a8fce72987aa707d04e991d4ff509ece32e604cc)

commit ad939a02cb746b6e2e5cf95f8360db4dbc2107eb
Author: Michael Adam <obnox at samba.org>
Date:   Tue May 31 00:29:17 2011 +0200

    s3:nmbd/nmbd_proto.h: add GPL/Copyright header (cherry picked from commit d8f269feefc3891c01788d5c74cf0954702c6022)
    (cherry picked from commit 5c7a01f246a19faeb3db5eb88543b11f04ee07c0)

commit f8ab3f939d1bb0a3ef21059782fcb515a37427b4
Author: Michael Adam <obnox at samba.org>
Date:   Tue May 31 00:25:05 2011 +0200

    s3:winbindd/idmap_proto.h: add _WINBINDD_IDMAP_PROTO_H_ guard (cherry picked from commit b88d80a97572a9d7730830f09b25a7d6dc655653)
    (cherry picked from commit a9a64b9af3a5c2506df50511123b1786c7ced24f)

commit 5e2911397a60356057151e03e5dfb27ecf303510
Author: Michael Adam <obnox at samba.org>
Date:   Tue May 31 00:23:46 2011 +0200

    s3:winbindd/idmap_proto.h: add GPL/Copyright header (cherry picked from commit 88078c856976ebcad68251129ddc0556663dcf9c)
    (cherry picked from commit 9f5c52d4b216261275764d90a030dbc724eab22e)

commit 2b24c1af1325dd1f3331056fe14b354273605185
Author: Michael Adam <obnox at samba.org>
Date:   Tue May 31 00:19:22 2011 +0200

    s3:groupdb/proto.h: add _GROUPDB_PROTO_H_ guard (cherry picked from commit 447f0d356b4cef3e8501923d040146e782022d44)
    (cherry picked from commit 7bd3a59f7d3e69c9185c2c5fc00ff3ac51e06331)

commit 36e49b211832f166a1d135ccd3a079a536e29260
Author: Michael Adam <obnox at samba.org>
Date:   Tue May 31 00:18:26 2011 +0200

    s3:groupdb/proto.h: add GPL/Copyright header (cherry picked from commit f2cbced75e33c5467672b8eb5c9bc2fc82a2f7da)
    (cherry picked from commit 7182ce8b116152027fc58018f642e0fec72a454a)

commit 7da2adb33d17064b00e4f83f03754ce1f7061d37
Author: Michael Adam <obnox at samba.org>
Date:   Tue May 31 00:13:15 2011 +0200

    s3:smbd/proto.h: add _SMBD_PROTO_H_ guard (cherry picked from commit 2e6f8f7bdadd4b6e8b8c9ff2adf3dc1275c50430)
    (cherry picked from commit 618559feef0ff2a73427b120f685468c35df8f7a)

commit 35b84382ae66c87414dc697cd21a9d921216d820
Author: Michael Adam <obnox at samba.org>
Date:   Tue May 31 00:12:27 2011 +0200

    s3:smbd/proto.h: add GPL/Copyright header (cherry picked from commit e1bad49f3e6490ac7ff28b7bf8ddb8fb1447c7bd)
    (cherry picked from commit 72377abf4fc0eaa3d8b52737e29e052698024eca)

commit ac55574a515ae454c98bf66ee7d5e97d81b76465
Author: Michael Adam <obnox at samba.org>
Date:   Tue May 31 00:10:29 2011 +0200

    s3:locking/proto.h: add _LOCKING_PROTO_H_ guard (cherry picked from commit ff82f77796f0d867089962f7970efbe53c51289d)
    (cherry picked from commit 4f47d4f76401da5b0e140d51ca41e890b8887692)

commit 3434896a49df27216972bc3c49014ad89e049191
Author: Michael Adam <obnox at samba.org>
Date:   Tue May 31 00:09:28 2011 +0200

    s3:locking/proto.h: add GPL/Copyright header (cherry picked from commit 93b8e90b5beb5704807834bb710f3b4f303ba5a8)
    (cherry picked from commit 7bcf99d6ec58190cf84368fdc5a3848579c0783d)

commit 194b254e2635fc954d7bd12cf14c67d13b855355
Author: Michael Adam <obnox at samba.org>
Date:   Mon May 30 23:57:23 2011 +0200

    s3:auth/proto.h: add _AUTH_PROTO_H_ guard (cherry picked from commit 9cc1410718ae16bd30a7aa24878901dd70c19f75)
    
    Conflicts:
    
    	source3/auth/proto.h
    (cherry picked from commit 9737915cc21bcd1c4b84e9688efb0959cd0876ec)

commit 3046fa5eaba45289242cf9ad2b6643058e8a26db
Author: Michael Adam <obnox at samba.org>
Date:   Mon May 30 23:54:36 2011 +0200

    s3:auth/proto.h: add GPL/Copyright header (cherry picked from commit 1b7077204d30c4151662cf2f4547bf22baaae6fe)
    (cherry picked from commit 931956476be2ececdede9dc4d50ec79dd701882b)

commit da52536aafe3db58723e198cdc856b2ca62f4359
Author: Michael Adam <obnox at samba.org>
Date:   Mon May 30 23:42:02 2011 +0200

    s3:passdb/proto.h: add _PASSDB_PROTO_H_ guard (cherry picked from commit 7d40c88695173e93606546e895731f66b87381d2)
    (cherry picked from commit 316e6c3734091a417f2ce6bfc939e287681d77f8)

commit a1f2a71478b785d6eadb588294ac3acd57179ba1
Author: Michael Adam <obnox at samba.org>
Date:   Mon May 30 23:38:13 2011 +0200

    s3:passdb/proto.h: add GPL/copyright comment header (cherry picked from commit b3cbcd0eda4fdb993acc63c8cb6923feea067a7d)
    (cherry picked from commit df756b54410dcb34340d20147a463e029562d361)

commit ec9917fceaa3d7e18933c9e28a8da84dc45de9ba
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Jun 14 08:27:34 2011 +0200

    s3:smbd/quotas: add #include "system/filesys.h" (bug #8224)
    
    This should fix the build on FreeBSD
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Tue Jun 14 09:38:49 CEST 2011 on sn-devel-104
    (cherry picked from commit 8096b1a9a4b1518467e7a85bb9000904a76c1ac4)
    (cherry picked from commit 85529729dd0fa9283d891b41fa36b1cc3c33147e)

commit 095e9c66559f7c859b6749f7bd7ff3cb50f329d7
Author: Christian Ambach <ambi at samba.org>
Date:   Tue Jun 14 09:09:07 2011 +0200

    s3-utils: fix crash in net cache get
    
    free the blob correctly
    
    Autobuild-User: Christian Ambach <ambi at samba.org>
    Autobuild-Date: Tue Jun 14 12:01:59 CEST 2011 on sn-devel-104
    (cherry picked from commit 7639684f273e33e2b7f26660b3ec9d3f9979c5a7)
    
    Fix bug #8231 (crash in net cache get).
    (cherry picked from commit b843d0eb5112e6bd4290100f28639ec3644d6944)

commit b492e4ee06795e0fe3ec112362a9a44abf1d68bb
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Jun 13 20:29:17 2011 +1000

    Remove Samba4-specific documentation from the 3.6 release tree
    
    The last 2 patches address bug #8221 (Remove top level waf configure and
    Makefile and Samba4 documentation).
    (cherry picked from commit 43805498205ee10cfba670c170ea5d3b0e08e7bd)

commit aaa57b5be08de4e9bcd496ce3c4f9231fc0c29e6
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Jun 13 20:27:59 2011 +1000

    Remove Makefile and configure for top level build in v3-6-test
    
    This will avoid confusion about which to use in this release.
    
    Andrew Bartlett
    (cherry picked from commit e97d7dc5bda0b233919ba22df129afae2fa32cf1)

commit 639c3e93b4a9154744d015cd3b77da1b19784a85
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Sat Jun 11 13:49:29 2011 +1000

    s3-param Mark 'time offset' as deprecated
    
    Andrew Bartlett
    (cherry picked from commit d0bb41a66008e12baa0a6c5800f0db5ff9134fc4)

commit 1318661966f3cef3f7198b7f6700a26a567cfde8
Author: Michael Adam <obnox at samba.org>
Date:   Fri Jun 10 13:51:06 2011 +0200

    s3:net conf addshare: do not stat-check the share path.
    
    Allow paths with % macros and paths that do not (yet...) exist.
    
    Fix bug #8217 (net conf addshare should not stat the share path).
    (cherry picked from commit 88ed4b9fbd2d517a3e589c104f8f3662ccdd0043)

commit dfcc2fb96386f3207d11d315e5247eeb107d9ccd
Author: Herb Lewis <hlewis at panasas.com>
Date:   Thu Jun 9 23:17:11 2011 -0700

    bug in source3/winbindd/winbindd_sids_to_xids.c
    
    I'm having trouble getting my system setup to do submits right now but
    I discovered a bug in the subject file that causes winbindd lookup sids
    command to assign incorrect unix ids. The change to sid_peek_rid fixes
    the case where you call lookup sids with sids s1 s2 s3 which cause them
    to be cached. then call with s1 s2 s4 and s4 will get the unix id of s1.
    
    The other change fixes the case where a sid that was not translated
    gets a value returned instead of being listed as unmapped.
    
    Could someone review this and push to master and 3.6 for me?
    
    Fix bug #8216 (winbind returns wrong results with sids2xids).
    (cherry picked from commit bad9f4781133583811420768ebcea9a28597cb7a)

commit 5b7c9465c895e393092abe287110384bc45e511f
Author: Andreas Schneider <asn at samba.org>
Date:   Fri May 20 15:42:46 2011 +0200

    s3-winbind: Fix paranoia checks in winbindd_samr.c.
    
    This fixes looking up the correct unix user instead of allocation a new
    uid and creating it.
    
    Fix bug #8215 (winbind unix username lookup doesn't work correctly).
    (cherry picked from commit 531edfdd1924bfb2ef486820f7f5787098bd953a)

commit 593576899e682b04f979b1e9b8125e67d3f5f95e
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jun 7 11:54:35 2011 -0700

    Fix re-opened bug 8083 - "inherit owner = yes" doesn't interact correctly with vfs_acl_xattr or vfs_acl_tdb module.
    
    Fix incorrect interaction when all of
    
    "inherit permissions = yes"
    "inherit acls = yes"
    "inherit owner = yes"
    
    are set. Found by Björn Jacke. Thanks Björn !
    (cherry picked from commit 4d47e12865ec5bb117e3d992522900a4c6fc84d3)

commit 794f0bd4cf60d5acab96b49124060abb4db64ab2
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Jun 8 14:38:09 2011 -0700

    Part 5 of bugfix for #8211 - "inherit owner = yes" doesn't interact correctly with "inherit permissions = yes" and POSIX ACLs
    
    Ensure when creating a directory, if we make any changes due to inheritance parameters, we update the stat returned.
    (cherry picked from commit 9994cca22b2c4948c7948f4d83dc3e8efbbd121e)

commit 814103b0b91d0332199e63f64c18454fa658e102
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Jun 8 14:26:30 2011 -0700

    Part 4 of bugfix for #8211 - "inherit owner = yes" doesn't interact correctly with "inherit permissions = yes" and POSIX ACLs
    
    We don't need to check mode bits as well as dev/ino to
    ensure we're in the same place.
    (cherry picked from commit 10489d903a4a6c7566787808b4e00ee0fcee7d70)

commit 2b24d7a92e5bfa171c7e776fcf15c5eec66d5427
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jun 7 16:55:20 2011 -0700

    Part 3 of bugfix for #8211 - "inherit owner = yes" doesn't interact correctly with "inherit permissions = yes" and POSIX ACLs
    
    When changing ownership on a new file make sure we
    must have a valid stat struct before making the inheritance
    calls (as they may look at it), and if we make changes we
    must have a valid stat struct after them.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Wed Jun  8 03:07:04 CEST 2011 on sn-devel-104
    (cherry picked from commit 5fb27814ad5566b264acf0f014d1721afc39b176)
    (cherry picked from commit 1e0c7438074bf0e76d34ea5aac70d5f55d2b364a)

commit 568111cd4b831e649ab310af519344a3a95deb75
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Jun 8 12:54:33 2011 -0700

    Part 2 of bugfix for #8211 - "inherit owner = yes" doesn't interact correctly with "inherit permissions = yes" and POSIX ACLs
    
    When changing ownership on a new file make sure we
    also change the returned stat struct to have the correct uid.
    (cherry picked from commit 282b09692d23253dd6c3808e1a96de84073ba4e2)

-----------------------------------------------------------------------

Summary of changes:
 Makefile                                           |   75 -
 WHATSNEW.txt                                       |  115 +-
 WHATSNEW4.txt                                      |  141 -
 auth/auth_sam_reply.h                              |   22 +
 configure                                          |   14 -
 configure.developer                                |    6 -
 docs-xml/manpages-3/idmap_autorid.8.xml            |    2 +-
 docs-xml/manpages-3/ldb.3.xml                      |  265 --
 docs-xml/manpages-3/ldbadd.1.xml                   |  108 -
 docs-xml/manpages-3/ldbdel.1.xml                   |  108 -
 docs-xml/manpages-3/ldbedit.1.xml                  |  203 -
 docs-xml/manpages-3/ldbmodify.1.xml                |   96 -
 docs-xml/manpages-3/ldbrename.1.xml                |  110 -
 docs-xml/manpages-3/ldbsearch.1.xml                |  122 -
 docs-xml/manpages-3/net.8.xml                      |   17 +-
 docs-xml/smbdotconf/misc/timeoffset.xml            |    4 +-
 examples/VFS/shadow_copy_test.c                    |   13 +-
 examples/VFS/skel_opaque.c                         |    3 +-
 examples/VFS/skel_transparent.c                    |    3 +-
 howto-ol-backend-s4.txt                            |  131 -
 howto4.txt                                         |    7 -
 lib/util/data_blob.h                               |    5 +-
 lib/util/time.h                                    |    7 +-
 lib/util/util_ldb.h                                |   23 +
 lib/util/util_tdb.h                                |   21 +
 lib/util/wrap_xattr.h                              |   21 +
 libcli/auth/msrpc_parse.h                          |   21 +
 libcli/ldap/ldap_ndr.h                             |   22 +
 libcli/nbt/nbt_proto.h                             |   21 +
 libcli/smbreadline/smbreadline.h                   |   20 +
 libds/common/flag_mapping.h                        |   22 +
 librpc/ndr/ndr_backupkey.h                         |   21 +
 librpc/ndr/ndr_compression.h                       |   22 +
 librpc/ndr/ndr_dns.h                               |   25 +
 librpc/ndr/ndr_spoolss_buf.h                       |   23 +
 librpc/ndr/ndr_table.h                             |   22 +
 nsswitch/pam_winbind.h                             |   48 +
 nsswitch/winbind_client.h                          |   29 +
 prog_guide4.txt                                    |  777 ----
 release-scripts/create-tarball                     |   26 +-
 source3/Makefile.in                                |   21 +-
 source3/VERSION                                    |    2 +-
 source3/auth/auth_server.c                         |   15 +-
 source3/auth/pass_check.c                          |    4 +-
 source3/auth/proto.h                               |   36 +
 source3/client/clitar.c                            |    2 +-
 source3/groupdb/proto.h                            |   27 +
 source3/include/async_smb.h                        |    2 +
 source3/include/krb5_env.h                         |   24 +
 source3/include/krb5_protos.h                      |   31 +-
 source3/include/mangle.h                           |   19 +
 source3/include/nt_printing.h                      |   12 -
 source3/include/proto.h                            |   14 +-
 source3/include/smb.h                              |    1 +
 source3/include/smb_krb5.h                         |   22 +
 source3/include/smb_ldap.h                         |   22 +
 source3/intl/lang_tdb.h                            |   23 +
 source3/lib/afs.c                                  |   12 +-
 source3/lib/afs_settoken.c                         |    2 +
 source3/lib/charcnv.c                              |    2 +-
 source3/lib/eventlog/proto.h                       |   27 +
 source3/lib/idmap_cache.h                          |   25 +
 source3/lib/ms_fnmatch.c                           |    2 +-
 source3/lib/netapi/libnetapi.h                     |   19 +
 source3/lib/privileges.h                           |   27 +
 source3/lib/sharesec.c                             |   10 +-
 source3/lib/smbldap.c                              |   34 +-
 source3/lib/username.c                             |    4 +-
 source3/lib/util_str.c                             |    8 +-
 source3/lib/util_unistr.c                          |   60 +-
 source3/libads/ads_ldap_protos.h                   |   28 +
 source3/libads/ads_proto.h                         |   36 +
 source3/libads/ads_status.h                        |   22 +
 source3/libads/cldap.h                             |   27 +
 source3/libads/kerberos_proto.h                    |   34 +
 source3/libads/ldap_schema.h                       |   25 +
 source3/libgpo/gpo_proto.h                         |   24 +
 source3/libnet/libnet_join.h                       |   25 +
 source3/librpc/idl/wbint.idl                       |    1 +
 source3/librpc/ndr/util.h                          |   25 +
 source3/libsmb/async_smb.c                         |   51 +-
 source3/libsmb/cli_np_tstream.c                    |   66 +-
 source3/libsmb/clidgram.h                          |   26 +
 source3/libsmb/clireadwrite.c                      |   33 +-
 source3/libsmb/clitrans.c                          |  227 +-
 source3/libsmb/errormap_wbc.h                      |   26 +
 source3/libsmb/libsmb.h                            |    5 +
 source3/libsmb/nmblib.h                            |   27 +
 source3/libsmb/proto.h                             |    8 +
 source3/libsmb/unexpected.c                        |    2 +-
 source3/locking/brlock.c                           |  145 +-
 source3/locking/proto.h                            |   26 +
 source3/m4/check_path.m4                           |    4 +-
 source3/modules/vfs_acl_common.c                   |   21 +-
 source3/modules/vfs_afsacl.c                       |    4 +
 source3/modules/vfs_commit.c                       |    1 +
 source3/modules/vfs_time_audit.c                   |    6 +-
 source3/nmbd/nmbd.h                                |   25 +
 source3/nmbd/nmbd_proto.h                          |   25 +
 source3/nmbd/nmbd_subnetdb.c                       |   14 +-
 source3/param/loadparm.c                           |    8 +-
 source3/passdb/machine_sid.h                       |   21 +
 source3/passdb/passdb.c                            |    8 +-
 source3/passdb/proto.h                             |   40 +
 source3/printing/load.h                            |   24 +
 source3/printing/nt_printing.c                     |  443 +--
 source3/printing/nt_printing_ads.c                 |   20 +-
 source3/printing/nt_printing_migrate.c             |  482 +--
 source3/printing/nt_printing_migrate.h             |   21 +-
 source3/printing/nt_printing_migrate_internal.c    |  255 ++
 ...ng_migrate.h => nt_printing_migrate_internal.h} |    6 +-
 source3/printing/nt_printing_os2.c                 |  165 +
 .../{nt_printing_migrate.h => nt_printing_os2.h}   |   12 +-
 source3/printing/pcap.h                            |   15 +
 source3/printing/spoolssd.c                        |    2 +-
 source3/registry/reg_parse_internal.c              |    7 +-
 source3/registry/reg_parse_internal.h              |    7 +-
 source3/rpc_client/cli_netlogon.h                  |   26 +
 source3/rpc_client/cli_spoolss.h                   |   29 +
 source3/rpc_client/cli_winreg.c                    |   22 +-
 .../cli_winreg_spoolss.c}                          |  294 +-
 .../cli_winreg_spoolss.h}                          |  118 +-
 source3/rpc_client/init_lsa.h                      |   24 +
 source3/rpc_client/init_netlogon.h                 |   24 +
 source3/rpc_client/init_samr.h                     |   23 +
 source3/rpc_client/init_spoolss.c                  |  264 ++
 source3/rpc_client/init_spoolss.h                  |   31 +
 source3/rpc_client/util_netlogon.h                 |   24 +
 source3/rpc_server/dcesrv_gssapi.c                 |    6 +-
 source3/rpc_server/rpc_ep_setup.c                  |    2 +-
 source3/rpc_server/spoolss/srv_spoolss_nt.c        |  388 +-
 source3/rpc_server/spoolss/srv_spoolss_util.c      | 4369 ++------------------
 source3/rpc_server/spoolss/srv_spoolss_util.h      |  687 +---
 source3/rpc_server/srv_access_check.h              |   34 +
 source3/rpc_server/srvsvc/srv_srvsvc_nt.c          |    4 +-
 source3/rpc_server/svcctl/srv_svcctl_nt.c          |   24 +-
 source3/rpc_server/wscript_build                   |    6 +-
 source3/script/mkbuildoptions.awk                  |    2 +
 .../script/tests/test_net_registry_roundtrip.sh    |    2 +-
 source3/script/tests/test_smbclient_s3.sh          |    2 +-
 source3/script/tests/test_wbinfo_sids2xids_int.py  |    2 +-
 source3/smbd/fake_file.c                           |   13 +
 source3/smbd/file_access.c                         |    5 +
 source3/smbd/globals.h                             |    8 +-
 source3/smbd/mangle_hash.c                         |    6 +-
 source3/smbd/mangle_hash2.c                        |   12 +-
 source3/smbd/msdfs.c                               |   30 +
 source3/smbd/open.c                                |  152 +-
 source3/smbd/process.c                             |    4 +-
 source3/smbd/proto.h                               |   49 +
 source3/smbd/quotas.c                              |    1 +
 source3/smbd/reply.c                               |    4 +-
 source3/smbd/server.c                              |    9 +
 source3/smbd/server_exit.c                         |    6 +-
 source3/smbd/service.c                             |   36 +-
 source3/smbd/smb2_create.c                         |    7 +-
 source3/smbd/smb2_ioctl.c                          |   10 +
 source3/smbd/smb2_read.c                           |    5 +
 source3/smbd/smb2_server.c                         |  157 +-
 source3/smbd/smb2_tcon.c                           |    2 +-
 source3/smbd/uid.c                                 |   11 +-
 source3/utils/net_afs.c                            |    7 +-
 source3/utils/net_cache.c                          |    2 +-
 source3/utils/net_conf.c                           |   17 -
 source3/utils/net_printing.c                       |  446 +--
 source3/utils/net_registry.c                       |  143 +-
 source3/utils/net_rpc_registry.c                   |    4 +-
 source3/web/cgi.c                                  |   29 +-
 source3/web/statuspage.c                           |    7 +
 source3/web/swat.c                                 |  175 +-
 source3/web/swat_proto.h                           |    6 +
 source3/winbindd/idmap_autorid.c                   |   19 +-
 source3/winbindd/idmap_proto.h                     |   29 +
 source3/winbindd/wb_lookupsids.c                   |   72 +-
 source3/winbindd/winbindd_dual_srv.c               |    5 +-
 source3/winbindd/winbindd_lookuprids.c             |   12 +-
 source3/winbindd/winbindd_pam.c                    |   26 +-
 source3/winbindd/winbindd_sids_to_xids.c           |    5 +-
 source3/wscript_build                              |   34 +-
 upgrading-samba4.txt                               |   18 -
 180 files changed, 4602 insertions(+), 9163 deletions(-)
 delete mode 100644 Makefile
 delete mode 100644 WHATSNEW4.txt
 delete mode 100755 configure
 delete mode 100755 configure.developer
 delete mode 100644 docs-xml/manpages-3/ldb.3.xml
 delete mode 100644 docs-xml/manpages-3/ldbadd.1.xml
 delete mode 100644 docs-xml/manpages-3/ldbdel.1.xml
 delete mode 100644 docs-xml/manpages-3/ldbedit.1.xml
 delete mode 100644 docs-xml/manpages-3/ldbmodify.1.xml
 delete mode 100644 docs-xml/manpages-3/ldbrename.1.xml
 delete mode 100644 docs-xml/manpages-3/ldbsearch.1.xml
 delete mode 100644 howto-ol-backend-s4.txt
 delete mode 100644 howto4.txt
 delete mode 100644 prog_guide4.txt
 create mode 100644 source3/printing/nt_printing_migrate_internal.c
 copy source3/printing/{nt_printing_migrate.h => nt_printing_migrate_internal.h} (87%)
 create mode 100644 source3/printing/nt_printing_os2.c
 copy source3/printing/{nt_printing_migrate.h => nt_printing_os2.h} (74%)
 copy source3/{rpc_server/spoolss/srv_spoolss_util.c => rpc_client/cli_winreg_spoolss.c} (93%)
 copy source3/{rpc_server/spoolss/srv_spoolss_util.h => rpc_client/cli_winreg_spoolss.h} (81%)
 delete mode 100644 upgrading-samba4.txt


Changeset truncated at 500 lines:

diff --git a/Makefile b/Makefile
deleted file mode 100644
index cbbf045..0000000
--- a/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-# simple makefile wrapper to run waf
-
-WAF_BINARY=./buildtools/bin/waf
-WAF=WAF_MAKE=1 $(WAF_BINARY)
-
-all:
-	$(WAF) build
-
-install:
-	$(WAF) install
-
-uninstall:
-	$(WAF) uninstall
-
-test:
-	$(WAF) test $(TEST_OPTIONS)
-
-help:
-	@echo NOTE: to run extended waf options use $(WAF_BINARY) or modify your PATH
-	$(WAF) --help
-
-subunit-test:
-	$(WAF) test --filtered-subunit $(TEST_OPTIONS)
-
-testenv:
-	$(WAF) test --testenv $(TEST_OPTIONS)
-
-quicktest:
-	$(WAF) test --quick $(TEST_OPTIONS)
-
-dist:
-	touch .tmplock
-	WAFLOCK=.tmplock $(WAF) dist
-
-distcheck:
-	touch .tmplock
-	WAFLOCK=.tmplock $(WAF) distcheck
-
-clean:
-	$(WAF) clean
-
-distclean:
-	$(WAF) distclean
-
-reconfigure: configure
-	$(WAF) reconfigure
-
-show_waf_options:
-	$(WAF) --help
-
-# some compatibility make targets
-everything: all
-
-testsuite: all
-
-check: test
-
-torture: all
-
-# this should do an install as well, once install is finished
-installcheck: test
-
-etags:
-	$(WAF) etags
-
-ctags:
-	$(WAF) ctags
-
-# this allows for things like "make bin/smbtorture"
-bin/%:: FORCE
-	$(WAF) --targets=`basename $@`
-FORCE:
-
-pydoctor:
-	$(WAF) pydoctor
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index c3c514c..ec5d863 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,10 +1,10 @@
                    ================================
-                   Release Notes for Samba 3.6.0rc2
-                            June 7, 2011
+                   Release Notes for Samba 3.6.0rc3
+                            July , 2011
                    ================================
 
 
-This is the second release candidate of Samba 3.6.0.  This is *not*
+This is the third release candidate of Samba 3.6.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/.
@@ -30,15 +30,16 @@ released in-kernel CIFS client.  To re-enable the poorer NTLM encryption
 set '--option=clientusentlmv2auth=no' on your smbclient command line, or
 set 'client ntlmv2 auth = no' in your smb.conf
 
-The impact of 'client use spnego principal = no' is that we may be able
-to use Kerberos to communicate with a server less often in smbclient,
-winbind and other Samba client tools.  We may fall back to NTLMSSP in
-more situations where we would previously rely on the insecure
-indication from the 'NegProt' CIFS packet.  This mostly occursed when
-connecting to a name alias not recorded as a servicePrincipalName for
-the server.  This indication is not available from Windows 2008 or later
-in any case, and is not used by modern Windows clients, so this makes
-Samba's behaviour consistent with other clients and against all servers.
+The impact of 'client use spnego principal = no' is that Samba will
+use CIFS/hostname to obtain a kerberos ticket, acting more like
+Windows when using Kerberos against a CIFS server in smbclient,
+winbind and other Samba client tools.  This will change which servers
+we will successfully negotiate kerberos connections to.  This is due
+to Samba no longer trusting a server-provided hint which is not
+available from Windows 2008 or later.  For correct operation with all
+clients, all aliases for a server should be recorded as a as a
+servicePrincipalName on the server's record in AD.  (For this reason,
+this behavior change and parameter was also made in Samba 3.5.9)
 
 The impact of 'send spnego principal = no' is to match Windows 2008 and
 not to send this principal, making existing clients give more consistent
@@ -252,7 +253,95 @@ o   Andreas Schneider <asn at samba.org>
     * Add an Endpoint Mapper daemon.
 
 
-Changes since 3.6.0rc1
+Changes since 3.6.0rc2
+----------------------
+
+o   Michael Adam <obnox at samba.org>
+    * BUG 8213: Fixes in idmap_autorid.
+    * BUG 8217: Do not stat-check the share path in 'net conf addshare'.
+    * BUG 8281: Fix build of examples/VFS/*.
+
+
+o   Jeremy Allison <jra at samba.org>
+    * BUG 8083: Fix "inherit owner = yes" with vfs_acl_xattr or vfs_acl_tdb
+      module.
+    * BUG 8211: Fix "inherit owner = yes" when "inherit permissions = yes"
+      is set.
+    * BUG 8219: Fix SMB Panic from Windows 7 client.
+    * BUG 8254: Fix "acl check permissions = no".
+    * BUG 8293: Fix log file rotating in SMB2.
+    * BUG 8304: Fix uninitialized variable in error path.
+    * BUG 8307: brl_close_fnum does not call SMB_VFS_BRL_UNLOCK_WINDOWS on all
+      locks.
+    * BUG 8310: toupper_ascii() is broken on big-endian systems.
+    * BUG 8314: Fix smbd crash with unknown user.
+
+
+o   Christian Ambach <ambi at samba.org>
+    * BUG 8231: Fix crash bug in 'net cache get'.
+    * BUG 8244: Fix copying files larger than 2 GB to a Samba share.
+    * BUG 8263: Fix build with --with-fake-kaserver or --with-vfs-afsacl.
+    * BUG 8278: Fix smbd panic when CTDB is unhealthy.
+    * BUG 8286: Fix smbd crash on premature end of smb2 conn.
+
+
+o   Andrew Bartlett <abartlet at samba.org>
+    * BUG 8230: Move .nmbd socket directory to non-hidden name PREFIX/var/nmbd.
+    * Mark 'time offset' parameter as deprecated.
+
+
+o   Gregor Beck <gbeck at sernet.de>
+    * BUG 8193: Add new command 'enumerate_recursive'.
+    * BUG 8253: Fix Winbind panic if verify_idpool() fails.
+
+
+o   Kai Blin <kai at samba.org>
+    * BUG 8289: Fix possible XSS attack (CVE-2011-2694).
+    * BUG 8290: Fix Cross-Site Request Forgery in SWAT (CVE-2011-2522).
+
+
+o   Günther Deschner <gd at samba.org>
+    * BUG 7888: Deal with buggy 3.0 based PDCs.
+    * BUG 8214: Fix smbd crash on printer driver upgrade.
+    * BUG 8235: Fix smbd crash on startup caused by migrate_printer().
+
+
+o   Björn Jacke <bj at sernet.de>
+    * BUG 8262: Fix build of vfs_commit.
+
+
+o   Günter Kukkukk <linux at kukkukk.com>
+    * BUG 8305: Fix segfault in nmbd when using 'smbtree ...'..
+
+
+o   Volker Lendecke <vl at samba.org>
+    * BUG 7841: Explicitly pass domain_sid to wbint_LookupRids().
+    * BUG 8102: Do not allow to change file ACLs from normal domusers.
+    * BUG 8247: Fix Coverity ID 2582: FORWARD_NULL.
+
+
+o   Herb Lewis <hlewis at panasas.com>
+    * BUG 8216: Make Winbind returning correct results with 'sids2xids'.
+
+
+o   Stefan Metzmacher <metze at samba.org>
+    * BUG 8102: Do not allow to change file ACLs from normal domusers.
+    * BUG 8195: Make rpc client code working against NT4 servers.
+    * BUG 8224: Fix the build on FreeBSD.
+    * BUG 8226: Use c99 initializers which are supported by old gcc 2.95
+      compilers.
+    * BUG 8260: Fix DCERPC responses with fragments larger than 1024 bytes.
+    * BUG 8264: Fix Valgrind bugs in svcctl.
+    * BUG 8276: Close all sockets attached to a subnet in close_subnet().
+    * BUG 8292: Fix a major architectural flaw in the SMB2 server code.
+
+
+o   Andreas Schneider <asn at samba.org>
+    * BUG 8215: Fix Winbind unix username lookup.
+    * BUG 8240: Fix Valgrind warnings in winreg/spoolss code.
+
+
+Changee since 3.6.0rc1
 ----------------------
 
 o   Michael Adam <obnox at samba.org>
diff --git a/WHATSNEW4.txt b/WHATSNEW4.txt
deleted file mode 100644
index 6758715..0000000
--- a/WHATSNEW4.txt
+++ /dev/null
@@ -1,141 +0,0 @@
-What's new in Samba 4 alpha14
-=============================
-
-Samba 4 is the ambitious next version of the Samba suite that is being
-developed in parallel to the stable 3.x series. The main emphasis in
-this branch is support for the Active Directory logon protocols used
-by Windows 2000 and above.
-
-Samba4 alpha14 follows on from the alpha release series we have been
-publishing since September 2007.
-
-WARNINGS
-========
-
-Samba4 alpha14 is not a final Samba release.  That is more a reference
-to Samba4's lack of the features we expect you will need than a
-statement of code quality, but clearly it hasn't seen a broad
-deployment yet.  If you were to upgrade Samba3 (or indeed Windows) to
-Samba4, you would find many things work, but that other key features
-you may have relied on simply are not there yet.
-
-For example, while Samba 3 is an excellent member of a Active
-Directory domain, Samba4 is happier as a domain controller, and it is
-in this role where it has seen deployment into production.
-
-Samba4 is subjected to an awesome battery of tests on an
-automated basis, we have found Samba4 to be very stable in it's
-behaviour.  We have to recommend against upgrading production servers
-from Samba 3 to Samba 4 at this stage, because there may be the features on
-which you may rely that are not present, or the mapping of
-your configuration and user database may not be complete.
-
-If you are upgrading, or looking to develop, test or deploy Samba4, you should
-backup all configuration and data.
-
-NEW FEATURES
-============
-
-Samba4 supports the server-side of the Active Directory logon environment
-used by Windows 2000 and later, so we can do full domain join
-and domain logon operations with these clients.
-
-Our Domain Controller (DC) implementation includes our own built-in
-LDAP server and Kerberos Key Distribution Center (KDC) as well as the
-Samba3-like logon services provided over CIFS.  We correctly generate
-the infamous Kerberos PAC, and include it with the Kerberos tickets we
-issue.
-
-The new VFS features in Samba 4 adapts the filesystem on the server to
-match the Windows client semantics, allowing Samba 4 to better match
-windows behaviour and application expectations.  This includes file
-annotation information (in streams) and NT ACLs in particular.  The
-VFS is backed with an extensive automated test suite.
-
-A new scripting interface has been added to Samba 4, allowing
-Python programs to interface to Samba's internals.
-
-The Samba 4 architecture is based around an LDAP-like database that
-can use a range of modular backends.  One of the backends supports
-standards compliant LDAP servers (including OpenLDAP), and we are
-working on modules to map between AD-like behaviours and this backend.
-We are aiming for Samba 4 to be powerful frontend to large
-directories.
-
-CHANGES SINCE alpha13
-=====================
-
-We have continued our commitment to provide a full DRS implementation for our
-AD implementation and therefore achieved also this time big steps forward.
-
-Our progress on DRS is being tracked in the Samba wiki:
-http://wiki.samba.org/index.php/Samba4_DRS_TODO_List
-
-Beside this the release includes (among a lot of other things):
-
-* a script for backuping production provision
-Although still in development, samba4 is already used in a couple of production sites
-and such kind of use case is intensifying. This script is intendended for administrators
-to allow them to make a periodic backup of the provision in case of problem.
-
-* the 'net' command has been renamed to 'samba-tool'
-
-CHANGES
-=======
-
-Those familiar with Samba 3 can find a list of user-visible changes
-since that release series in the NEWS file.
-
-KNOWN ISSUES
-============
-
-- Domain member support is in it's infancy, and is not comparable to
-  the support found in Samba3.
-
-- There is no printing support in the current release.
-
-- There is no NetBIOS browsing support in the current release
-
-- The Samba4 port of the CTDB clustering support is not yet complete
-
-- Clock Synchronisation is critical.  Many 'wrong password' errors are
-  actually due to Kerberos objecting to a clock skew between client
-  and server.  (The NTP work in the previous alphas are partly to assist
-  with this problem).
-
-- The DRS replication code fails, and is very new
-
-- Users upgrading existing databases to Samba4 should carefully
-  consult upgrading-samba4.txt.  We have made a number of changes in
-  this release that should make it easier to upgrade in future.
-  Btw: there exists also a script under the "setup" directory of the
-  source distribution called "upgrade_from_s3" which should allow a step-up
-  from Samba3 to Samba4. It's not included yet in the binary distributions
-  since it's completely experimental!
-
-RUNNING Samba4
-==============
-
-A short guide to setting up Samba 4 can be found on the wiki:
-
-  http://wiki.samba.org/index.php/Samba4/HOWTO
-
-DEVELOPMENT and FEEDBACK
-========================
-
-We need your help! Projects as Samba 4 live from the community feedback. If you
-provide expressive bug reports, some documentation snippets on the wiki or some
-real code patches - all is appreciated if it meets our quality criterias. Here
-you can find further references:
-
-Bugs can be filed at https://bugzilla.samba.org/ but please be aware
-that many features are simply not expected to work at this stage.
-
-The Samba Wiki at http://wiki.samba.org should detail some of these
-development plans.
-
-Development and general discussion about Samba 4 happens mainly on
-the #samba-technical IRC channel (on irc.freenode.net) and
-the samba-technical mailing list (see http://lists.samba.org/ for
-details).
-
diff --git a/auth/auth_sam_reply.h b/auth/auth_sam_reply.h
index dea6501..bd92872 100644
--- a/auth/auth_sam_reply.h
+++ b/auth/auth_sam_reply.h
@@ -1,3 +1,25 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   Convert a server info struct into the form for PAC and NETLOGON replies
+
+   Copyright (C) Andrew Bartlett <abartlet at samba.org> 2004
+   Copyright (C) Stefan Metzmacher <metze at samba.org>  2005
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 #ifndef __AUTH_AUTH_SAM_REPLY_H__
 #define __AUTH_AUTH_SAM_REPLY_H__
 
diff --git a/configure b/configure
deleted file mode 100755
index 72f758e..0000000
--- a/configure
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-PREVPATH=`dirname $0`
-
-WAF=./buildtools/bin/waf
-
-# using JOBS=1 gives maximum compatibility with
-# systems like AIX which have broken threading in python
-JOBS=1
-export JOBS
-
-cd . || exit 1
-$WAF configure "$@" || exit 1
-cd $PREVPATH
diff --git a/configure.developer b/configure.developer
deleted file mode 100755
index 5033670..0000000
--- a/configure.developer
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-`dirname $0`/configure -C \
-	--enable-developer \
-	--enable-socket-wrapper \
-	--enable-nss-wrapper \
-	"$@"
diff --git a/docs-xml/manpages-3/idmap_autorid.8.xml b/docs-xml/manpages-3/idmap_autorid.8.xml
index 3a56555..87b9268 100644
--- a/docs-xml/manpages-3/idmap_autorid.8.xml
+++ b/docs-xml/manpages-3/idmap_autorid.8.xml
@@ -109,7 +109,7 @@
 
 	idmap config * : backend = autorid
 	idmap config * : range = 1000000-19999999
-	autorid:rangesize = 1000000
+	idmap config * : rangesize = 1000000
 
 	idmap config TRUSTED : backend  = ad
 	idmap config TRUSTED : range    = 50000 - 99999
diff --git a/docs-xml/manpages-3/ldb.3.xml b/docs-xml/manpages-3/ldb.3.xml
deleted file mode 100644
index 715fd80..0000000
--- a/docs-xml/manpages-3/ldb.3.xml
+++ /dev/null
@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<refentry id="ldb.3">
-
-<refmeta>
-	<refentrytitle>ldb</refentrytitle>
-	<manvolnum>3</manvolnum>
-	<refmiscinfo class="source">Samba</refmiscinfo>
-	<refmiscinfo class="manual">C Library Functions</refmiscinfo>
-	<refmiscinfo class="version">3.6</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-	<refname>ldb</refname>
-	<refclass>The Samba Project</refclass>
-	<refpurpose>A light-weight database library</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-	<synopsis>#include <ldb.h></synopsis>
-</refsynopsisdiv>
-
-<refsect1>
-	<title>description</title>
-
-	<para>
-ldb is a light weight embedded database library and API. With a
-programming interface that is very similar to LDAP, ldb can store its
-data either in a tdb(3) database or in a real LDAP database.
-	</para>
-
-	<para>
-When used with the tdb backend ldb does not require any database
-daemon. Instead, ldb function calls are processed immediately by the
-ldb library, which does IO directly on the database, while allowing
-multiple readers/writers using operating system byte range locks. This
-leads to an API with very low overheads, often resulting in speeds of
-more than 10x what can be achieved with a more traditional LDAP
-architecture.
-	</para>
-
-	<para>
-In a taxonomy of databases ldb would sit half way between key/value
-pair databases (such as berkley db or tdb) and a full LDAP
-database. With a structured attribute oriented API like LDAP and good
-indexing capabilities, ldb can be used for quite sophisticated
-applications that need a light weight database, without the
-administrative overhead of a full LDAP installation.
-	</para>
-


-- 
Samba Shared Repository


More information about the samba-cvs mailing list