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

Karolin Seeger kseeger at samba.org
Mon May 23 13:15:54 MDT 2011


The branch, v3-6-stable has been updated
       via  ad36479 WHATSNEW: Add further changes since pre3.
       via  3c21f14 Fix the SMB2 showstopper, found by an extended torture test from Volker.
       via  a58a74d Ensure we always write the correct incoming mid into the share mode table entries. (cherry picked from commit fe21bdc43c0aeacfc8592998e6a90f6f83c939e0) (cherry picked from commit 76f6eed7068909c87f103e96e7e94e59647a7736)
       via  7381ed2 s3-printing: remove cups_pull_comment_location from header file
       via  3b17e56 s3-printing: Remove obsolete and unused cups_pull_comment_location().
       via  39e13b2 s3-spoolss: Get the printer location from cups.
       via  5ace375 s3-printing: Get the location info from cups.
       via  6d90dde s3-includes: no need to globally include libads/ads_status.h.
       via  71e6b33 s3-includes: finally only include client.h when libsmb is used.
       via  9d5232a s3-build Remove distinct LOCALEDIR subsystem
       via  cc17c2b s3-libsmb: move protos to libsmb/proto.h
       via  6ba818b s3: only include tdb headers where needed.
       via  7afa1f4 lib/util Move source3 tdb_wrap_open() into the common code.
       via  37bb874 s3-includes: remove ipv6 related prototype which is already defined in ../lib/util/util_net.h.
       via  b2d16f8 lib/util Move more network utility functions from source3 into lib/util
       via  ad6bcf7 s3-rpc_server: run minimal_includes.pl.
       via  38011bf s3-printing: run minimal_includes.pl.
       via  1ea9707 s3-rpc_server: (re)move last globally included rpc_server prototypes.
       via  0eb40bf s3: include ntdomain.h before including generated srv_ headers.
       via  7bc717a s3-rpc_server: add pipes_struct forward declaration.
       via  3d0ee9b s3-printing: avoid using pipes_struct when only session_info is needed.
       via  a25215d s3-proto: move remaining srvsvc protos to own header file.
       via  2ba58dd s3-proto: move remaining spoolss protos to own header file.
       via  3e013d4 s3-proto: move more rpc_server prototypes out of proto.h
       via  1da5d19 s3-proto: move rpc_srv_register protos and structs to town headerfile.
       via  0cd25e2 s3-proto: move more headers to rpc_server/rpc_ncacn_np.h where they origin from.
       via  d8e2bfd s3-proto: remove duplicate prototypes.
       via  3e08b34 s3-rpc_server: remove some unneeded headers.
       via  176caca s3-proto: move rpc_server/rpc_handles.c protos to ntdomain.h
       via  ce1f886 s3-proto: move more librpc prototypes to librpc/rpc/dcerpc.h
       via  281e962 s3-proto: move more rpc client prototypes to cli_pipe.h.
       via  f930ddd s4-smbtorture: add test_netremotetod.
       via  2f6958f s4-libcli/rap: add smbcli_rap_netremotetod().
       via  f6ddd1e s3-rap: add rap_NetRemoteTOD to IDL.
       via  40e7313 s3-rpc_client: run minimal_includes.pl.
       via  9c18dd6 s3-rpcclient: run minimal_includes.pl.
       via  6f4e832 s3-param: run minimal_includes.pl.
       via  3ff95c4 s3-libsmb: run minimal_includes.pl.
       via  e57293d s3-libnet: run minimal_includes.pl.
       via  f475cd3 s3-libads: run minimal_includes.pl.
       via  f3e8e10 s3-lib: run minimal_includes.pl.
       via  2e9f21c s3-auth: run minimal_includes.pl
       via  53488f7 libcli/named_pipe_auth: add forward declaration in npa_tstream.h.
       via  bc4e2b7 s3-waf: check for pthread support.
       via  cdc9072 s3-proto: move remaining krb5 protos to krb5_protos.h
       via  e358a4e s3: remove various references to server side dcerpc structs (which are not needed).
       via  16c5dca s3: move pipe_auth_data to dcerpc.h
       via  8358334 s3-smbd: avoid using pipes_struct when only session_info is needed.
       via  7039fbe s3-printing: include ../librpc/ndr/libndr.h  in ads printing.
       via  a8333b2 s3-winbindd: remove unused headers.
       via  2932f7e s3-system: move LOCK_ defines to lib/system.c
       via  7d12453 s3-spoolss: remove another unused header.
       via  5d737da s3-util: move valid_share_pathname() to lib/util.c
       via  f2b8377 s3-rpc_server: remove proto of nonexisting function (rpc_pipe_register_commands).
       via  92686c2 s3-proto: remove remaining nss_info prototypes to nss_info.h
       via  fb0dfe4 s3: Document gpfs:syncio
       via  d49282b gpfs.so: Add gpfs:syncio option
       via  e7171b5 s3:libsmb convert user-specified domain to uppercase
       via  1f69905 libcli/: Fix prototypes for all functions.(cherry picked from commit fa387825e2a4563ff85267848d8e9d206bf6db96) (cherry picked from commit 28cba271e61245b166d002745737c5fedae80c0c)
       via  72e7283 More const compiler warning fixes. (cherry picked from commit 9efea96d16a9f9526669e7d9288902a15d0ee549) (cherry picked from commit 62a6ded441247daeb61a36fddc3d7eac8114df9f)
       via  6f08ebf s3-net: fix potential crash bug in display_print_driver3().
       via  60f27ee s3: Fix return check in nss_wins
       via  0749f05 WHATSNEW: Add changes since pre3.
       via  6bc1823 s3: Paranoia in smbsock_connect_state_destructor
       via  9498f40 s3:build: install libtdb with full version number instead of only SO version
       via  4e3395d s3:build: install libtalloc with full version number instead of only SO version (cherry picked from commit 4acb8c3f5976c5496aa666a52cd96739836ced2a) (cherry picked from commit 15502f3206a059a2fe7ced52e0450a57e375bd73)
       via  24202dc s3:build: build libtalloc.so.$VERSION with full version number instead only SO version (cherry picked from commit d04efc703ba0f195fcef832a30b27a160a787413) (cherry picked from commit 8cc2dc490a27deda5fdae8aaac00c07ea12a58ec)
       via  7767856 s3:build: build libtdb.so.$VERSION with full version number instead only SO version (cherry picked from commit 9c76fdd80c93ec23099987b1559f3a3f0f7b6ca5) (cherry picked from commit d1682e2d62bc320a419bf768c1d76a29666e7f75)
       via  1a33b35 s3:build: link libtdb as shared lib if using shared libs at all (cherry picked from commit 3f222513cc99b7ce048bcdaa8cc10f7b91616904) (cherry picked from commit 43b29fe6affe3dde1cbf191cc9c46d52f83df3db)
       via  f0cc71f s3:build: determine full version of libtdb for the samba build (cherry picked from commit 23637b5789a43fe75bb4eadabd33fb321272b42b) (cherry picked from commit 095a83d7fbb23c5df5cadf2d9e5136a7fc396a1f)
       via  5e4e2bf s3:build: link libtalloc as shared lib if using shared libs at all (cherry picked from commit 6c300ec4b51bfd57837d193f0b17b60cb152fc27) (cherry picked from commit a3b058206e3c2f7670083f370d7d4540a0a7e29f)
       via  03656a1 s3:build: determine full version of libtalloc for the samba build (cherry picked from commit 472cabbdea3d5def7e7a36b19c5851a0cf0d8d83) (cherry picked from commit d579ae8a2a3cad5f953a3587024a398add7ccfea)
       via  8aa69dc s3:build: fix typo in definition of --enable-external-libtdb (cherry picked from commit b731b6e032d9ba1469c349d6c46bd7bb52b18c28) (cherry picked from commit c01873ebd9e90572c8e4fab28568328871a12be2)
       via  2faeed5 s3:build: reformat AC_ARG_ENABLE(external_libtalloc...) (cherry picked from commit abef191fb9fa9edbdb68d7cbbf017e1fa74583f2) (cherry picked from commit 2eeb5f27a2773972e14a154aac74b8bec136ff50)
       via  e6ec1e6 s3:build: print the full version number in the showlibs targets (cherry picked from commit 7e230b31d19fcd37d5765e9649ccfca39af5541d) (cherry picked from commit 6a35fc2e50e560d0481b37f509f70d0caa459911)
       via  e072b48 s3:build: add LIBWBCLIENT_FULLVER for consistency with SMB_LIBRARY() (cherry picked from commit d5d53ba5148d57bae207ded7525a4a38fcb5836f) (cherry picked from commit 2a633d1fc0578a943fe689dffea6c3e379820d59)
       via  7333c82 s3:build: add an optional full version argument to the SMB_LIBRARY() macro. (cherry picked from commit adb3fc2f1d85f7621043d087ed2afb0fd053a009) (cherry picked from commit a0b51c3ef4a8b606d9464d50cf5ab56952ba508e)
       via  c8e15ac s3:configure: add --enable-smbtorture4 switch (cherry picked from commit f8e32980f4fab8d6cad5c9f95fab0d1828717cd2) (cherry picked from commit 80d05f7c3ca9b1d85f6098d74481cea2cf78258d)
       via  40a112f Fix 3.6 headers (cherry picked from commit f07f3d5d11b57321dc0616b88afc78199a59e2d8)
       via  1bb6b84 s3-gse: Use gss_get_name_attribute to fetch the pac
       via  5bae0b6 WHATSNEW: Start 3.6.0rc1 release notes.
       via  684d23b VERSION: Bump version up to 3.6.0rc1.
       via  41c8657 rpc_server: Always use rpc_pipe_open_interface()
       via  f2bf931 s3:registry: add a warning debug message when the sorted subkeys is created from key_exists() (cherry picked from commit b1fe69df942e6e831e42b84aade0fb74d6bc6a0f)
       via  874881d s3:registry: recreate the sorted subkeys cache when storing keys
       via  8c1db29 s3:registry: add create_sorted_subkeys() to delete and recreate the sorted subkeys key
       via  3913147 s3:registry: turn create_sorted_subkeys_internal to NTSTATUS return type
       via  43f0f28 s3:registry: rename create_sorted_subkeys() to create_sorted_subkeys_internal() (cherry picked from commit 8ea96a246c903d787cc0a79c33ffbce5b0307af8)
       via  fecef1f s3:registry: fix a typo in a debug message (cherry picked from commit 1a0a2f35e2bfbc5194de846fde4ae800338b3311)
       via  637bcc5 s3-libnetjoin: fix uninitialized variable.
       via  b83c69f s3-libnetapi/libnetjoin: fix uninitialized variables after the libsmbconf changes.
       via  11d1be1 s3-includes: move enum flush_reason_enum to smb.h
       via  05e05b4 s3-lib/smbconf: fix uninitialized error code in smbconf_reg_init().
       via  fd89865 libsmbconf: Define a doxygen group for libsmbconf.
       via  d6d0ed0 libsmbconf: Document smbconf_transaction_cancel().
       via  1edd2d5 libsmbconf: Document smbconf_transaction_commit().
       via  3cde147 libsmbconf: Document smbconf_transaction_start().
       via  3178a33 libsmbconf: Document smbconf_delete_global_includes().
       via  207ab36 libsmbconf: Document smbconf_delete_includes().
       via  f0e7613 libsmbconf: Document smbconf_set_global_includes().
       via  6df36a8 libsmbconf: Document smbconf_set_includes().
       via  f53d174 libsmbconf: Document smbconf_get_global_includes().
       via  fd4286a libsmbconf: Document smbconf_get_includes().
       via  3deb47a libsmbconf: Document smbconf_delete_global_parameter().
       via  56c373b libsmbconf: Document smbconf_delete_parameter().
       via  99e019c libsmbconf: Document smbconf_get_global_parameter().
       via  a315cc5 libsmbconf: Document smbconf_get_parameter().
       via  06c1ae5 libsmbconf: Document smbconf_set_global_parameter().
       via  022888f libsmbconf: Document smbconf_set_parameter().
       via  2ce0d46 libsmbconf: Document smbconf_delete_share().
       via  e3dbd1d libsmbconf: Document smbconf_get_share().
       via  52d0f7b libsmbconf: Document smbconf_create_share().
       via  64039f5 libsmbconf: Document smbconf_share_exists().
       via  e8181a4 libsmbconf: Document smbconf_get_share_names().
       via  9ef4f21 libsmbconf: Document smbconf_get_config().
       via  8ba2f9c libsmbconf: Document smbconf_drop().
       via  3ec2020 libsmbconf: Document smbconf_changed().
       via  ff36dda libsmbconf: Document smbconf_shutdown().
       via  1596add libsmbconf: Document smbconf_is_writeable().
       via  3b3b691 libsmbconf: Document smbconf_backend_requires_messaging().
       via  096eb52 s3-waf: Create a public libsmconf.
       via  e985041 s3-waf: Create a registry private library.
       via  2cda087 libsmbconf: Convert smbconf_get_config() to sbcErr.
       via  d9df70a libsmbconf: Convert smbconf_transaction_*() to sbcErr.
       via  1cca2af libsmbconf: Convert smbconf_delete_includes() to sbcErr.
       via  dc3928d libsmbconf: Convert smbconf_set_includes() to sbcErr.
       via  b507f71 libsmbconf: Convert smbconf_get_includes() to sbcErr.
       via  713b2ae libsmbconf: Convert smbconf_delete_parameter() to sbcErr.
       via  38aa886 libsmbconf: Convert smbconf_get_parameter() to sbcErr.
       via  1642245 libsmbconf: Convert smbconf_set_parameter() to sbcErr.
       via  51ed762 libsmbconf: Convert smbconf_delete_share() to sbcErr.
       via  cc02bf9 libsmbconf: Convert smbconf_get_share() to sbcErr.
       via  66f435f libsmbconf: Convert smbconf_create_share() to smbErr.
       via  ad63c8d libsmbconf: Convert smbconf_get_share_names() to sbcErr.
       via  5d4e88b libsmbconf: Convert smbconf_drop() to sbcErr.
       via  710bf92 libsmbconf: Convert smbconf_open() to sbcErr.
       via  b3e413e libsmbconf: Convert smbconf_init() to sbcErr.
       via  d9a44fa libsmbconf: Added a sbcErrorString() function.
       via  b6f61b3 libsmbconf: Introduce a sbcErrType.
       via  a39f561 s3-printing: make cups_pull_comment_location() work again.
       via  4f19086 s3-printing: Fix double free of cups request.
       via  a84af74 s3-printing: very obvious fix for cups_pull_comment_location().
       via  dc2c5f3 s3-events: tevent_internal.h is not a public header
       via  bed4f71 s3: Use tevent_req_ntstatus properly in a few places
       via  959f3bc s3: Use tevent_req_ntstatus properly in a few places (cherry picked from commit 06a2ff579692ea062944e5bd90d3526327004954) (cherry picked from commit 708519e14be1fdc0f3686e8ab386c49e58283d6a)
       via  868198b async_smb.c: convert cli->timeout properly
       via  5f73c0a A couple more off-by-one calculations with strlcpy.
       via  1dd7e85 s3-waf: add vfs_gpfs_hsm_notify to the build.
       via  0b40497 tdb: fix a build warning.
       via  6995490 libcli/security: fix build warning, cr_descr_log_acl() is not used currently.
       via  9cd58a1 s3-spoolss: remove unused struct in construct_notify_printer_info().
       via  dab9adc s3-proto: remove some duplicate prototypes.
       via  311d128 s3: Fix a typo
       via  423b4cb s3: Fix dup_smb2_vec3
       via  7d4c0e5 Fix off-by-one when used with safe_strcpy. (cherry picked from commit 18582016d96e3f41f8828f0539969678ad7d233e) (cherry picked from commit c357147e0c40cbe00b0bc0d5f90ac0f4e2ad3ca5)
       via  9e16dd8 BUGFIX when converting from safe_strcpy to strlcpy.
       via  d70fc03 Remove unused function parse_add_domuser().
       via  b11b1bf s3-vfs: make vfswrap_llistxattr and vfswrap_flistxattr static.
       via  c5f202f Always build before commit ... :-) (cherry picked from commit d4d3d7383a9e3c2c0910a848f33755ca54c32b99) (cherry picked from commit 55cad002017d25a69de826a7af518c6fcc016d02)
       via  798a885 RHEL-CTDB: Build vfs_gpfs_hsm_notify
       via  8eae357 vfs_gpfs: Properly notify the offline->online changes
       via  33eb180 vfs_gpfs: Block sendfile for offline files (cherry picked from commit 41bde55821a6c18ace24330aede8d4928215e658) (cherry picked from commit c2c29533fc4a7467130dff0582249cccc49e001e)
       via  ffa2071 vfs_gpfs: Store the winattrs in st.vfs_private
       via  de77e9e s3: Properly deal with exited winbind children
       via  a71e74f s3: Filter out duplicates in name_query()
       via  25cf2bc s3-includes: when MADVISE support was reverted back in 2009, someone forgot this hunk.
       via  76b62ee ѕ3/configure: move out generic CPPFLAGS in the solaris case here
       via  0055fc9 ѕ3/configure: move out generic LDFLAGS in the solaris case here
       via  017926f s3: reply_readbraw_error needs an sconn as argument also in the non-LFS code path
       via  5c3838e s3: Handle EINTR from sys_poll correctly
       via  9fc5c35 s3: Tune broadcast namequeries for unique names
       via  80d53db s3: Make name_resolve_bcast return sockaddr_storage
       via  e90a87e s3: Remove ip_sevice from get_ipc_connect_master_ip
       via  4a5034d Add POSIX O_RDONLY test of a directory for bug #8112 - POSIX extension opens of a directory are denied with EISDIR.
       via  41cfe24 Fix bug #8112 - POSIX extension opens of a directory are denied with EISDIR.
       via  b3d9ea6 s4:libcli/util/nterr: NO_S4U_PROT_SUPPORT and CROSSREALM_DELEGATION_FAILURE
       via  a546512 s3:libsmb/nterr: NO_S4U_PROT_SUPPORT and CROSSREALM_DELEGATION_FAILURE
       via  79c1aa4 libcli/util/ntstatus: NO_S4U_PROT_SUPPORT and CROSSREALM_DELEGATION_FAILURE
       via  4d6afe9 talloc: use TC_UNDEFINE_SHRINK_CHUNK() instead of TC_INVALIDATE_SHRINK_CHUNK() for realloc path
       via  625ae53 torture test for bug #8111 - CIFS VFS: unexpected error on SMB posix open.
       via  248ed5f Fix bug 8111 - CIFS VFS: unexpected error on SMB posix open
       via  5fa2370 s3: Avoid a potential 100% CPU loop in winbindd
       via  37c56f4 s3: Make winbindd_reinit_after_fork return NTSTATUS (cherry picked from commit aa5abcaf7e2844e3bd3d8e8fe26488673ad3c00e) (cherry picked from commit 31b9258c40365f97fdd707c9756764bc94392726)
       via  59cfa29 s3: In winbind, close parent/child sockets
       via  80a15cd s3-smb Use FILE_ATTRIBUTE_ARCHIVE intead of aARCH
       via  a50b817 s3-smb Use FILE_ATTRIBUTE_DIRECTORY intead of aDIR
       via  7aae0e9 s3-smb Use FILE_ATTRIBUTE_VOLUME intead of aVOLID
       via  ca49dfd s3-smb Use FILE_ATTRIBUTE_SYSTEM intead of aSYSTEM
       via  2660aa7 s3-smb Use FILE_ATTRIBUTE_HIDDEN intead of aHIDDEN
       via  b6edae2 s3-smb Use FILE_ATTRIBUTE_READONLY intead of aRONLY
       via  4a19fb7 Add FILE_ATTRIBUTE_VOLUME. (cherry picked from commit 2805f8596c42f2834db089c6f96a81651db6ad33)
       via  52dc57a s3-tevent: only include ../lib/util/tevent wrappers where needed.
       via  6c2891e s3-tsocket: only include ../lib/tsocket/tsocket.h where needed.
       via  f0e3b9b s3-build: remove some unused headers.
       via  9685cf6 s3: Close the winbind client fds after forking
       via  b77af2c s3: Fix a strange German translation (cherry picked from commit a672707a185277343e06ca37fe85caf3bbfd6168) (cherry picked from commit b71bd9ea78803df88996c283854d357db47704db)
       via  bc43238 Remove another fstring in this code. (cherry picked from commit d808d55af1bf86f2c89078aba8f8d4dbf7282b9f) (cherry picked from commit 3d55b6ff8b9a2903b73434fee0a373c122d2bfe1)
       via  12f1b52 Fixup (C) - we've both worked lots on this :-).
       via  b92aaf0 Remove fstrings from client struct. Properly talloc strings (ensuring we never end up with a NULL pointer). (cherry picked from commit 1815f0298f33c949f78e181477e8474a37663ccd) (cherry picked from commit 9cf389041ccc0605fe22d7f092a33a9bd9e698b3)
       via  601d79a s3: Make cli_session_setup_lanman2 async (cherry picked from commit a644eff10ef3fee53f4841652f204a124ab73c15)
       via  b913536 s3: Make cli_session_setup_nt1 async
       via  6ee1ca1 s3: Make plaintext session setup async
       via  5f5710a s3: Remove cli_write
       via  0679657 s3: Use cli_writeall instead of cli_write
       via  91a9373 s3: Add cli_writeall
       via  c47ed6a s3: Properly clean up in pthreadpool_init in case of failure
       via  c3c3f83 s3-netapi: Fix Coverity CID #2302: FORWARD_NULL
       via  13de1ba docs: Fix a bogus )
       via  5d96a8f s3:vfs use gpfs_lib_init
       via  29688c5 WHATSNEW: %i and %I no langer contain IPv4 mapped IPv6 addresses
      from  0cfe941 WHATSNEW: Update changes since pre2.

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


- Log -----------------------------------------------------------------
commit ad36479ab0d78f6007410dc1502510e999be1139
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue May 17 09:54:34 2011 +0200

    WHATSNEW: Add further changes since pre3.
    
    And remove double entry.
    
    Karolin
    (cherry picked from commit 4024d092f6ef2ea43960bc6cd5c06f3632c3c10e)

commit 3c21f14a0686384697cdec4b02360d958505f51b
Author: Jeremy Allison <jra at samba.org>
Date:   Mon May 16 12:20:14 2011 -0700

    Fix the SMB2 showstopper, found by an extended torture test from Volker.
    
    In the oplock refactoring, the algorithm underwent an unnoticed change.
    In 3.5.x stat_opens were silently (i.e. no explicit code had comments
    explaining this) ignored when looking for oplock breaks and share mode
    violations. After the refactoring, the function find_oplock_types()
    no longer ignored stat_open entries in the share mode table when looking
    for batch and exclusive oplocks. This patch adds two changes to find_oplock_types()
    to ignore the case where the incoming open request is a stat open being
    tested against existing opens, and also when the incoming open request
    is a non-stat open being tested against existing stat opens. Neither
    of these cause an oplock break or share mode violation. Thanks a *lot*
    to Volker, who persevered in reproducing this problem.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Mon May 16 22:38:20 CEST 2011 on sn-devel-104
    (cherry picked from commit 8cf14c21b3bc55454728bf48b23f696e15c92aea)
    (cherry picked from commit a2bc1d37b98a0581960039a5ff3deb55cf0c4f90)

commit a58a74d2bdf0897bfa76426fc721c7c216458549
Author: Jeremy Allison <jra at samba.org>
Date:   Mon May 16 10:41:51 2011 -0700

    Ensure we always write the correct incoming mid into the share mode
    table entries.
    (cherry picked from commit fe21bdc43c0aeacfc8592998e6a90f6f83c939e0)
    (cherry picked from commit 76f6eed7068909c87f103e96e7e94e59647a7736)

commit 7381ed25c66d07d28fd350429636b140fd58e39d
Author: David Disseldorp <ddiss at suse.de>
Date:   Mon May 16 13:26:41 2011 +0200

    s3-printing: remove cups_pull_comment_location from header file
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Mon May 16 16:03:57 CEST 2011 on sn-devel-104
    (cherry picked from commit 6bfe488f29a9df26f3d6dbc4166200ea286536c1)
    (cherry picked from commit 327598652b106e9a09bfab5d35d3534c9093356a)

commit 3b17e5689c5a27e3e7715ad56227a0f3c0b0a9c3
Author: Andreas Schneider <asn at samba.org>
Date:   Fri May 13 10:57:33 2011 +0200

    s3-printing: Remove obsolete and unused cups_pull_comment_location().
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    (cherry picked from commit 01bc556d03a592e1f3c848d71b2e72a7cb74706f)
    (cherry picked from commit 07652a7c7e55bf1e4acd3e4dd97880b8aba01596)

commit 39e13b27ca0bd71fae65c80d41891ecd0b74bb0a
Author: Andreas Schneider <asn at samba.org>
Date:   Fri May 13 10:28:20 2011 +0200

    s3-spoolss: Get the printer location from cups.
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    (cherry picked from commit da1fa201040b2dab89fdc99663155a1c79ad4de9)
    (cherry picked from commit 3006de14fb3b68d2be0bae65023e9ca8e4d11ff6)

commit 5ace375da5df261fbb5bcda432710c82bb5fafd1
Author: Günther Deschner <gd at samba.org>
Date:   Fri May 13 10:02:42 2011 +0200

    s3-printing: Get the location info from cups.
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    (cherry picked from commit 854467851da48e02dcd8f869cb031c8943707017)
    (cherry picked from commit 090b5b03d2c52c4fa4eeaecc4b4b815bd1948177)

commit 6d90ddea520aeb3fd6609c6e143bd1a89366bc4b
Author: Günther Deschner <gd at samba.org>
Date:   Fri May 6 12:54:59 2011 +0200

    s3-includes: no need to globally include libads/ads_status.h.
    
    Guenther
    (cherry picked from commit 1e208a705718adb105d89093041c0ba5d51f2429)
    (cherry picked from commit 68936f478dfc0cb9c7ae9e7b208b5e5c22ea2973)

commit 71e6b33aa67599fa70806f8dd8db6de80acb4cb5
Author: Günther Deschner <gd at samba.org>
Date:   Fri May 6 12:53:38 2011 +0200

    s3-includes: finally only include client.h when libsmb is used.
    
    Guenther
    (cherry picked from commit 675573d54b717ffc24cf3b49301ff649aecc259a)
    (cherry picked from commit 58cae168b5f29afda9dc7132f2770c3f58a89772)

commit 9d5232a834222ddf3e7bacfcdc396f13609dcd71
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Apr 13 15:13:45 2011 +1000

    s3-build Remove distinct LOCALEDIR subsystem
    
    This is no different to the rest of dynconfig, and so should be dealt
    with there.
    
    Andrew Bartlett
    (cherry picked from commit d309499b9e268bff5e366a9986528f0accbc02b3)
    (cherry picked from commit 66f6359d9106872e226f08a9bbcf0917c987b84a)

commit cc17c2b08611f2bd2be0f8f9af7f3430fcf8763d
Author: Günther Deschner <gd at samba.org>
Date:   Fri May 6 11:47:43 2011 +0200

    s3-libsmb: move protos to libsmb/proto.h
    
    Guenther
    (cherry picked from commit 3b2fe4728d6d916508b677e696ecad88f8b7b9fd)

commit 6ba818bd8dcdfdf108755f3375eb087c655dde26
Author: Günther Deschner <gd at samba.org>
Date:   Thu May 5 11:25:29 2011 +0200

    s3: only include tdb headers where needed.
    
    Guenther
    (cherry picked from commit d8cfca3a9bd2b6b6c562fd202377d95a98eb5472)
    (cherry picked from commit 138da8f4b1eb4715b7fb259986b9c1e8ffae469e)

commit 7afa1f42c6a2c7e09fba8e51e3cacb56674c95cc
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed May 4 10:28:15 2011 +1000

    lib/util Move source3 tdb_wrap_open() into the common code.
    
    This #if _SAMBA_BUILD == 3 is very unfortunate, as it means that in
    the top level build, these options are not available for these
    databases.  However, having two different tdb_wrap lists is a worse
    fate, so this will do for now.
    
    Andrew Bartlett
    (cherry picked from commit 14750139639b3531e57a3ca3f9e481d6e458dc06)
    (cherry picked from commit a7f39847ebf29b821aab2570a2f2bd841a28e836)

commit 37bb87462868342fcb818d007f44aa81a9df1718
Author: Günther Deschner <gd at samba.org>
Date:   Tue May 3 16:16:50 2011 +0200

    s3-includes: remove ipv6 related prototype which is already defined in ../lib/util/util_net.h.
    
    Guenther
    (cherry picked from commit a3609457912123037ca9fc51349d89d7921bc4e7)
    (cherry picked from commit f407006cd59d5957e4564d96c942b2aa913bcd18)

commit b2d16f87bd801d031ec45cfda46cbf003b2be477
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon May 2 15:23:08 2011 +1000

    lib/util Move more network utility functions from source3 into lib/util
    
    This will help with the merge of the interfaces layer.
    
    Andrew Bartlett
    (cherry picked from commit fbea52f74a80268446f45936a0cf40400aba8565)
    (cherry picked from commit 007b781b39e4bd2ddc25ab6bd2b6f9b88dfdba8b)

commit ad6bcf76c8aa29845688ba9c10a72e0e9e24c294
Author: Günther Deschner <gd at samba.org>
Date:   Thu May 5 00:58:27 2011 +0200

    s3-rpc_server: run minimal_includes.pl.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Thu May  5 03:04:38 CEST 2011 on sn-devel-104
    (cherry picked from commit 8563d5c384f672276d8ea2ab20a1810ff485e37d)
    (cherry picked from commit 154637cf36f5a47d3e83fcf2e2ed081cbff3e141)

commit 38011bf234ec5a673d4be9f32e026e68ee4359f0
Author: Günther Deschner <gd at samba.org>
Date:   Thu May 5 00:48:26 2011 +0200

    s3-printing: run minimal_includes.pl.
    
    Guenther
    (cherry picked from commit c9f3a2c83e208fcf05576eb2137c893fe4f3fe6d)
    (cherry picked from commit d4e6e964ec87cd91a3bfe03efe754454644a3272)

commit 1ea970718012d9994c6a538a19f828c1333c3880
Author: Günther Deschner <gd at samba.org>
Date:   Mon May 2 13:27:45 2011 +0200

    s3-rpc_server: (re)move last globally included rpc_server prototypes.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Mon May  2 16:05:31 CEST 2011 on sn-devel-104
    (cherry picked from commit 56cd3b3bbbb595cb0c98fa2dfa397c915fbf37d2)
    (cherry picked from commit 7a4cc69ac8d2b6f53735a2f2cea8d40b7e965235)

commit 0eb40bf68e8bc45ba5fb766ca2092ef1439ee8da
Author: Günther Deschner <gd at samba.org>
Date:   Mon May 2 13:21:53 2011 +0200

    s3: include ntdomain.h before including generated srv_ headers.
    
    Guenther
    (cherry picked from commit 0e76eddcc8a4e7e98167b8f92387fae015fae095)
    (cherry picked from commit ce063fde45bfe649f8f50dd72e42db10b3d94f30)

commit 7bc717ab3f49f39b1cf67a8e9d154725757cc9fa
Author: Günther Deschner <gd at samba.org>
Date:   Mon May 2 13:19:51 2011 +0200

    s3-rpc_server: add pipes_struct forward declaration.
    
    Guenther
    (cherry picked from commit 911cdc56c146014058063b872372ff8096c06065)
    (cherry picked from commit 9a6a1a5b934247c3d8c81934788231e331c2b020)

commit 3d0ee9bbef948df9c472ba0b534d9829dd2c466a
Author: Günther Deschner <gd at samba.org>
Date:   Sat Apr 30 00:09:09 2011 +0200

    s3-printing: avoid using pipes_struct when only session_info is needed.
    
    Guenther
    (cherry picked from commit cd5b2b242b39437081592d41d297bce0668b40ab)
    (cherry picked from commit 44c6ed73b6f27484014cde771715c94475cac53f)

commit a25215d8815c14bc70a2de7b9835722c19d949df
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 29 23:57:49 2011 +0200

    s3-proto: move remaining srvsvc protos to own header file.
    
    Guenther
    (cherry picked from commit daa02f34b181a3ec7224e920f787cc677bc3cdf2)
    (cherry picked from commit 54559a55bd90f18330759b88fc9b2457951ccfdb)

commit 2ba58ddc3f7b2e67218c643a3e78859bd0c5bb8f
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 29 23:47:25 2011 +0200

    s3-proto: move remaining spoolss protos to own header file.
    
    Guenther
    (cherry picked from commit c233c21425a183dd1124329fdbca13ab92cc6d6a)
    (cherry picked from commit 8143106d7290aa4ae713bc04603b8b589bc86346)

commit 3e013d493c0cf30555ed0eb8528b614cfb2df43b
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 29 23:32:28 2011 +0200

    s3-proto: move more rpc_server prototypes out of proto.h
    
    Guenther
    (cherry picked from commit 047d8c073b57bc12648a251deaceedb65f4f59cf)
    (cherry picked from commit e3c65e2b7da2f7fbee4e6211bbe4f01c0873edec)

commit 1da5d198dbfe12e15e6eeaf306420d244ca2dbcf
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 29 22:32:12 2011 +0200

    s3-proto: move rpc_srv_register protos and structs to town headerfile.
    
    Guenther
    (cherry picked from commit 49d5f62b42d821bb8a11b595efb53eb88ec3c570)
    (cherry picked from commit 6c07214f6a851f5fef573c8e7ffd9c1959e3702b)

commit 0cd25e2fba1a5732842dd3c73dc6e3145a48ad1d
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 29 16:40:24 2011 +0200

    s3-proto: move more headers to rpc_server/rpc_ncacn_np.h where they origin from.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Fri Apr 29 22:05:07 CEST 2011 on sn-devel-104
    (cherry picked from commit bbacaec4e9365b128eb11467c95412de7473c1ec)
    (cherry picked from commit 2cc2f7fe76e501c95206f91f4170d7e3829d89a0)

commit d8e2bfd7e86d869a439fd4b271316a7d86c4fb14
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 29 16:20:27 2011 +0200

    s3-proto: remove duplicate prototypes.
    
    Guenther
    (cherry picked from commit bc781bf7d98baca57c8043bf7dc0a95f8ffd1345)
    (cherry picked from commit 0b0dc24c82a6dd383cbffebae366fbf8e60ed66e)

commit 3e08b341f716a039273a92cba4fa688735a6c5ea
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 29 16:19:54 2011 +0200

    s3-rpc_server: remove some unneeded headers.
    
    Guenther
    (cherry picked from commit 487cb0c96ef8ca05fcef35d0d7c49bc067f6cff7)
    (cherry picked from commit 944dceb45b384c68a581b3f27a914c9e1d9d10cf)

commit 176cacad5b5a5a43b358a74bb168d23ac627533c
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 29 15:22:29 2011 +0200

    s3-proto: move rpc_server/rpc_handles.c protos to ntdomain.h
    
    Guenther
    (cherry picked from commit dfdc021e75fa4168b01ab77bfa1cb8c2539393db)

commit ce1f8865d46b5f3078ca9f21d208123dae83c4a1
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 29 15:13:55 2011 +0200

    s3-proto: move more librpc prototypes to librpc/rpc/dcerpc.h
    
    Guenther
    (cherry picked from commit faf11751255202274505d72848c54ee6e5dce7b6)
    (cherry picked from commit f92793f3f728c05f47671dc2697bf3ea3ace705d)

commit 281e962307fdbd6d0c7cce379a03dfabdd283568
Author: Günther Deschner <gd at samba.org>
Date:   Thu Apr 21 18:24:35 2011 +0200

    s3-proto: move more rpc client prototypes to cli_pipe.h.
    
    Guenther
    (cherry picked from commit 7daafe4d9e3620d8de2796a08924ff780528ac4f)

commit f930dddbdafb2723c0bb4bb944333cb209c3cbbb
Author: Günther Deschner <gd at samba.org>
Date:   Wed May 11 23:50:23 2011 +0200

    s4-smbtorture: add test_netremotetod.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Mon May 16 12:45:52 CEST 2011 on sn-devel-104
    (cherry picked from commit 74d82faa78e64bdaed68efb9331a7af1c3016c34)
    (cherry picked from commit fce32d92de313862fc9d34fff28d1d10d2f4e5b4)

commit 2f6958f0f315af8050843e601b8993850317e9a3
Author: Günther Deschner <gd at samba.org>
Date:   Wed May 11 23:37:08 2011 +0200

    s4-libcli/rap: add smbcli_rap_netremotetod().
    
    Guenther
    (cherry picked from commit b1948659ad987ce50d048dabc34f03031a243ee5)
    (cherry picked from commit 1ace9011db167b96cb60fef713d69d8d502e9222)

commit f6ddd1e0bfca7be8d0758f7662c17fdd8374ba91
Author: Günther Deschner <gd at samba.org>
Date:   Wed May 11 23:35:21 2011 +0200

    s3-rap: add rap_NetRemoteTOD to IDL.
    
    Guenther
    (cherry picked from commit b82caab5c9d8821cd125654e3233da40eb4c61d1)
    (cherry picked from commit e4765bf9f800f565b355d6821459d87658698174)

commit 40e731311ad1c7ba1dce97519bfcda97f93080a7
Author: Günther Deschner <gd at samba.org>
Date:   Thu May 5 00:54:56 2011 +0200

    s3-rpc_client: run minimal_includes.pl.
    
    Guenther
    (cherry picked from commit bd92826aa837f56119153b93cfce7f843e567896)
    (cherry picked from commit a68a7dfedd72cb97e98069ed0cc9d53dedb0b4ac)

commit 9c18dd63b77290bc587b9a43af7587a0aab7faca
Author: Günther Deschner <gd at samba.org>
Date:   Thu May 5 00:51:12 2011 +0200

    s3-rpcclient: run minimal_includes.pl.
    
    Guenther
    (cherry picked from commit c11d52c7f6b560fe66a2f197e30602d57370fd5c)
    (cherry picked from commit 79294deb58ea85f5d0d688b56df47a6c3bbb82fb)

commit 6f4e8327456f69e7965ad185f010517bf54bcced
Author: Günther Deschner <gd at samba.org>
Date:   Thu May 5 00:36:51 2011 +0200

    s3-param: run minimal_includes.pl.
    
    Guenther
    (cherry picked from commit 62314da8059ae888c0d1b299c486156664611e06)
    (cherry picked from commit aba946b91dd4dc32e3b5dbf2b19e01a4181b4f4e)

commit 3ff95c4240feed71beda8436c1fd50b288659eb4
Author: Günther Deschner <gd at samba.org>
Date:   Thu May 5 00:31:42 2011 +0200

    s3-libsmb: run minimal_includes.pl.
    
    Guenther
    (cherry picked from commit ea8960448d0a40067382a8d14ae19351d20acbdd)
    (cherry picked from commit 0241e64238249c730acbf3d18d36532a14c74570)

commit e57293db6a9ea79433844be2a10f8b153c055934
Author: Günther Deschner <gd at samba.org>
Date:   Thu May 5 00:25:31 2011 +0200

    s3-libnet: run minimal_includes.pl.
    
    Guenther
    (cherry picked from commit a05a59e8e2a421f22978e6eedbb1a7501a603aff)
    (cherry picked from commit 7987f1555648051ef4a5a00b42062d4fb149c0e2)

commit f475cd397354463554ae48b7f6fa037fed9c897a
Author: Günther Deschner <gd at samba.org>
Date:   Thu May 5 00:22:05 2011 +0200

    s3-libads: run minimal_includes.pl.
    
    Guenther
    (cherry picked from commit 653b84d2d6ed7387f93e5a126b5f2114b831044e)
    (cherry picked from commit af98bc24e3f8708f6382611538afa2df2d5a68c5)

commit f3e8e10515b8f327a16f86fe9a849315bbc038b8
Author: Günther Deschner <gd at samba.org>
Date:   Thu May 5 00:10:23 2011 +0200

    s3-lib: run minimal_includes.pl.
    
    Guenther
    (cherry picked from commit 63ebc918e4514f0006b94856d9b089255fca9718)
    (cherry picked from commit 274f3fea50cd3ae5bb5bdedc75402a11cfcbb114)

commit 2e9f21cdcd082fc008ad842d2ad5e5bf426eb967
Author: Günther Deschner <gd at samba.org>
Date:   Thu May 5 00:03:48 2011 +0200

    s3-auth: run minimal_includes.pl
    
    Guenther
    (cherry picked from commit 58db720e27d4b0c580fb4d3e036d823bc5d3a141)
    (cherry picked from commit 2a0c2636c40ef35a46f3ae33a4f28f0c87174d13)

commit 53488f7958f147994bdf43ce67609aa53a85db22
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 29 23:58:18 2011 +0200

    libcli/named_pipe_auth: add forward declaration in npa_tstream.h.
    
    Guenther
    (cherry picked from commit 89ceb489784358f9476bb6be0ad3ab9ea4d1b9c2)
    (cherry picked from commit 1fff2580d791a92137f9d5ab27dcb4a82188f020)

commit bc4e2b76349622813552c67d5429ea2d76af57e0
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 27 16:07:35 2011 +0200

    s3-waf: check for pthread support.
    
    Guenther
    (cherry picked from commit cad8fafa0391e9f13c2958c45ca5ec57f93f1e7b)
    (cherry picked from commit 00e5d087ca0ce1c5258d89aec44d59adeb681b50)

commit cdc907251d8426a94233c19df2b1a18787c7e774
Author: Günther Deschner <gd at samba.org>
Date:   Tue May 3 12:05:47 2011 +0200

    s3-proto: move remaining krb5 protos to krb5_protos.h
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Tue May  3 15:38:40 CEST 2011 on sn-devel-104
    (cherry picked from commit 9c48345e32c9aebd93c67103ea6984d74f2061b4)
    (cherry picked from commit f7411daa8cb1bb8222a09d112031a259cbd69ac8)

commit e358a4e562e5d911eff7c9af376dae833e8b44ec
Author: Günther Deschner <gd at samba.org>
Date:   Mon May 2 12:36:55 2011 +0200

    s3: remove various references to server side dcerpc structs (which are not needed).
    
    Guenther
    (cherry picked from commit 0bb4701a747599042242b0612bc392a6e6d777af)
    (cherry picked from commit 8deb28c63b324771815513858b89f1a0c58472f8)

commit 16c5dcaaee74f9edcd42b63ecc86840177f6d48d
Author: Günther Deschner <gd at samba.org>
Date:   Mon May 2 12:36:25 2011 +0200

    s3: move pipe_auth_data to dcerpc.h
    
    Guenther
    (cherry picked from commit 80fa624861e6f45c4b6837969253d5fbac2f3b1e)
    (cherry picked from commit e74b7405586a50349be236a81e71fd432855663d)

commit 83583349ffe6fc79b7b0e69c3691025bcfc87d46
Author: Günther Deschner <gd at samba.org>
Date:   Sat Apr 30 00:37:05 2011 +0200

    s3-smbd: avoid using pipes_struct when only session_info is needed.
    
    Guenther
    (cherry picked from commit 61cd1067efacd91e22b4acbdf0d1d92dc2efc162)
    (cherry picked from commit 3fe82d0152f9760326e905516c6959fb4b9973e5)

commit 7039fbebe36978645969d2c1dd7a7e59f1e452f1
Author: Günther Deschner <gd at samba.org>
Date:   Sat Apr 30 00:40:28 2011 +0200

    s3-printing: include ../librpc/ndr/libndr.h  in ads printing.
    
    Guenther
    (cherry picked from commit f7d6a0a1121c355a87dd113d2cb2a4985cdc06ce)
    (cherry picked from commit 87cd7c5fe13d8a1a2e7c251feed75900a338ad34)

commit a8333b28960ba32a225e288f4596d5afc2e7b6d8
Author: Günther Deschner <gd at samba.org>
Date:   Mon May 2 13:18:39 2011 +0200

    s3-winbindd: remove unused headers.
    
    Guenther
    (cherry picked from commit 233779cce4f47799d5912f362faadcd564bbf096)
    (cherry picked from commit a68a2b0cd3192da5450d3de64211f390aa96ef59)

commit 2932f7ec9d4c589add989d20ad2d2998973310b2
Author: Günther Deschner <gd at samba.org>
Date:   Tue May 3 14:45:47 2011 +0200

    s3-system: move LOCK_ defines to lib/system.c
    
    Guenther
    (cherry picked from commit 4fa2bac6e7ebe11447b535d9c8ec4348a2bbd39e)
    (cherry picked from commit a99d25b3d2af71c0ec05484469a0943b74eb89c4)

commit 7d124539f41fee3044889d0da80c5495a38e25b6
Author: Günther Deschner <gd at samba.org>
Date:   Mon May 2 13:25:19 2011 +0200

    s3-spoolss: remove another unused header.
    
    Guenther
    (cherry picked from commit 1a561dedb9995f52411d2fed2c6e0cc1e37a85d1)
    (cherry picked from commit 3bcdab23d9e1304e9a0b306c673107907f2e8307)

commit 5d737da109400b2ee58e2582441bee81627077a3
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 29 22:34:56 2011 +0200

    s3-util: move valid_share_pathname() to lib/util.c
    
    Guenther
    (cherry picked from commit c1f3ff734043082a9488c787324e76a37702f94d)
    (cherry picked from commit bbe4e6d975e7b47179572f103d41d95d1cab6edf)

commit f2b8377ab5165cd64bac4edcb0e36594493aee32
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 29 22:43:59 2011 +0200

    s3-rpc_server: remove proto of nonexisting function
    (rpc_pipe_register_commands).
    
    Guenther
    (cherry picked from commit c6fe379a4637dd1d5db34cbe4f566d3913b21fd2)
    (cherry picked from commit c6e4a26d7b7732130d3b0300e0a84d676d6a81de)

commit 92686c23a1a1e3a4bf18c1100a7ec2fab1985aaf
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 29 15:02:49 2011 +0200

    s3-proto: remove remaining nss_info prototypes to nss_info.h
    
    Guenther
    (cherry picked from commit d6289641f5d421d188c37819f5fe8ceeb5a86aba)
    (cherry picked from commit fb85cf65b0cc36a568df03dd0fbc6a605fa17b08)

commit fb0dfe47872ecabb12da98da7847983c56934f09
Author: Volker Lendecke <vl at samba.org>
Date:   Mon May 16 13:30:26 2011 +0200

    s3: Document gpfs:syncio
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Mon May 16 15:00:40 CEST 2011 on sn-devel-104
    (cherry picked from commit 3358d5a7cae1c2a99495c38069531fc87fe22b24)
    (cherry picked from commit 40d20d13e78868e312201ba4345730fd6ab36b41)

commit d49282bad23d2b5dfee852b8181e5cfb5d500837
Author: Gregor Beck <gbeck at sernet.de>
Date:   Thu May 5 16:28:58 2011 +0200

    gpfs.so: Add gpfs:syncio option
    
    This enables optimizations for shared file access on gpfs
    (cherry picked from commit 2ddfbbbdba0003fda85f2d1c0be87ceca2586e5d)
    (cherry picked from commit 88c14b4a14a7713861443244bac9ff95774e38ed)

commit e7171b54bc179fd465a7d4417929bb769816e868
Author: Christian Ambach <christian.ambach at de.ibm.com>
Date:   Fri May 6 13:16:26 2011 +0200

    s3:libsmb convert user-specified domain to uppercase
    
    with client ntlmv2 auth = yes, there is a small difference between
    using smbclient -U user\domain and smbclient -U user -W domain
    if domain is provided in lowercase
    
    using -W will uppercase the given parameter, while picking the
    domain name from -U will not convert it to uppercase and this
    leads to failing NTLMv2 authentication
    
    with this patch, there is no difference between
    smbclient -U domain\user and smbclient -U user -W domain any more
    
    Autobuild-User: Christian Ambach <ambi at samba.org>
    Autobuild-Date: Mon May 16 11:42:55 CEST 2011 on sn-devel-104
    (cherry picked from commit dae276b5abde77df24f297149267622e7a6dcddb)

commit 1f6990524cf54325cf76ba01bc26e7423895f578
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Mar 19 00:45:56 2011 +0100

    libcli/: Fix prototypes for all functions.(cherry picked from commit fa387825e2a4563ff85267848d8e9d206bf6db96)
    (cherry picked from commit 28cba271e61245b166d002745737c5fedae80c0c)

commit 72e728357b4131b00470f07c48353b3a8bd59fd6
Author: Jeremy Allison <jra at samba.org>
Date:   Thu May 5 11:29:01 2011 -0700

    More const compiler warning fixes.
    (cherry picked from commit 9efea96d16a9f9526669e7d9288902a15d0ee549)
    (cherry picked from commit 62a6ded441247daeb61a36fddc3d7eac8114df9f)

commit 6f08ebf04804a7a36682dfb5b09e43dbf8c2f0d0
Author: Günther Deschner <gd at samba.org>
Date:   Fri May 13 15:03:59 2011 +0200

    s3-net: fix potential crash bug in display_print_driver3().
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Fri May 13 18:49:06 CEST 2011 on sn-devel-104
    (cherry picked from commit 3d100216b84f4f25c3e761741eda2cc134957e96)
    (cherry picked from commit 37a05cbd6d00690542a08556ffc55bf5a3afe7d5)

commit 60f27eec4bf22233eb4318d02d5ac4ca46a1f653
Author: Volker Lendecke <vl at samba.org>
Date:   Sun May 15 23:26:10 2011 +0200

    s3: Fix return check in nss_wins
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Mon May 16 00:30:42 CEST 2011 on sn-devel-104
    (cherry picked from commit 068f847fe2682ab6e356db7b9ae6151f82605f0e)
    (cherry picked from commit 5ad20f61f87618386f343c2aa8c3f3ffe2fefb03)

commit 0749f057417f286300c074223e37288ffbc5678c
Author: Karolin Seeger <kseeger at samba.org>
Date:   Sun May 15 20:13:36 2011 +0200

    WHATSNEW: Add changes since pre3.
    
    Karolin
    (cherry picked from commit 2163261c29e3d0afd7ca9fa4ee4f0befffb83172)

commit 6bc1823b70333edadcea05afc7527ad958f80bc6
Author: Volker Lendecke <vl at samba.org>
Date:   Sat May 14 13:15:19 2011 +0200

    s3: Paranoia in smbsock_connect_state_destructor
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Sat May 14 14:19:01 CEST 2011 on sn-devel-104
    (cherry picked from commit f1cdce6c135574bd0552f1e368c9b47daf633c73)
    (cherry picked from commit affe06f513b94b414b7a8ae5e6ffe6f98fc7706c)

commit 9498f4004f5c73c81ce0f4f2e1872812e6e6954c
Author: Michael Adam <obnox at samba.org>
Date:   Fri May 6 17:10:13 2011 +0200

    s3:build: install libtdb with full version number instead of only SO version
    
    (cherry picked from commit 5bcc0b2138b60fcecea94093ca43aaca4bc4d4ec)
    (cherry picked from commit 087d32cf48018572f7c2f0c355db294bf9792f88)

commit 4e3395d9c7d39f1dee0eaa2b0087ce11c91abf17
Author: Michael Adam <obnox at samba.org>
Date:   Fri May 6 17:10:13 2011 +0200

    s3:build: install libtalloc with full version number instead of only SO version
    (cherry picked from commit 4acb8c3f5976c5496aa666a52cd96739836ced2a)
    (cherry picked from commit 15502f3206a059a2fe7ced52e0450a57e375bd73)

commit 24202dc3bc028b40cf0978ca88fa353bd51ef223
Author: Michael Adam <obnox at samba.org>
Date:   Fri May 6 17:00:32 2011 +0200

    s3:build: build libtalloc.so.$VERSION with full version number instead only SO version
    (cherry picked from commit d04efc703ba0f195fcef832a30b27a160a787413)
    (cherry picked from commit 8cc2dc490a27deda5fdae8aaac00c07ea12a58ec)

commit 7767856051d3701243c66884c8ce339e1fd25c59
Author: Michael Adam <obnox at samba.org>
Date:   Fri May 6 17:00:32 2011 +0200

    s3:build: build libtdb.so.$VERSION with full version number instead only SO version
    (cherry picked from commit 9c76fdd80c93ec23099987b1559f3a3f0f7b6ca5)
    (cherry picked from commit d1682e2d62bc320a419bf768c1d76a29666e7f75)

commit 1a33b35feca456116242f2b5c1d9aa407237f638
Author: Michael Adam <obnox at samba.org>
Date:   Fri May 6 16:43:31 2011 +0200

    s3:build: link libtdb as shared lib if using shared libs at all
    (cherry picked from commit 3f222513cc99b7ce048bcdaa8cc10f7b91616904)
    (cherry picked from commit 43b29fe6affe3dde1cbf191cc9c46d52f83df3db)

commit f0cc71f280c849742682346f2d6fb484bcc60169
Author: Michael Adam <obnox at samba.org>
Date:   Fri May 6 16:42:53 2011 +0200

    s3:build: determine full version of libtdb for the samba build
    (cherry picked from commit 23637b5789a43fe75bb4eadabd33fb321272b42b)
    (cherry picked from commit 095a83d7fbb23c5df5cadf2d9e5136a7fc396a1f)

commit 5e4e2bf9ae1873817985c719579cb1f1a3a36771
Author: Michael Adam <obnox at samba.org>
Date:   Fri May 6 16:42:07 2011 +0200

    s3:build: link libtalloc as shared lib if using shared libs at all
    (cherry picked from commit 6c300ec4b51bfd57837d193f0b17b60cb152fc27)
    (cherry picked from commit a3b058206e3c2f7670083f370d7d4540a0a7e29f)

commit 03656a1d926d2315aec895ab634473a5f42cf9b5
Author: Michael Adam <obnox at samba.org>
Date:   Fri May 6 16:40:59 2011 +0200

    s3:build: determine full version of libtalloc for the samba build
    (cherry picked from commit 472cabbdea3d5def7e7a36b19c5851a0cf0d8d83)
    (cherry picked from commit d579ae8a2a3cad5f953a3587024a398add7ccfea)

commit 8aa69dc1b177487613c1d3a0e7e738381f7daa15
Author: Michael Adam <obnox at samba.org>
Date:   Fri May 6 16:39:03 2011 +0200

    s3:build: fix typo in definition of --enable-external-libtdb
    (cherry picked from commit b731b6e032d9ba1469c349d6c46bd7bb52b18c28)
    (cherry picked from commit c01873ebd9e90572c8e4fab28568328871a12be2)

commit 2faeed5a1cdd4fdfc80ce3f373d04caaba1c04da
Author: Michael Adam <obnox at samba.org>
Date:   Fri May 6 16:38:38 2011 +0200

    s3:build: reformat AC_ARG_ENABLE(external_libtalloc...)
    (cherry picked from commit abef191fb9fa9edbdb68d7cbbf017e1fa74583f2)
    (cherry picked from commit 2eeb5f27a2773972e14a154aac74b8bec136ff50)

commit e6ec1e6111654c76c4fcb983aabd2f5988c77ab5
Author: Michael Adam <obnox at samba.org>
Date:   Fri May 6 12:57:03 2011 +0200

    s3:build: print the full version number in the showlibs targets
    (cherry picked from commit 7e230b31d19fcd37d5765e9649ccfca39af5541d)
    (cherry picked from commit 6a35fc2e50e560d0481b37f509f70d0caa459911)

commit e072b48f109449ff72d1805a4c12798b4780c5d6
Author: Michael Adam <obnox at samba.org>
Date:   Fri May 6 16:37:58 2011 +0200

    s3:build: add LIBWBCLIENT_FULLVER for consistency with SMB_LIBRARY()
    (cherry picked from commit d5d53ba5148d57bae207ded7525a4a38fcb5836f)
    (cherry picked from commit 2a633d1fc0578a943fe689dffea6c3e379820d59)

commit 7333c82174dc01e53f1a98aae0289fd196647092
Author: Michael Adam <obnox at samba.org>
Date:   Fri May 6 12:44:04 2011 +0200

    s3:build: add an optional full version argument to the SMB_LIBRARY() macro.
    (cherry picked from commit adb3fc2f1d85f7621043d087ed2afb0fd053a009)
    (cherry picked from commit a0b51c3ef4a8b606d9464d50cf5ab56952ba508e)

commit c8e15ac9438e9630d79ab9342ac3da4ee7e98a06
Author: Michael Adam <obnox at samba.org>
Date:   Fri May 6 18:35:06 2011 +0200

    s3:configure: add --enable-smbtorture4 switch
    (cherry picked from commit f8e32980f4fab8d6cad5c9f95fab0d1828717cd2)
    (cherry picked from commit 80d05f7c3ca9b1d85f6098d74481cea2cf78258d)

commit 40a112fe20997ea9b3cd4cfd2dedec4e7358bf7c
Author: Simo Sorce <idra at samba.org>
Date:   Fri May 13 16:36:42 2011 -0400

    Fix 3.6 headers
    (cherry picked from commit f07f3d5d11b57321dc0616b88afc78199a59e2d8)

commit 1bb6b8419e9f777ab780e0c41e9a31851832838d
Author: Simo Sorce <idra at samba.org>
Date:   Mon May 9 11:33:41 2011 -0400

    s3-gse: Use gss_get_name_attribute to fetch the pac
    
    This is the only way to be sure the pac signatures are correct.
    It requires a fairly new version of MIT Kerberos, but that should be fine, it
    is new functionality in 3.6 anyways.
    (cherry picked from commit ad8415cb8a7bbd1f653eecce1aa2b88242bcc9e5)

commit 5bae0b6c76448919887fa7a2780254295a85d75e
Author: Karolin Seeger <kseeger at samba.org>
Date:   Fri May 13 21:47:57 2011 +0200

    WHATSNEW: Start 3.6.0rc1 release notes.
    
    Karolin
    (cherry picked from commit 3db72541ac8d5d3036efc563ba67f31559af1723)

commit 684d23bb24620c23bd074cb06b3fc895aa5ddae8
Author: Karolin Seeger <kseeger at samba.org>
Date:   Fri May 13 21:44:45 2011 +0200

    VERSION: Bump version up to 3.6.0rc1.
    
    Karolin
    (cherry picked from commit b3717559a4e5528ed9c5fda0c6e61ce8d45c3bfe)

commit 41c8657c541ccf543d8ad10fc69491fa854d2a29
Author: Simo Sorce <idra at samba.org>
Date:   Wed May 11 16:38:46 2011 -0400

    rpc_server: Always use rpc_pipe_open_interface()
    
    This way we can configure which rpc service we actually want to connect to.
    By default it uses an "embedded" interface and calls rpc_pipe_open_internal()
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Fri May 13 14:40:26 CEST 2011 on sn-devel-104
    (cherry picked from commit d31181214cee1ce459b58f0ca60b40a38f396dac)
    (cherry picked from commit 696cea7d72a30f81fe84aee0eafcd61d9c8a6291)

commit f2bf931daee38d032f56b95bcb79d7c7940baf6e
Author: Michael Adam <obnox at samba.org>
Date:   Wed May 11 16:19:41 2011 +0200

    s3:registry: add a warning debug message when the sorted subkeys is created from key_exists()
    (cherry picked from commit b1fe69df942e6e831e42b84aade0fb74d6bc6a0f)

commit 874881d3b0250620f9e2e94a99b1a44cb86b2681
Author: Michael Adam <obnox at samba.org>
Date:   Wed May 11 15:58:48 2011 +0200

    s3:registry: recreate the sorted subkeys cache when storing keys
    
    This is to avoid turning the next read operation into a write op.
    (cherry picked from commit fc26b96a392f824cf18ab8524a5eaddfd2c03c5c)

commit 8c1db29945a8d833d9b400027382a3ddc0c52b29
Author: Michael Adam <obnox at samba.org>
Date:   Wed May 11 15:27:01 2011 +0200

    s3:registry: add create_sorted_subkeys() to delete and recreate the sorted subkeys key
    
    This is to be used from other places than the key_exists() code path.
    (cherry picked from commit 39bc60c77d5083c5ca68a83f55a3c6efde9b78a7)

commit 3913147532249bfc9aa8165e31822df20bc568d8
Author: Michael Adam <obnox at samba.org>
Date:   Wed May 11 14:53:48 2011 +0200

    s3:registry: turn create_sorted_subkeys_internal to NTSTATUS return type
    
    (from bool)
    (cherry picked from commit 42b3df64d497894b8a45861c54f2958bf3c28e24)

commit 43f0f2823c6ad1a93fcdbd104c22a2c975270a50
Author: Michael Adam <obnox at samba.org>
Date:   Wed May 11 14:49:10 2011 +0200

    s3:registry: rename create_sorted_subkeys() to create_sorted_subkeys_internal()
    (cherry picked from commit 8ea96a246c903d787cc0a79c33ffbce5b0307af8)

commit fecef1ff8000d98a604376f8ba0e19df83a785f5
Author: Michael Adam <obnox at samba.org>
Date:   Wed May 11 14:17:21 2011 +0200

    s3:registry: fix a typo in a debug message
    (cherry picked from commit 1a0a2f35e2bfbc5194de846fde4ae800338b3311)

commit 637bcc5a11d4bcd4a9e8566fc93c895d636fdb29
Author: Günther Deschner <gd at samba.org>
Date:   Fri May 13 00:19:13 2011 +0200

    s3-libnetjoin: fix uninitialized variable.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Fri May 13 01:22:18 CEST 2011 on sn-devel-104
    (cherry picked from commit 62862e27bbf94aa52623f64f17fbda8a2db38095)
    (cherry picked from commit d137081144c61d1b85ac0bb1f7c89fd4d73a4579)

commit b83c69fc9cb08bc633950fdaa0f500217421ca4c
Author: Günther Deschner <gd at samba.org>
Date:   Fri May 13 00:15:41 2011 +0200

    s3-libnetapi/libnetjoin: fix uninitialized variables after the libsmbconf changes.
    
    Guenther
    (cherry picked from commit 04c101e873bd758fae6b7131551f6069ab2fcce3)
    (cherry picked from commit f6f728fa8070a37b90d05e8c7ffbfc6bbfca9fb2)

commit 11d1be14a069abafcd87ccf10b111888ddc07213
Author: Günther Deschner <gd at samba.org>
Date:   Tue May 3 16:25:20 2011 +0200

    s3-includes: move enum flush_reason_enum to smb.h
    
    Guenther
    (cherry picked from commit 89e60556065c6e3dc7a8447cdba5a8fed1d19ea4)
    (cherry picked from commit dde4d22b803177460e87ff3cb925c4831721f70f)

commit 05e05b4d72aeca266033a9858a71eb6ac7e1942f
Author: Günther Deschner <gd at samba.org>
Date:   Thu May 12 17:03:20 2011 +0200

    s3-lib/smbconf: fix uninitialized error code in smbconf_reg_init().
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Thu May 12 18:09:16 CEST 2011 on sn-devel-104
    (cherry picked from commit 7da530e1e42ab15152bc39d4edd4e9a10f091a22)
    (cherry picked from commit 7e68a8a94f645930eda2edd1b61da98eb1d1f834)

commit fd89865a50ad6845afe51585d20d2395471d4568
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 14 11:59:57 2011 +0200

    libsmbconf: Define a doxygen group for libsmbconf.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit e71f9a431b5ad506ab15b616597624d8833e5ff4)

commit d6d0ed030c06a2114bd8035028a16546f8df95c7
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 14 11:54:11 2011 +0200

    libsmbconf: Document smbconf_transaction_cancel().
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 1e8282f45b6e8633c2e25b6484fdb1ce3dfb053a)

commit 1edd2d5377344811589b9075d22d55575f70831f
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 14 11:53:25 2011 +0200

    libsmbconf: Document smbconf_transaction_commit().
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 4e381dc571207df44d8024e7bab83ab116011bea)

commit 3cde147e14e8174deea2115fb901f161bd486fad
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 14 11:52:30 2011 +0200

    libsmbconf: Document smbconf_transaction_start().
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit addb4d3e2305d6ce72d4ccaef7063080acfcbcb0)

commit 3178a3392dde2c2ab820dca1faa8bb399a8097b3
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 14 11:50:05 2011 +0200

    libsmbconf: Document smbconf_delete_global_includes().
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 4a06f0f5651be52f8b000c4968fb2d7617178ba2)

commit 207ab36f08e7c53b98e89682c14570c9c4857b45
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 14 11:49:24 2011 +0200

    libsmbconf: Document smbconf_delete_includes().
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit d5adb46d31a2d0c832d139a6e5f9c7bf2a81b12c)

commit f0e7613ff5da9f3d7fd8024dc2123b99b2c0b2cf
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 14 11:48:15 2011 +0200

    libsmbconf: Document smbconf_set_global_includes().
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 91feef25fda403130beba39d4554cf4873c85ba5)

commit 6df36a873930840945cc8af725a051130c79c871
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 14 11:47:41 2011 +0200

    libsmbconf: Document smbconf_set_includes().
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit fcee6a60428974dfef97ca701de5495d465dd1c1)

commit f53d174728d06d1426c81206072d233d10a3cdcd
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 14 11:45:14 2011 +0200

    libsmbconf: Document smbconf_get_global_includes().
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 3591652d34512b5f583a922f31372ace86674c7e)

commit fd4286af676cf2db5accfe29d930ac7f1dd01223
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 14 11:44:22 2011 +0200

    libsmbconf: Document smbconf_get_includes().
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit bc8a5dfba86dd222c6d96cd7b9a31b49475ce46b)

commit 3deb47a609305470884d63f74870901fd3ce5491
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 14 11:38:31 2011 +0200

    libsmbconf: Document smbconf_delete_global_parameter().
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 799cfd951a796ed75bd75f980bb26dc35b65f29f)

commit 56c373bf6c7b68cf7ba9c11e48af24eb2830e49e
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 14 11:37:59 2011 +0200

    libsmbconf: Document smbconf_delete_parameter().
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit b35b30b3e3162e9895ba6f9e7719d4e0d1ebb4ea)

commit 99e019cfa1f451659d12ca83ece49b45c7776304
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 14 11:36:36 2011 +0200

    libsmbconf: Document smbconf_get_global_parameter().
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 247ad89ee50fd2205cc02eb2f7d8902c1b75a7ad)

commit a315cc58e03ee95c70a84adc8e21aa35966957e7
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 14 11:35:11 2011 +0200

    libsmbconf: Document smbconf_get_parameter().
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 53aa10a277262efd48489fb8eab49b5b4fdb2e39)

commit 06c1ae5ffc22af15f4b526c39d06eee3384c0482
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 14 11:32:06 2011 +0200

    libsmbconf: Document smbconf_set_global_parameter().
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 24af63e25f11fde79b1675f0d3c6e3b10fc69a04)

commit 022888fed80ccdc9aa2f19e649646207399943fe
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 14 11:31:17 2011 +0200

    libsmbconf: Document smbconf_set_parameter().
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 9adfc49801340fb9bb3a1d558387502e232efa2e)

commit 2ce0d467d96e9e5b333c7c91729db1871e335adc
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 14 11:28:00 2011 +0200

    libsmbconf: Document smbconf_delete_share().
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit dc8464b73ce65744b7d57b3fd9db4a0d537fcb8b)

commit e3dbd1dfed8934bbaa6e8ade2eb8d38d59b36896
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 14 11:27:03 2011 +0200

    libsmbconf: Document smbconf_get_share().
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit adc8fef73400095e387061b7ccff81059b117326)

commit 52d0f7b52084d89cf767c7d59a6c5c38e8fa3840
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 14 11:25:07 2011 +0200

    libsmbconf: Document smbconf_create_share().
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit bc30d4bd6b5dba59f284015f7d3e885e4c450db6)

commit 64039f5a47b0398d86f6df9090c6229044261cc6
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 14 11:23:56 2011 +0200

    libsmbconf: Document smbconf_share_exists().
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 315bda5d483fcb18a242236837dedb56ad289b48)

commit e8181a4c66edda0bfce17a4b98a3a07e6ec56254
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 14 11:22:25 2011 +0200

    libsmbconf: Document smbconf_get_share_names().
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 32bafa560b4b76e9f01e1e82fd18168ba4266081)

commit 9ef4f21faf6c3e31afbf96e02ff1ade973caa688
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 14 11:19:36 2011 +0200

    libsmbconf: Document smbconf_get_config().
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 8692501da1bc3823282730588546238fb795df6b)

commit 8ba2f9ca5f9d9408870fc32d7e4cdf279bcf4991
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 14 11:13:49 2011 +0200

    libsmbconf: Document smbconf_drop().
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 256fd665747bdb499381e6146a4a0f06f82fd8e2)

commit 3ec2020bae093c9dd48d79925c8c606e77139aa9
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 14 11:12:27 2011 +0200

    libsmbconf: Document smbconf_changed().
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 1b97a85d0e077e57bc16ffc3c72c03d92474de41)

commit ff36ddaeb88328ab1c07feff7a14f9a078f89703
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 14 11:05:09 2011 +0200

    libsmbconf: Document smbconf_shutdown().
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 62030ee6a7f076220fef0ef290a3c463c9cd9c46)

commit 1596add20558b78463bb82f8e2788432308a29d0
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 14 11:04:15 2011 +0200

    libsmbconf: Document smbconf_is_writeable().
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit e4c38b088e0e873f2f6fac7cc0fe741161f3460a)

commit 3b3b691a297970c22b9103c811c8587c2af7fca0
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 14 11:02:49 2011 +0200

    libsmbconf: Document smbconf_backend_requires_messaging().
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 15d285af2d933a55cf1ac3a4f878691938a825e5)

commit 096eb5295590b6459da78adaea34dcf280dfa000
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Apr 12 11:02:07 2011 +0200

    s3-waf: Create a public libsmconf.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit a6c550259f392b694abbdc645b609b392086710a)

commit e9850416303704c897075e4ba75016385f0d201d
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Apr 12 10:59:20 2011 +0200

    s3-waf: Create a registry private library.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 39874559f6aa066c53f3354006640de2cf6da2e9)

commit 2cda0876e66e21931aa722838b6dfee736cbf09b
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Apr 11 17:43:10 2011 +0200

    libsmbconf: Convert smbconf_get_config() to sbcErr.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 1ff05452834487fd6243810550bc1cfd129fc49e)

commit d9df70ab1140b99165f673f38f045d0822737ef9
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Apr 11 17:24:13 2011 +0200

    libsmbconf: Convert smbconf_transaction_*() to sbcErr.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit ea45d9def1ff704f766694a1059c15fc0301f0c0)

commit 1cca2afb0d805057b1b0d551504f292d1c653ac3
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Apr 11 16:01:22 2011 +0200

    libsmbconf: Convert smbconf_delete_includes() to sbcErr.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 3d8e524e317a46c77d568df99601f545d4dead34)

commit dc3928dd98d082fa50ed99c8d78560e1053e83f8
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Apr 11 15:14:52 2011 +0200

    libsmbconf: Convert smbconf_set_includes() to sbcErr.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 3fcc6ac19a30ae67f8062669a16811768c2c0abd)

commit b507f715f9a215516126b402bc257bc9a7fcf71a
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Apr 11 14:52:52 2011 +0200

    libsmbconf: Convert smbconf_get_includes() to sbcErr.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 8aa9d9ad67c2c14a5139b4d55427a048972f789e)

commit 713b2ae447716138b5c12535e9f50896e9bcbfe7
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Apr 11 14:20:32 2011 +0200

    libsmbconf: Convert smbconf_delete_parameter() to sbcErr.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 48a7ab68261d8cb4d2efa03e141cdff28deb6905)

commit 38aa88602d3943a82a9aa98e384aa7b018e82d76
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Apr 11 13:50:53 2011 +0200

    libsmbconf: Convert smbconf_get_parameter() to sbcErr.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit d3ced52e92d47e766bc1e43ef1a02ec435e2a7f5)

commit 1642245355b4dbb78c563d53ac0b62f69541468f
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Apr 11 13:23:26 2011 +0200

    libsmbconf: Convert smbconf_set_parameter() to sbcErr.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 6eae520879c0a99e6ed7eef005b359e8a3411665)

commit 51ed762f195422a2c04593250e80bfcf782b6588
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Apr 11 11:39:03 2011 +0200

    libsmbconf: Convert smbconf_delete_share() to sbcErr.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 9eb03a5a0a95020e1a374167ce4425b1010ea9c7)

commit cc02bf9e33cf98dcc5cf056a8b69bcad638e23ad
Author: Andreas Schneider <asn at samba.org>
Date:   Fri Apr 8 17:20:35 2011 +0200

    libsmbconf: Convert smbconf_get_share() to sbcErr.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 347e52d94f366ae9d0d4d57b39d127b0ad2ea24e)

commit 66f435f1cab7c45dfb375970b27555537a982497
Author: Andreas Schneider <asn at samba.org>
Date:   Fri Apr 8 15:48:01 2011 +0200

    libsmbconf: Convert smbconf_create_share() to smbErr.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 5d9bbcb724a01325f9bdd469dabbb707d25480bc)

commit ad63c8d04ffe29d970a3f46f2d1ad6e61542cb06
Author: Andreas Schneider <asn at samba.org>
Date:   Fri Apr 8 14:19:15 2011 +0200

    libsmbconf: Convert smbconf_get_share_names() to sbcErr.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit feee7659cbd019f3dd1bf7bf7b4c2d9f82dd6b50)

commit 5d4e88be8f0f38b16459ace9c2d0a3fff3fde725
Author: Andreas Schneider <asn at samba.org>
Date:   Fri Apr 8 10:40:02 2011 +0200

    libsmbconf: Convert smbconf_drop() to sbcErr.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 1ed47a5889a84deb6422b3ed9c7fd5928d171827)

commit 710bf925f601d06363882defe5dd367059fe3720
Author: Andreas Schneider <asn at samba.org>
Date:   Fri Apr 8 10:28:17 2011 +0200

    libsmbconf: Convert smbconf_open() to sbcErr.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit a686e99bf57fa09df10ce863f918850f74308150)

commit b3e413ecd0797fae8a1639727c249e6acfd15899
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 7 17:19:03 2011 +0200

    libsmbconf: Convert smbconf_init() to sbcErr.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit eda9ff5cf4396f12e9d68a01538592823defb743)

commit d9a44fad6c39fefc7b45097414b07526abe74c67
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 7 15:27:52 2011 +0200

    libsmbconf: Added a sbcErrorString() function.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit b34e1768b762ae46e4fe761d9691ed09d285c9a9)
    (cherry picked from commit 74152f42264b507b9e8b5bd6a208331730b9bbec)

commit b6f61b34b5ab96fd86e8bd4a5b63bb2f8f9d95ed
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 7 15:27:26 2011 +0200

    libsmbconf: Introduce a sbcErrType.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 193a07af54184a257ada9401613e1de2e62d60d1)

commit a39f5619bcfc36a2f8c95f6df5a5b4ad61a8621a
Author: Günther Deschner <gd at samba.org>
Date:   Wed May 11 10:30:42 2011 +0200

    s3-printing: make cups_pull_comment_location() work again.
    
    we deal with lp_cups_server in cups_connect() already, inside the URI all our
    other cups functions we use ipp://localhost, do the same here.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Wed May 11 11:36:07 CEST 2011 on sn-devel-104
    (cherry picked from commit f99d6f079a0060e4d08d7384bdf230d4d2c62b86)
    (cherry picked from commit 44a454fe5f1873902995fde1618039092a9b6701)

commit 4f1908669f0764330980803228b30da2036fd934
Author: Günther Deschner <gd at samba.org>
Date:   Tue May 10 15:49:05 2011 +0200

    s3-printing: Fix double free of cups request.
    
    We never free the request in our cups api usage except for here. The reason is
    probably htis (from the cupsDoConnect API docs):
    
    "This function sends the IPP request to the specified server, retrying and
    authenticating as necessary. The request is freed with ippDelete() after
    receiving a valid IPP response."
    
    Revert "Fix a memory leak in cups_pull_comment_location"
    
    This reverts commit fee2664dad37536b05ce8bdae3e74d45b257f632.
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Tue May 10 17:32:58 CEST 2011 on sn-devel-104
    (cherry picked from commit 019f11dd5b3240d05c1abe30dec3d793d6919313)
    (cherry picked from commit 25d7736c82b7f6bcc56fbdec51baeec0f656083d)

commit a84af74902a71ba53343db78ddbfe4f8b4648a1a
Author: Günther Deschner <gd at samba.org>
Date:   Tue May 10 15:48:25 2011 +0200

    s3-printing: very obvious fix for cups_pull_comment_location().
    
    This has been in there since 2008...
    
    Guenther
    (cherry picked from commit 3ba3f68e03510e3bb5b7627c200af0395e853bc2)
    (cherry picked from commit eacf55ce39cf4db9784ee500011f338a71b88c97)

commit dc2c5f361d6afe456e752826c35ff1f9d7230648
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue May 10 14:55:45 2011 +0200

    s3-events: tevent_internal.h is not a public header
    
    We need to use the "foo.h" form instead of the <foo.h> form for
    headers that are not installed publicly. Otherwise when an external
    version of tevent is used we won't find the header and the build will
    fail.
    
    Note that this creates a structure dependency between the
    tevent structures in the external library and the headers in our
    source tree. That is not ideal, but is currently OK as the waf build
    will only use the external library if it is at least the same version
    as the internal tree, which means it will actually be the same
    version, as we release the external version from our tree.
    
    We should come up with a better solution, but for now this allows
    openchange to build again.
    
    Autobuild-User: Andrew Tridgell <tridge at samba.org>
    Autobuild-Date: Tue May 10 16:06:40 CEST 2011 on sn-devel-104
    (cherry picked from commit 628fcd111af9b51020191a6ee916896c127c88c1)
    (cherry picked from commit 6b919c31974be4167f217b720e975c37ee94d6a3)

commit bed4f71c1daecd5de1845481f4ec2319a4ae355a
Author: Volker Lendecke <vl at samba.org>
Date:   Tue May 10 11:05:47 2011 +0200

    s3: Use tevent_req_ntstatus properly in a few places
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Tue May 10 13:11:10 CEST 2011 on sn-devel-104
    (cherry picked from commit 44cc1656276d99816614408b5cd846e6a57eacf0)
    (cherry picked from commit b36fda577867fe612c55b3948b9078b7e644c339)

commit 959f3bcff362231a05824085c04011f193080f64
Author: Volker Lendecke <vl at samba.org>
Date:   Tue May 10 11:05:47 2011 +0200

    s3: Use tevent_req_ntstatus properly in a few places
    (cherry picked from commit 06a2ff579692ea062944e5bd90d3526327004954)
    (cherry picked from commit 708519e14be1fdc0f3686e8ab386c49e58283d6a)

commit 868198b824ddd0e55b726096af83fbed393e7190
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Tue May 10 17:33:11 2011 +0930

    async_smb.c: convert cli->timeout properly
    
    I have a test failure on my 32-bit Ubuntu system, in that
    samba3.smbtorture_s3.plain(s3dc).LOCK9 immediately times out (rather than
    waiting 5 seconds for the child).
    
    Debugging revealed this code: timeout is in ms and is set to > 1000 in
    various places.  The code dates from 2002, and other perturbations didn't
    reveal why it breaks now, but fix it anyway.
    
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
    
    Autobuild-User: Rusty Russell <rusty at rustcorp.com.au>
    Autobuild-Date: Tue May 10 12:09:07 CEST 2011 on sn-devel-104
    (cherry picked from commit 87e35421744df568721a7f9c7fa141d62665d183)
    (cherry picked from commit 76d2ce018a0d164259ab73277af3e2012edcce71)

commit 5f73c0af13b1854e3bf613098196132d7c3d806f
Author: Jeremy Allison <jra at samba.org>
Date:   Fri May 6 07:54:18 2011 -0700

    A couple more off-by-one calculations with strlcpy.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Fri May  6 18:39:17 CEST 2011 on sn-devel-104
    (cherry picked from commit f7b3909103a0acd5ee0426b85112f2c9ed4e7730)
    (cherry picked from commit 38155e2833fc3a19b2fd6e4e35d4fd5711b5785f)

commit 1dd7e85a165a52b977aeff42db62598024e009a8
Author: Günther Deschner <gd at samba.org>
Date:   Wed May 4 18:01:04 2011 +0200

    s3-waf: add vfs_gpfs_hsm_notify to the build.
    
    Volker, can you please check this is correct ?
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Wed May  4 19:03:45 CEST 2011 on sn-devel-104
    (cherry picked from commit 0d1b2d2033e9cc33accea29a4c3a8fafd3d75aa2)
    (cherry picked from commit 65d7144ef5a0498c82ec61d114aaca91b25dc088)

commit 0b4049790e38c84fea1f2c11f4c4b2cffdd4fc36
Author: Günther Deschner <gd at samba.org>
Date:   Thu May 5 12:52:05 2011 +0200

    tdb: fix a build warning.
    
    Guenther
    (cherry picked from commit 73c31f044e32103276558a194698ea6cf876b4f2)
    (cherry picked from commit 43967ee75962fc135fbc045bab87b642947eb644)

commit 6995490bf0f589e72d3641ca1ee80b917d9b36eb
Author: Günther Deschner <gd at samba.org>
Date:   Thu May 5 12:52:29 2011 +0200

    libcli/security: fix build warning, cr_descr_log_acl() is not used currently.
    
    Guenther
    (cherry picked from commit 03b9a9938b934ff774ad49c5b409c7060e66b999)
    (cherry picked from commit 52cbf2f1d671589d2c1d48f3f52fd2f667af02ba)

commit 9cd58a10492146b98361337dd126096550694406
Author: Günther Deschner <gd at samba.org>
Date:   Thu May 5 21:52:57 2011 +0200

    s3-spoolss: remove unused struct in construct_notify_printer_info().
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Fri May  6 12:07:17 CEST 2011 on sn-devel-104
    (cherry picked from commit ab8219a6f39360da742d0f3ca702f2173d798538)
    (cherry picked from commit 68db6bb3d0df017b2ba60b03d585ccdf74558116)

commit dab9adc8a9ba908a89353c69f9be379274d4ac75
Author: Günther Deschner <gd at samba.org>
Date:   Fri May 6 14:03:00 2011 +0200

    s3-proto: remove some duplicate prototypes.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Fri May  6 16:21:08 CEST 2011 on sn-devel-104
    (cherry picked from commit 41134f7f4bb6cd2ff84422782dfb82845d881950)
    (cherry picked from commit dc1219fec7187061f3fda96b157bd7946693ff6e)

commit 311d128dfad186a8070cfd4aa77fe3da147bb858
Author: Volker Lendecke <vl at samba.org>
Date:   Thu May 5 15:09:09 2011 +0200

    s3: Fix a typo
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Thu May  5 16:10:35 CEST 2011 on sn-devel-104
    (cherry picked from commit 1c407da7c357d7cad693a152c0eecafc3dc97c61)
    (cherry picked from commit 922b6a82b644ffc503adaab52ac15694e173c1e3)

commit 423b4cbb4e3e00bea69ddf100359cb34a85591b7
Author: Volker Lendecke <vl at samba.org>
Date:   Thu May 5 12:17:41 2011 +0200

    s3: Fix dup_smb2_vec3
    
    Metze, Jeremy, please check!
    
    Thanks,
    
    Volker
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Thu May  5 13:39:40 CEST 2011 on sn-devel-104
    (cherry picked from commit 82b9fa3a199031217bd98d846f2386b556911fa2)
    (cherry picked from commit da630ba1495ee9adfc62a33e7214a41a8ebdf541)

commit 7d4c0e50e2983cd426082c7abe254e3089686e2a
Author: Jeremy Allison <jra at samba.org>
Date:   Tue May 3 13:57:30 2011 -0700

    Fix off-by-one when used with safe_strcpy.
    (cherry picked from commit 18582016d96e3f41f8828f0539969678ad7d233e)
    (cherry picked from commit c357147e0c40cbe00b0bc0d5f90ac0f4e2ad3ca5)

commit 9e16dd8947e9983116d730300a6491e4ff3ddac8
Author: Jeremy Allison <jra at samba.org>
Date:   Tue May 3 13:49:28 2011 -0700

    BUGFIX when converting from safe_strcpy to strlcpy.
    
    We must have a blob legth > 0 in order to safely copy
    the (possibly) 16 bytes + 1 byte zero character safely.
    (cherry picked from commit 265338c194ceab2520ed1df0f64b62e7169406dd)
    (cherry picked from commit 0692059d162cc146bd8f2cc302b5cba64f049a9a)

commit d70fc03ae20e3ad00f4e10eeabc74a6288b93dc2
Author: Jeremy Allison <jra at samba.org>
Date:   Tue May 3 12:55:42 2011 -0700

    Remove unused function parse_add_domuser().
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Wed May  4 20:05:42 CEST 2011 on sn-devel-104
    (cherry picked from commit 54727f93163f1529eb78dfab5ac605e138391797)
    (cherry picked from commit 17669059110b65b5257fde0ce6262370c7184a5b)

commit b11b1bff94daf598bf3863f45d6d60683b1f67e0
Author: Günther Deschner <gd at samba.org>
Date:   Tue May 3 21:42:04 2011 +0200

    s3-vfs: make vfswrap_llistxattr and vfswrap_flistxattr static.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Wed May  4 12:31:10 CEST 2011 on sn-devel-104
    (cherry picked from commit b8eaec6b666b1f0d3711540c492edd79cd02b1fe)
    (cherry picked from commit cc153ab9cbbc8c0e7328059272a7f287ea95a639)

commit c5f202f7c7f2d8c66bbbe5b4632d8e7ee2f1a577
Author: Volker Lendecke <vl at samba.org>
Date:   Wed May 4 17:48:12 2011 +0200

    Always build before commit ... :-)
    (cherry picked from commit d4d3d7383a9e3c2c0910a848f33755ca54c32b99)
    (cherry picked from commit 55cad002017d25a69de826a7af518c6fcc016d02)

commit 798a885eb73a5660b4d0b23c178003b7145077aa
Author: Volker Lendecke <vl at samba.org>
Date:   Wed May 4 16:02:15 2011 +0200

    RHEL-CTDB: Build vfs_gpfs_hsm_notify
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Wed May  4 17:12:14 CEST 2011 on sn-devel-104
    (cherry picked from commit 3e211510034dd3854017e1b35ef5e1964085df5d)
    (cherry picked from commit ce095f4eb7c9e8814bc4c3c8177a44a3eabd838c)

commit 8eae357b8f30a83c3f91e8c249766cc6b8f62347
Author: Volker Lendecke <vl at samba.org>
Date:   Wed May 4 15:48:27 2011 +0200

    vfs_gpfs: Properly notify the offline->online changes
    
    This needs to be a separate module that cooperates with vfs_gpfs. If aio_fork
    is used early in the module chain it (correctly) does not propagate the aio ops
    down, so vfs_gpfs does not see them. This slim module must come early in the
    chain for notifies to work properly.
    (cherry picked from commit 3f68b43dd56b8f338a18074741162bf6437ae78d)
    (cherry picked from commit a250a9ca068b94267888aa406c14c43a6642eb14)

commit 33eb180bf6b77218eeb861a0556306a5a5569ff2
Author: Volker Lendecke <vl at samba.org>
Date:   Wed May 4 15:47:42 2011 +0200

    vfs_gpfs: Block sendfile for offline files
    (cherry picked from commit 41bde55821a6c18ace24330aede8d4928215e658)
    (cherry picked from commit c2c29533fc4a7467130dff0582249cccc49e001e)

commit ffa20716ba7544543292f1c32b494994ac293503
Author: Volker Lendecke <vl at samba.org>
Date:   Wed May 4 15:42:54 2011 +0200

    vfs_gpfs: Store the winattrs in st.vfs_private
    
    This avoids a considerable amount of gpfs_winattr calls
    (cherry picked from commit 2329fb56a701804585d866817586b4d567966b92)
    (cherry picked from commit 03a9d9dbce61ceb2506a0f193d6407c7d8f4c7e6)

commit de77e9e6d712581ecd42f992621bb2b588be0c30
Author: Volker Lendecke <vl at samba.org>
Date:   Wed May 4 12:11:04 2011 +0200

    s3: Properly deal with exited winbind children
    
    When a winbind child exits, we need to immediately close the socket. If not,
    the next request to that child will be sent to a socket without a listener,
    leading to a failed request. This failed request will then trigger a proper
    re-init.
    
    This patch avoids the one failed request.
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Wed May  4 13:32:16 CEST 2011 on sn-devel-104
    (cherry picked from commit d08414b6799747f224ba02300585c8b15ac6bc0e)
    (cherry picked from commit 2f6e5436a707f4eed15130dff664327352c776fa)

commit a71e74fe263f2c59280c9032a4d399ccbfcee67b
Author: Volker Lendecke <vl at samba.org>
Date:   Tue May 3 21:28:37 2011 +0200

    s3: Filter out duplicates in name_query()
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Wed May  4 00:03:47 CEST 2011 on sn-devel-104
    (cherry picked from commit 7febcb5ffeb2d92f2a4f8abe2c0dac91f5c8a53e)
    (cherry picked from commit 64e7b7bf09940ab67a0beb5d770849f8bf9336e3)

commit 25cf2bcbf5196a3f72063c4da57635211c968946
Author: Günther Deschner <gd at samba.org>
Date:   Tue May 3 16:28:44 2011 +0200

    s3-includes: when MADVISE support was reverted back in 2009, someone forgot this hunk.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Tue May  3 22:06:20 CEST 2011 on sn-devel-104
    (cherry picked from commit c616379e14f7db35429ac849bbc6eb3d4dc641ec)
    (cherry picked from commit c4689460524a88f087a39423bb81ffd61ab885b7)

commit 76b62ee8e6db382ce80645d1801ac4a10d733470
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Apr 20 23:40:30 2011 +0200

    ѕ3/configure: move out generic CPPFLAGS in the solaris case here
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 862ff644ee564b2b3ed316da8c19df2f958aef66)
    (cherry picked from commit 26f6f3bb7f5c79f6a5c95218f37f4f01620b5234)

commit 0055fc9133006b4f95da9a44fd16c93bfb668434
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Apr 20 23:32:12 2011 +0200

    ѕ3/configure: move out generic LDFLAGS in the solaris case here
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 9738f35f2cef0af11c3390162a9c2a3841d6073b)
    (cherry picked from commit ee0a341c8963ed72ccd1799c10567e4f5d400016)

commit 017926fe869b44a6754f5321f1d970bac3886523
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Apr 21 00:11:21 2011 +0200

    s3: reply_readbraw_error needs an sconn as argument also in the non-LFS code path
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User: Björn Jacke <bj at sernet.de>
    Autobuild-Date: Tue May  3 13:04:11 CEST 2011 on sn-devel-104
    (cherry picked from commit cd9a7c143c87fa0f1fda8a6c9b331b21ae6148a2)
    (cherry picked from commit 56d3232ec117d5791c88bc771432ad4f9bfa775f)

commit 5c3838ec0dd021d575d7aded544fb7af825b7344
Author: Volker Lendecke <vl at samba.org>
Date:   Tue May 3 17:04:06 2011 +0200

    s3: Handle EINTR from sys_poll correctly
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Tue May  3 18:06:48 CEST 2011 on sn-devel-104
    (cherry picked from commit 023260487517e835edd7f16c8485f9e84cf44667)
    (cherry picked from commit 67acc4c263f0b3dd4951615e684bfe572f644812)

commit 9fc5c355595e1acf453dca72f276736e94a6d890
Author: Volker Lendecke <vl at samba.org>
Date:   Mon May 2 23:35:06 2011 +0200

    s3: Tune broadcast namequeries for unique names
    
    If we get a unique name via a broadcast query, there's no point in waiting the
    full timeout. A unique name is just what its name says: unique. No point in
    waiting longer.
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Tue May  3 00:57:24 CEST 2011 on sn-devel-104
    (cherry picked from commit 8da8c36b53cc115f0d446b666fc24fc9423d808e)
    (cherry picked from commit 9bffdda7f9b8a7e3e36c07f31fae227e2d8a7570)

commit 80d53db37197a7fb98a3a04044153212ac3fff74
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Apr 30 19:23:55 2011 +0200

    s3: Make name_resolve_bcast return sockaddr_storage
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Sat Apr 30 20:40:46 CEST 2011 on sn-devel-104
    (cherry picked from commit d87427973c0f43d85546f5875b223929ac1a50d4)
    (cherry picked from commit 49bcea3c5022e451402005029c187d7dbac6c761)

commit e90a87e7ebbaec1f97407e0286fd942dc6c1366a
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Apr 30 17:10:35 2011 +0200

    s3: Remove ip_sevice from get_ipc_connect_master_ip
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Sat Apr 30 18:16:28 CEST 2011 on sn-devel-104
    (cherry picked from commit 020b691cf842f30ff42474c2b0102751b5fa17ac)
    (cherry picked from commit ae0436dc7b3cce8fe2e7d9fa5e12deb12cd07f77)

commit 4a5034d8242077f90d7d04534cac492863b05474
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Apr 29 16:18:14 2011 -0700

    Add POSIX O_RDONLY test of a directory for bug #8112 - POSIX extension opens of a directory are denied with EISDIR.
    
    Don't strip access bits from wire flags when opening a directory.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Sat Apr 30 02:21:24 CEST 2011 on sn-devel-104
    (cherry picked from commit de87f549b75d05a1198c490f6aa5c7e62c3fd4a5)
    (cherry picked from commit 498bb38093e91b7d8c555e6ce900bd1af0789e2f)

commit 41cfe2463d29aae65a60c5b5e7ab1da6015d2dde
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Apr 29 16:15:55 2011 -0700

    Fix bug #8112 - POSIX extension opens of a directory are denied with EISDIR.
    
    Ensure create_options are passed down to SMB_VFS_CREATE_FILE().
    Correctly set create_options is SMB_O_DIRECTORY is set or pathname
    is known to be a directory.
    
    Jeremy.
    (cherry picked from commit 2cb53f066e0e42d923be89dd3a7e18ea7a1b7340)
    (cherry picked from commit 1c64ff3b0d5b0379c1b5e6637ccdc67f3caec33f)

commit b3d9ea6c5ad050ff412455df603b6cd0c6e75895
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon May 2 12:41:46 2011 +0200

    s4:libcli/util/nterr: NO_S4U_PROT_SUPPORT and CROSSREALM_DELEGATION_FAILURE
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Mon May  2 15:02:56 CEST 2011 on sn-devel-104
    (cherry picked from commit 6dd97ac093ee00281ed029d549d5882d76c2735d)
    (cherry picked from commit d2c3354f2641350518792f8c10d34323d2053f5c)

commit a5465125163abc6a89007e72a90065b4dd38557e
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon May 2 12:41:46 2011 +0200

    s3:libsmb/nterr: NO_S4U_PROT_SUPPORT and CROSSREALM_DELEGATION_FAILURE
    
    metze
    (cherry picked from commit 76b3867547dd61d4ac9eda1551945c7c76087f4c)
    (cherry picked from commit 38ea4e9526528228f04c362a2b3301f84539663f)

commit 79c1aa4b8b4c13bf7a5e38fe5eec75d715478df7
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon May 2 12:41:46 2011 +0200

    libcli/util/ntstatus: NO_S4U_PROT_SUPPORT and CROSSREALM_DELEGATION_FAILURE
    
    metze
    (cherry picked from commit aae1f86952ceea7be0594ca44bf86536fb9aea37)
    (cherry picked from commit ad8be76e21374df799e6156d013f5f4663c15ddd)

commit 4d6afe9951387ba879815017d25d5cbed9132b7c
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon May 2 13:50:52 2011 +0200

    talloc: use TC_UNDEFINE_SHRINK_CHUNK() instead of TC_INVALIDATE_SHRINK_CHUNK() for realloc path
    
    If we optimize on top of raw realloc() we need
    TC_INVALIDATE_SHRINK_CHUNK together with TC_UNDEFINE_GROW_CHUNK
    (with was missing and caused false positive valgrind warnings).
    
    But that is really slow, as we do a lot of talloc_realloc calls in samba.
    
    That's why we only to TC_UNDEFINE_SHRINK_CHUNK() for now.
    
    metze
    (cherry picked from commit f0f5ac18e55062dcde28003cebc09fa3eb6ae6a5)
    (cherry picked from commit bae2c28276405ff68818a74c140d64101ce72f88)

commit 625ae5393160aa0d1cb564dfd99d89428eb3d4b4
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Apr 29 14:27:45 2011 -0700

    torture test for bug #8111 - CIFS VFS: unexpected error on SMB posix open.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Sat Apr 30 00:33:40 CEST 2011 on sn-devel-104
    (cherry picked from commit 440d71f6c76a4363f69eaf70cada69bdcb98c7bf)
    (cherry picked from commit 187cd188635620ce66740dc0c86f55a211bfb9c7)

commit 248ed5fc151424e4f609cffa1d582e77ecb4eb25
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Apr 29 14:27:32 2011 -0700

    Fix bug 8111 - CIFS VFS: unexpected error on SMB posix open
    
    We are conflating the O_CREAT|O_EXCL with the O_TRUNC
    processing, they need to be separate. We need to chose
    using (O_CREAT|O_EXCL) first, then modify if O_TRUNC is
    set. This needs two separate switch statements.
    
    Jeremy
    (cherry picked from commit 76739435fc8abf1f47193ec4db35a567b564c785)
    (cherry picked from commit c5182ced05e4c259bd93fd6b8fdf84985ea123ad)

commit 5fa2370882af9fe14cec2cbbee8246ff71df03fd
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Apr 29 13:00:14 2011 +0200

    s3: Avoid a potential 100% CPU loop in winbindd
    
    In the clustering case if ctdb is unhappy, winbindd_reinit_after_fork fails.
    This can lead to an endless loop depending on the scheduling of the parent vs
    child. Parent forks, child is immediately scheduled and exits. Parent gets
    SIGCHLD, parent is then scheduled before it sends the request out to the child.
    Parent tries to fork again immediately.
    
    The code before this patch did not really take into account that
    reinit_after_fork can fail. The code now sends the result of
    winbindd_reinit_after_fork to the parent and the parent only considers the
    child alive when it got NT_STATUS_OK.
    
    This was seen in 3.4 winbind. winbind has changed significantly since then, so
    it might be possible that this does not happen anymore in exactly this way. But
    passing up the status of reinit_after_fork and only consider the child alive
    when that's ok is the correct thing to do anyway.
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Fri Apr 29 17:58:19 CEST 2011 on sn-devel-104
    (cherry picked from commit df099e66240c7670c9f7b7dcccb1c38216bac3ec)
    (cherry picked from commit 59d1c3a296cede628b46edb74693e08e7f388c38)

commit 37c56f44044c0765af7c49e172fd5bd8b8e67fd0
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Apr 29 12:53:13 2011 +0200

    s3: Make winbindd_reinit_after_fork return NTSTATUS
    (cherry picked from commit aa5abcaf7e2844e3bd3d8e8fe26488673ad3c00e)
    (cherry picked from commit 31b9258c40365f97fdd707c9756764bc94392726)

commit 59cfa29f2e9a7af55399949a30ab3d7bcf43422d
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Apr 28 13:26:57 2011 +0200

    s3: In winbind, close parent/child sockets
    
    This should further reduce fd load in winbind children
    (cherry picked from commit 0757688eb34ec1a22bf8c28f72416d6684756647)
    (cherry picked from commit 114cc59409932f6afc2149fd758784a8556374e9)

commit 80a15cd7f0f0804354e50e5fbf54ddeec2d56722
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Apr 29 12:00:57 2011 +1000

    s3-smb Use FILE_ATTRIBUTE_ARCHIVE intead of aARCH
    
    This means we use just one constant for this file attribute.
    
    Andrew Bartlett
    (cherry picked from commit 0520da2bbe246c45d89bfdec0d399862ecb867ba)
    (cherry picked from commit a02d91689858e0195f660e9b7f5d88004c06c8e0)

commit a50b81760b6e6a25da2898107e90c6b58dd07865
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Apr 29 11:57:02 2011 +1000

    s3-smb Use FILE_ATTRIBUTE_DIRECTORY intead of aDIR
    
    This means we use just one constant for this file attribute.
    
    Andrew Bartlett
    (cherry picked from commit 0eca33bbf620678759bbe39efaa74f33f96efb74)
    (cherry picked from commit 51023a0d5a46334e6370b9dec9f9722ddb28c1d8)

commit 7aae0e94703a4cb682fdc031cb7bfb6a89713272
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Apr 29 11:52:48 2011 +1000

    s3-smb Use FILE_ATTRIBUTE_VOLUME intead of aVOLID
    
    This means we use just one constant for this file attribute.
    
    Andrew Bartlett
    (cherry picked from commit 08c90d6f2df85499f43c5766a62839e80437290f)
    (cherry picked from commit 6b2730f1c6a32c198fa948749e9aed496e99366c)

commit ca49dfd3a2372eebe2e5d966c13fb53bd0d77f7f
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Apr 29 13:23:14 2011 +1000

    s3-smb Use FILE_ATTRIBUTE_SYSTEM intead of aSYSTEM
    
    This means we use just one constant for this file attribute.
    
    Andrew Bartlett
    (cherry picked from commit 0a3c84b554f3862b3e558f62e67ceb8311b248ce)
    (cherry picked from commit 983e1ac9f0051e924890c64be99c9a4e35ee411a)

commit 2660aa7b02e761190fbb552f07343fa3be3a7f41
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Apr 29 11:43:35 2011 +1000

    s3-smb Use FILE_ATTRIBUTE_HIDDEN intead of aHIDDEN
    
    This means we use just one constant for this file attribute.
    
    Andrew Bartlett
    (cherry picked from commit 317e19aeb3fbdb21573b6ef1bc8c2af646a7e61e)
    (cherry picked from commit a0071e39d67411d578e34a7d03dff9906ff5ea94)

commit b6edae2df2efe5540b15161734227bb84b559997
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Apr 29 11:36:14 2011 +1000

    s3-smb Use FILE_ATTRIBUTE_READONLY intead of aRONLY
    
    This means we use just one constant for this file attribute.
    
    Andrew Bartlett
    (cherry picked from commit 7f66ebde2e2975b079f6c135b131d064dab38624)
    (cherry picked from commit 163267bb107368d5dd457cde5fbad40a6434752e)

commit 4a19fb7a3b2d3c5596e83016a0080ee1aae7a0be
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Apr 29 09:08:20 2011 -0700

    Add FILE_ATTRIBUTE_VOLUME.
    (cherry picked from commit 2805f8596c42f2834db089c6f96a81651db6ad33)

commit 52dc57a9b1581aecbb290cb2ba8b1cbcf2422ebd
Author: Günther Deschner <gd at samba.org>
Date:   Thu Apr 28 17:38:09 2011 +0200

    s3-tevent: only include ../lib/util/tevent wrappers where needed.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Fri Apr 29 14:00:30 CEST 2011 on sn-devel-104
    (cherry picked from commit 50883cfeb4eed3d538f71443060745f8747044c9)
    (cherry picked from commit c3b2d2579e1d7310724a2f9576f6d2af7843d457)

commit 6c2891ed4154bef18da39ef0090c68c44cba7935
Author: Günther Deschner <gd at samba.org>
Date:   Thu Apr 28 17:26:40 2011 +0200

    s3-tsocket: only include ../lib/tsocket/tsocket.h where needed.
    
    Guenther
    (cherry picked from commit 12476223c6aa7473c55bcf529639eefce8450680)
    (cherry picked from commit 0afb13fed8d62fd147d59d14f3028a069203b224)

commit f0e3b9b9cb1242451e30fa85dad640a300d36de3
Author: Günther Deschner <gd at samba.org>
Date:   Thu Apr 28 16:37:05 2011 +0200

    s3-build: remove some unused headers.
    
    Guenther
    (cherry picked from commit bc6f24e89f2dd6204209fc9bacc7bfa9c22d0a57)
    (cherry picked from commit 7ca8ea51f8fc5ca77a27211106007f323857341a)

commit 9685cf6ed89b69cb61c52c274d562aba5431c865
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Apr 27 17:52:30 2011 +0200

    s3: Close the winbind client fds after forking
    
    In an overload situation, the winbind helper child process inherits all those
    hundreds of fd's which it will never talk to. Close them.
    
    We (Christian Ambach and me) just saw a crash in libkrb5. Christian's analysis
    showed that libkrb5 also does select, probably exceeding FD_SETSIZE and
    crashing due to that reason. The parent winbind in theory does not do Kerberos
    at all, so this should fix that problem.
    
    The crash is interesting because the child process did not really crash.
    Somewhere in glibc backtrace() is called, probably due to an assert() or some
    explicit consistency check. This then somehow generates a signal probably due
    to corrupted memory structures. That signal triggers Samba to again call
    backtrace(). This blocks hard on a ptrace_once(). Sorry for the long backtrace
    here, but this *is* interesting.
    
    The child process blocking and not really crashing makes the situation worse:
    The parent process does not get told the child has crashed and more client
    sockets pile up.
    
    This patch is intended to put some relief on this problem by closing the
    majority of sockets the parent holds.
    
    (gdb) bt
    \#0  0x00002ad686a2b07b in pthread_once () from /lib64/libpthread.so.0
    \#1  0x00002ad6867adf87 in backtrace () from /lib64/libc.so.6
    \#2  0x00002ad683eab27c in log_stack_trace () at lib/util.c:1580
    \#3  0x00002ad683eab34b in smb_panic (why=0x2ad6841c6ec3 "internal error") at lib/util.c:1481
    \#4  0x00002ad683e9af3e in fault_report (sig=1) at lib/fault.c:52
    \#5  sig_fault (sig=1) at lib/fault.c:75 #6  <signal handler called>
    \#7  0x00002ad68673b005 in _int_malloc () from /lib64/libc.so.6
    \#8  0x00002ad68673c95d in calloc () from /lib64/libc.so.6
    \#9  0x00002ad684503e25 in _dl_new_object () from /lib64/ld-linux-x86-64.so.2
    \#10 0x00002ad6844ffadc in _dl_map_object_from_fd () from /lib64/ld-linux-x86-64.so.2
    \#11 0x00002ad684501d43 in _dl_map_object () from /lib64/ld-linux-x86-64.so.2
    \#12 0x00002ad68450ac8d in dl_open_worker () from /lib64/ld-linux-x86-64.so.2
    \#13 0x00002ad684506ed6 in _dl_catch_error () from /lib64/ld-linux-x86-64.so.2
    \#14 0x00002ad68450a68c in _dl_open () from /lib64/ld-linux-x86-64.so.2
    \#15 0x00002ad6867d0ba0 in do_dlopen () from /lib64/libc.so.6
    \#16 0x00002ad684506ed6 in _dl_catch_error () from /lib64/ld-linux-x86-64.so.2
    \#17 0x00002ad6867d0d07 in __libc_dlopen_mode () from /lib64/libc.so.6
    \#18 0x00002ad6867adeea in init () from /lib64/libc.so.6
    \#19 0x00002ad686a2b083 in pthread_once () from /lib64/libpthread.so.0
    \#20 0x00002ad6867adf87 in backtrace () from /lib64/libc.so.6
    \#21 0x00002ad68673285f in __libc_message () from /lib64/libc.so.6
    \#22 0x00002ad68673a30f in _int_free () from /lib64/libc.so.6
    \#23 0x00002ad68673a76b in free () from /lib64/libc.so.6
    \#24 0x00002ad6853fe346 in krb5int_sendto () from /usr/lib64/libkrb5.so.3
    \#25 0x00002ad6853fe511 in krb5_sendto_kdc () from /usr/lib64/libkrb5.so.3
    \#26 0x00002ad6853df7c4 in ?? () from /usr/lib64/libkrb5.so.3
    \#27 0x00002ad6853e0919 in krb5_get_init_creds () from /usr/lib64/libkrb5.so.3
    \#28 0x00002ad6853e2a94 in krb5_get_init_creds_password () from /usr/lib64/libkrb5.so.3
    \#29 0x00002ad684169ff1 in kerberos_kinit_password_ext (principal=0x2ad684702180 "<sanitized>", password=0x2ad6844c5bb0 "<sanitized>", time_offset=0, expire_time=0x2ad6846bf380, renew_till_time=0x0, cache_name=0x2ad6843cb3e0 "MEMORY:winbind_ccache", request_pac=false, add_netbios_addr=false, renewable_time=<value optimized out>, ntstatus=0x0) at libads/kerberos.c:223
    \#30 0x00002ad68416a223 in ads_kinit_password (ads=0x2ad6846bf330) at libads/kerberos.c:327
    \#31 0x00002ad68415f725 in ads_sasl_spnego_bind (ads=0x2ad6846bf330) at libads/sasl.c:812
    \#32 0x00002ad68415dbc1 in ads_sasl_bind (ads=0x2ad6846bf330) at libads/sasl.c:1114
    \#33 0x00002ad68415c09b in ads_connect (ads=0x2ad6846bf330) at libads/ldap.c:711
    \#34 0x00002ad683e1b8f7 in ads_cached_connection (domain=0x2ad6846b07c0) at winbindd/winbindd_ads.c:124
    \#35 0x00002ad683e1bc85 in sequence_number (domain=0x2ad6846b07c0, seq=0x2ad6846b0cd8) at winbindd/winbindd_ads.c:1233
    \#36 0x00002ad683dffdd7 in refresh_sequence_number (domain=0x2ad6846b07c0, force=128) at winbindd/winbindd_cache.c:510
    \#37 0x00002ad683e00520 in wcache_fetch (cache=<value optimized out>, domain=0x2ad6846b07c0, format=0x2ad68419901e "U/%s") at winbindd/winbindd_cache.c:638
    \#38 0x00002ad683e04ac8 in query_user (domain=0x2ad6846b07c0, mem_ctx=0x2ad6846bc920, user_sid=0x7fff1d0cb8c0, info=0x7fff1d0cb810) at winbindd/winbindd_cache.c:1910
    \#39 0x00002ad683df2d38 in winbindd_dual_userinfo (domain=0x2ad6846b07c0, state=0x7fff1d0cc9c0) at winbindd/winbindd_user.c:173
    \#40 0x00002ad683e232e0 in fork_domain_child (child=0x2ad6846c2440) at winbindd/winbindd_dual.c:485
    \#41 schedule_async_request (child=0x2ad6846c2440) at winbindd/winbindd_dual.c:319
    \#42 0x00002ad683e229f2 in async_request_fail (state=0x2ad6846c1d00) at winbindd/winbindd_dual.c:214
    \#43 0x00002ad683ebabec in run_events (ev=0x2ad6846aebf0, selrtn=0, read_fds=0x7fff1d0ce910, write_fds=<value optimized out>) at lib/events.c:123
    \#44 0x00002ad683df08cb in process_loop (argc=<value optimized out>, argv=<value optimized out>, envp=<value optimized out>) at winbindd/winbindd.c:1113
    \#45 main (argc=<value optimized out>, argv=<value optimized out>, envp=<value optimized out>) at winbindd/winbindd.c:1437
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Thu Apr 28 12:06:12 CEST 2011 on sn-devel-104
    (cherry picked from commit 2e1522f3785d542c429fce83264ad67f35bcef68)
    (cherry picked from commit 284c00d86265b4f5e9be34e7896ea315d52cf082)

commit b77af2c6d5ea8b0550d245331fa5da19639249b0
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Apr 28 10:12:47 2011 +0200

    s3: Fix a strange German translation
    (cherry picked from commit a672707a185277343e06ca37fe85caf3bbfd6168)
    (cherry picked from commit b71bd9ea78803df88996c283854d357db47704db)

commit bc43238bce6bcbbf1a05e6e5d5a53edf8e0c9f7b
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Apr 27 17:16:36 2011 -0700

    Remove another fstring in this code.
    (cherry picked from commit d808d55af1bf86f2c89078aba8f8d4dbf7282b9f)
    (cherry picked from commit 3d55b6ff8b9a2903b73434fee0a373c122d2bfe1)

commit 12f1b5219b7d8c8d50c7a95111abecf731cfa7d4
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Apr 26 16:31:28 2011 -0700

    Fixup (C) - we've both worked lots on this :-).
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Wed Apr 27 21:56:29 CEST 2011 on sn-devel-104
    (cherry picked from commit af599b3d90e10ea8858bd9ae6b44028c814690c4)
    (cherry picked from commit 4e2dfb0c249723054869fc891b751ecba7dc1571)

commit b92aaf0c8a58928c7ea66cf420ba2561cc82f451
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Apr 27 12:06:25 2011 -0700

    Remove fstrings from client struct. Properly talloc strings (ensuring we never end up with a NULL pointer).
    (cherry picked from commit 1815f0298f33c949f78e181477e8474a37663ccd)
    (cherry picked from commit 9cf389041ccc0605fe22d7f092a33a9bd9e698b3)

commit 601d79aa8031b44ccebe467be85c41157a57e518
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Apr 27 17:02:37 2011 -0700

    s3: Make cli_session_setup_lanman2 async
    (cherry picked from commit a644eff10ef3fee53f4841652f204a124ab73c15)

commit b913536f876f405d1ff2ac4af2186dd680bc223c
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Apr 3 11:44:35 2011 +0200

    s3: Make cli_session_setup_nt1 async
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    (cherry picked from commit 531628e5580b41f693a7dcaeb846fb270752e00d)
    (cherry picked from commit 3f206126825d29df8388dc86c998c8a631af997e)

commit 6ee1ca15a323058eab20426d3a780c1135906787
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Apr 2 23:54:07 2011 +0200

    s3: Make plaintext session setup async
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    (cherry picked from commit 40e2ee9cb622edb85f6c75902f8bd152ff21c7e7)
    (cherry picked from commit b57b711c9cbbd1ed39bc81ecb32b67bfa0ca4d11)

commit 5f5710aa887f67230c8c4444e00c4308adef74f3
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Apr 2 16:44:40 2011 +0200

    s3: Remove cli_write
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    (cherry picked from commit ca9ac7c4c7adc9d726f1fc1fa2b061bd181e3d7a)
    (cherry picked from commit cd31054a5a437c8a7c6b896bf62ca58636ded226)

commit 0679657b138cb7b53811d94114004f35e5f4836b
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Apr 2 11:46:30 2011 +0200

    s3: Use cli_writeall instead of cli_write
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    (cherry picked from commit 0226428eb9d7c6d3a4984d571622f21e9c82e408)
    (cherry picked from commit f7fe965685251e4fd884e8b93a3f28557e53af14)

commit 91a93733141a40737eb0adeeaa5fd9a34cd5a88e
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Apr 26 10:52:39 2011 -0700

    s3: Add cli_writeall
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    (cherry picked from commit d018fccb705e91f33f3211cdc5b8a4006d032f65)
    (cherry picked from commit 3cf133a258ca2e8016ba806eb334e69bfbb169af)

commit c47ed6ae74d11dbedc6757354f68ef7d3c2bf6fe
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Apr 27 22:18:12 2011 +0200

    s3: Properly clean up in pthreadpool_init in case of failure
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Wed Apr 27 23:57:19 CEST 2011 on sn-devel-104
    (cherry picked from commit a8a6433fec0a8dfa6a584cd7b742d469ccfa6273)
    (cherry picked from commit 9078ceb6109a3f375afbcb864307d456bc4057dd)

commit c3c3f830a1a5fade8deb0cedc472fdd99cc861b0
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 27 15:41:49 2011 +0200

    s3-netapi: Fix Coverity CID #2302: FORWARD_NULL
    
    Guenther
    (cherry picked from commit ee0b0dd3a150dea35ef57d5867519a7df382137c)
    (cherry picked from commit 73a5bd3343c54579e0927eefd186f438f9275d85)

commit 13de1ba7bc2c1022ce2a7c8fc71baf0691882843
Author: Samba-JP oota <ribbon at samba.gr.jp>
Date:   Wed Apr 27 09:21:56 2011 +0200

    docs: Fix a bogus )
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Wed Apr 27 10:21:14 CEST 2011 on sn-devel-104
    (cherry picked from commit 9d5138fb2b37c4c7de5d62081e71600096fcf413)
    (cherry picked from commit 5ca46ff1c66e956cf2962773cda0bdbe0e559602)

commit 5d96a8fefb214c7934da9a44ee74d1ba28dee5a2
Author: Christian Ambach <christian.ambach at de.ibm.com>
Date:   Mon Feb 21 18:25:36 2011 +0100

    s3:vfs use gpfs_lib_init
    
    With newer GPFS releases, libgpfs contains a function
    gpfs_lib_init(). It marks the pseudo-device the lib uses
    as interface to the GPFS kernel module to not be to
    destroyed after each call to GPFS.
    This saves us some microseconds creating and removing the device
    each time we do a call to libgpfs.
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Tue Apr 26 20:52:36 CEST 2011 on sn-devel-104
    (cherry picked from commit 7a4cff842d342d77631912fdcee05521506eec52)
    (cherry picked from commit 89e7a97b3a9987e6c921b68335b554473f50cde2)

commit 29688c55885a3a5156a56afaccf3cd29b75795ad
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Apr 25 17:35:44 2011 +0200

    WHATSNEW: %i and %I no langer contain IPv4 mapped IPv6 addresses
    
    metze
    (cherry picked from commit b397f7896e76ead07aed3e6683995b0ede054573)

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

Summary of changes:
 WHATSNEW.txt                                       |   56 +-
 docs-xml/manpages-3/idmap_ad.8.xml                 |    2 +-
 docs-xml/manpages-3/vfs_gpfs.8.xml                 |   20 +
 lib/smbconf/smbconf.c                              |  186 ++--
 lib/smbconf/smbconf.h                              |  438 +++++++-
 lib/smbconf/smbconf_private.h                      |   36 +-
 lib/smbconf/smbconf_txt.c                          |  205 ++--
 lib/smbconf/smbconf_txt.h                          |    2 +-
 lib/smbconf/smbconf_util.c                         |   26 +-
 lib/talloc/talloc.c                                |   37 +-
 lib/tdb/pytdb.c                                    |    1 +
 lib/util/system.c                                  |   72 ++
 lib/util/tdb_wrap.c                                |  194 ++++
 lib/util/tdb_wrap.h                                |   42 +
 lib/util/util.h                                    |   14 +-
 lib/util/util_net.c                                |  155 +++
 lib/util/util_net.h                                |   35 +
 lib/util/util_tdb.h                                |    1 -
 lib/util/wscript_build                             |   10 +
 libcli/auth/schannel_state_tdb.c                   |    4 +-
 libcli/echo/tests/echo.c                           |    2 +
 libcli/named_pipe_auth/npa_tstream.h               |    1 +
 libcli/nbt/dns_hosts_file.c                        |    1 +
 libcli/security/create_descriptor.c                |    2 +
 libcli/security/pysecurity.c                       |    2 +
 libcli/security/secacl.c                           |    1 +
 libcli/util/error.h                                |    2 +
 libcli/util/ntstatus.h                             |    2 +
 libgpo/gpo_fetch.c                                 |    1 +
 librpc/idl/printcap.idl                            |    1 +
 librpc/idl/rap.idl                                 |   22 +
 nsswitch/wins.c                                    |    2 +-
 packaging/RHEL-CTDB/samba.spec.tmpl                |    3 +-
 source3/Makefile.in                                |   94 ++-
 source3/VERSION                                    |    4 +-
 source3/auth/auth_domain.c                         |    1 +
 source3/auth/auth_sam.c                            |    1 -
 source3/auth/auth_server.c                         |    1 +
 source3/auth/auth_unix.c                           |    1 -
 source3/auth/auth_util.c                           |    1 -
 source3/auth/server_info_sam.c                     |    2 -
 source3/auth/token_util.c                          |    1 -
 source3/build/dynconfig.py                         |    1 +
 source3/build/wscript                              |    3 -
 source3/client/client.c                            |   41 +-
 source3/client/client_proto.h                      |    2 +
 source3/client/clitar.c                            |   31 +-
 source3/client/smbspool.c                          |   18 +-
 source3/configure.in                               |   52 +-
 source3/dynconfig.c                                |    1 +
 source3/groupdb/mapping.c                          |    1 +
 source3/groupdb/mapping_tdb.c                      |    5 +-
 source3/include/ads.h                              |    1 +
 source3/include/async_smb.h                        |    2 +-
 source3/include/client.h                           |   12 +-
 source3/include/ctdbd_conn.h                       |    2 +
 source3/include/dbwrap.h                           |    2 +
 source3/include/dynconfig.h                        |    4 +
 source3/include/includes.h                         |   43 +-
 source3/include/krb5_protos.h                      |    6 +
 source3/include/localedir.h                        |    6 -
 source3/include/nss_info.h                         |    7 +
 source3/include/nt_printing.h                      |    6 +-
 source3/include/ntdomain.h                         |   43 +-
 source3/include/printing.h                         |    7 +-
 source3/include/proto.h                            | 1059 +------------------
 source3/include/smb.h                              |   25 +-
 source3/include/smb_macros.h                       |   10 +-
 source3/include/util_tdb.h                         |    8 -
 source3/intl/lang_tdb.c                            |    1 +
 source3/lib/addrchange.c                           |    1 +
 source3/lib/ctdbd_conn.c                           |    1 +
 source3/lib/dbwrap.c                               |    1 +
 source3/lib/dbwrap_ctdb.c                          |    2 +
 source3/lib/dbwrap_tdb.c                           |    1 +
 source3/lib/dbwrap_util.c                          |    1 +
 source3/lib/eventlog/eventlog.c                    |    1 +
 source3/lib/eventlog/eventlog.h                    |    2 +
 source3/lib/events.c                               |    2 +-
 source3/lib/filename_util.c                        |    1 -
 source3/lib/fncall.c                               |    1 +
 source3/lib/g_lock.c                               |    1 +
 source3/lib/gencache.c                             |    1 +
 source3/lib/messages_ctdbd.c                       |    1 +
 source3/lib/messages_local.c                       |    1 +
 source3/lib/netapi/cm.c                            |    1 +
 source3/lib/netapi/localgroup.c                    |    2 +-
 source3/lib/netapi/netapi_private.h                |    2 +
 source3/lib/netapi/serverinfo.c                    |   20 +-
 source3/lib/pthreadpool/pthreadpool.c              |    6 +
 source3/lib/server_mutex.c                         |    2 +
 source3/lib/serverid.c                             |    2 +
 source3/lib/sessionid_tdb.c                        |    1 +
 source3/lib/sharesec.c                             |    1 +
 source3/lib/smbconf/smbconf_init.c                 |   20 +-
 source3/lib/smbconf/smbconf_init.h                 |    2 +-
 source3/lib/smbconf/smbconf_reg.c                  |  399 ++++---
 source3/lib/smbconf/smbconf_reg.h                  |    2 +-
 source3/lib/smbconf/testsuite.c                    |   70 +-
 source3/lib/system.c                               |   80 +--
 source3/lib/talloc_dict.c                          |    1 +
 source3/lib/tdb_validate.c                         |    1 +
 source3/lib/tldap.c                                |    2 +
 source3/lib/util.c                                 |   47 +-
 source3/lib/util_builtin.c                         |    1 -
 source3/lib/util_sid.c                             |    2 +-
 source3/lib/util_sock.c                            |  158 +---
 source3/lib/util_tdb.c                             |  161 +---
 source3/lib/util_tsock.c                           |    2 +
 source3/libads/ads_status.c                        |    1 +
 source3/libads/ads_status.h                        |    4 +
 source3/libads/kerberos_proto.h                    |    2 +
 source3/libads/ldap_printer.c                      |    2 -
 source3/libgpo/gpo_filesync.c                      |    5 +-
 source3/libnet/libnet_dssync_passdb.c              |    2 +-
 source3/libnet/libnet_join.c                       |   80 +-
 source3/libnet/libnet_samsync.c                    |    1 -
 source3/librpc/crypto/gse.c                        |   74 +-
 source3/librpc/crypto/gse.h                        |    3 +-
 source3/librpc/rpc/dcerpc.h                        |   23 +-
 source3/librpc/rpc/dcerpc_ep.c                     |    1 +
 source3/librpc/rpc/dcerpc_helpers.c                |    1 -
 source3/librpc/rpc/rpc_common.c                    |    2 +-
 source3/libsmb/async_smb.c                         |    6 +-
 source3/libsmb/cli_np_tstream.c                    |    3 +-
 source3/libsmb/cliconnect.c                        | 1128 +++++++++++++++-----
 source3/libsmb/clidfs.c                            |    1 +
 source3/libsmb/clidgram.c                          |    2 +
 source3/libsmb/clientgen.c                         |   47 +-
 source3/libsmb/clierror.c                          |    1 +
 source3/libsmb/clifile.c                           |   97 +--
 source3/libsmb/clifsinfo.c                         |    2 +
 source3/libsmb/clilist.c                           |    2 +
 source3/libsmb/climessage.c                        |    2 +
 source3/libsmb/clioplock.c                         |    2 +
 source3/libsmb/cliprint.c                          |    1 +
 source3/libsmb/cliquota.c                          |    1 +
 source3/libsmb/clirap.c                            |    2 +
 source3/libsmb/clirap.h                            |    2 +
 source3/libsmb/clirap2.c                           |    1 +
 source3/libsmb/clireadwrite.c                      |  214 +---
 source3/libsmb/clisecdesc.c                        |    1 +
 source3/libsmb/clisigning.c                        |    1 +
 source3/libsmb/clistr.c                            |    1 +
 source3/libsmb/clitrans.c                          |    2 +
 source3/libsmb/libsmb.h                            |   25 +
 source3/libsmb/libsmb_cache.c                      |    1 +
 source3/libsmb/libsmb_context.c                    |    1 +
 source3/libsmb/libsmb_dir.c                        |   42 +-
 source3/libsmb/libsmb_file.c                       |   15 +-
 source3/libsmb/libsmb_misc.c                       |    1 +
 source3/libsmb/libsmb_printjob.c                   |    1 +
 source3/libsmb/libsmb_server.c                     |    1 +
 source3/libsmb/libsmb_stat.c                       |    1 +
 source3/libsmb/libsmb_xattr.c                      |    1 +
 source3/libsmb/namequery.c                         |   54 +-
 source3/libsmb/nterr.c                             |    2 +
 source3/libsmb/passchange.c                        |    1 +
 source3/libsmb/proto.h                             |  839 +++++++++++++++
 source3/libsmb/samlogon_cache.c                    |    1 +
 source3/libsmb/smb_seal.c                          |    1 +
 source3/libsmb/smb_share_modes.c                   |    1 +
 source3/libsmb/smbsock_connect.c                   |    4 +-
 source3/libsmb/trusts_util.c                       |    1 +
 source3/libsmb/unexpected.c                        |    1 +
 source3/locale/net/de.po                           |    2 +-
 source3/localedir.c                                |    3 -
 source3/locking/locking.c                          |    3 +-
 source3/locking/posix.c                            |    1 +
 source3/m4/aclocal.m4                              |   10 +-
 source3/modules/gpfs.c                             |   18 +
 source3/modules/nfs4_acls.c                        |    1 +
 source3/modules/onefs_acl.c                        |    2 +-
 source3/modules/onefs_open.c                       |   14 +-
 source3/modules/vfs_acl_tdb.c                      |    1 +
 source3/modules/vfs_default.c                      |    4 +-
 source3/modules/vfs_gpfs.c                         |   45 +-
 source3/modules/vfs_gpfs.h                         |    1 +
 source3/modules/vfs_gpfs_hsm_notify.c              |  110 ++
 source3/modules/vfs_xattr_tdb.c                    |    1 +
 source3/modules/wscript_build                      |    8 +
 source3/nmbd/nmbd_elections.c                      |    2 +-
 source3/nmbd/nmbd_incomingdgrams.c                 |   20 +-
 source3/nmbd/nmbd_packets.c                        |   11 +-
 source3/nmbd/nmbd_processlogon.c                   |    2 +-
 source3/nmbd/nmbd_proto.h                          |   22 +-
 source3/nmbd/nmbd_synclists.c                      |    1 +
 source3/nmbd/nmbd_winsserver.c                     |    1 +
 source3/param/loadparm.c                           |   25 +-
 source3/passdb/login_cache.c                       |    1 +
 source3/passdb/machine_account_secrets.c           |    1 +
 source3/passdb/passdb.c                            |    1 +
 source3/passdb/pdb_tdb.c                           |    1 +
 source3/passdb/secrets.c                           |    1 +
 source3/printing/notify.c                          |    1 +
 source3/printing/nt_printing.c                     |   29 +-
 source3/printing/nt_printing_ads.c                 |    1 +
 source3/printing/nt_printing_migrate.c             |    4 +-
 source3/printing/nt_printing_tdb.c                 |    1 +
 source3/printing/pcap.c                            |   24 +-
 source3/printing/pcap.h                            |   12 +-
 source3/printing/print_aix.c                       |    4 +-
 source3/printing/print_cups.c                      |  190 +---
 source3/printing/print_iprint.c                    |    2 +-
 source3/printing/print_standard.c                  |    2 +-
 source3/printing/print_svid.c                      |    2 +-
 source3/printing/printer_list.c                    |   43 +-
 source3/printing/printer_list.h                    |    8 +-
 source3/printing/printing.c                        |    1 +
 source3/printing/printing_db.c                     |    3 +-
 source3/printing/printspoolss.c                    |    1 -
 source3/printing/spoolssd.c                        |    3 +-
 source3/printing/tests/vlp.c                       |    1 +
 source3/registry/reg_backend_db.c                  |   56 +-
 source3/registry/reg_objects.c                     |    1 +
 source3/registry/reg_perfcount.c                   |    1 +
 source3/rpc_client/cli_pipe.c                      |    4 +-
 source3/rpc_client/cli_pipe.h                      |    9 +
 source3/rpc_client/cli_pipe_schannel.c             |    1 +
 source3/rpc_client/cli_spoolss.c                   |    1 -
 source3/rpc_client/cli_winreg_int.c                |    1 -
 source3/rpc_client/cli_winreg_int.h                |    2 +
 source3/rpc_client/rpc_transport_np.c              |    1 +
 source3/rpc_client/rpc_transport_sock.c            |    2 +-
 source3/rpc_client/rpc_transport_tstream.c         |    1 +
 source3/rpc_server/dcesrv_gssapi.c                 |   42 +-
 source3/rpc_server/dfs/srv_dfs_nt.c                |    2 +-
 source3/rpc_server/dssetup/srv_dssetup_nt.c        |    2 +-
 source3/rpc_server/echo/srv_echo_nt.c              |    2 +-
 source3/rpc_server/epmapper/srv_epmapper.c         |    3 +-
 source3/rpc_server/epmd.c                          |    1 +
 source3/rpc_server/eventlog/srv_eventlog_nt.c      |    4 +-
 .../rpc_server/initshutdown/srv_initshutdown_nt.c  |    2 +-
 source3/rpc_server/lsa/srv_lsa_nt.c                |    2 +-
 source3/rpc_server/netlogon/srv_netlog_nt.c        |    4 +-
 source3/rpc_server/ntsvcs/srv_ntsvcs_nt.c          |    2 +-
 source3/rpc_server/rpc_ep_setup.c                  |    3 +
 source3/rpc_server/rpc_ep_setup.h                  |    2 +
 source3/rpc_server/rpc_handles.c                   |    1 +
 source3/rpc_server/rpc_ncacn_np.c                  |   55 +-
 source3/rpc_server/rpc_ncacn_np.h                  |   15 +-
 source3/rpc_server/rpc_server.c                    |    5 +-
 source3/rpc_server/rpc_server.h                    |    2 +
 source3/rpc_server/samr/srv_samr_nt.c              |    3 +-
 source3/rpc_server/spoolss/srv_spoolss_nt.c        |   47 +-
 source3/rpc_server/spoolss/srv_spoolss_nt.h        |   40 +
 source3/rpc_server/spoolss/srv_spoolss_util.c      |    1 -
 source3/rpc_server/srv_pipe.c                      |    3 +-
 source3/rpc_server/srv_pipe.h                      |   33 +
 source3/rpc_server/srv_pipe_hnd.c                  |   10 +-
 source3/rpc_server/srv_pipe_hnd.h                  |   51 +
 source3/rpc_server/srv_pipe_register.c             |    3 +-
 source3/rpc_server/srv_pipe_register.h             |   39 +
 source3/rpc_server/srvsvc/srv_srvsvc_nt.c          |   36 +-
 source3/rpc_server/svcctl/srv_svcctl_nt.c          |    3 +-
 source3/rpc_server/svcctl/srv_svcctl_nt.h          |   33 +
 source3/rpc_server/winreg/srv_winreg_nt.c          |    2 +-
 source3/rpc_server/wkssvc/srv_wkssvc_nt.c          |    2 +-
 source3/rpcclient/cmd_spoolss.c                    |    2 +-
 source3/rpcclient/rpcclient.c                      |    2 +-
 source3/smbd/aio.c                                 |    1 +
 source3/smbd/conn.c                                |    1 +
 source3/smbd/dir.c                                 |    8 +-
 source3/smbd/dosmode.c                             |   90 +-
 source3/smbd/fileio.c                              |    2 +-
 source3/smbd/files.c                               |    1 +
 source3/smbd/globals.c                             |    1 +
 source3/smbd/globals.h                             |    3 +-
 source3/smbd/ipc.c                                 |    1 +
 source3/smbd/lanman.c                              |   20 +-
 source3/smbd/mangle_hash.c                         |    1 +
 source3/smbd/msg_idmap.c                           |    2 -
 source3/smbd/negprot.c                             |    6 +-
 source3/smbd/notify_internal.c                     |    2 +
 source3/smbd/ntquotas.c                            |    1 +
 source3/smbd/nttrans.c                             |    5 +-
 source3/smbd/open.c                                |   44 +-
 source3/smbd/password.c                            |    2 +-
 source3/smbd/pipes.c                               |    1 +
 source3/smbd/process.c                             |    8 +-
 source3/smbd/proto.h                               |    5 +-
 source3/smbd/reply.c                               |   42 +-
 source3/smbd/seal.c                                |    1 +
 source3/smbd/server.c                              |    1 -
 source3/smbd/server_exit.c                         |    2 +-
 source3/smbd/service.c                             |    1 +
 source3/smbd/sesssetup.c                           |    1 +
 source3/smbd/smb2_break.c                          |    1 +
 source3/smbd/smb2_create.c                         |    1 +
 source3/smbd/smb2_find.c                           |    3 +-
 source3/smbd/smb2_flush.c                          |    1 +
 source3/smbd/smb2_getinfo.c                        |    1 +
 source3/smbd/smb2_ioctl.c                          |    2 +
 source3/smbd/smb2_lock.c                           |    1 +
 source3/smbd/smb2_negprot.c                        |    2 +-
 source3/smbd/smb2_notify.c                         |    1 +
 source3/smbd/smb2_read.c                           |    2 +
 source3/smbd/smb2_server.c                         |    3 +-
 source3/smbd/smb2_setinfo.c                        |    1 +
 source3/smbd/smb2_write.c                          |    2 +
 source3/smbd/statcache.c                           |    3 +-
 source3/smbd/trans2.c                              |   93 ++-
 source3/smbd/uid.c                                 |    9 +-
 source3/torture/denytest.c                         |   23 +-
 source3/torture/locktest.c                         |    3 +-
 source3/torture/locktest2.c                        |    3 +-
 source3/torture/mangle_test.c                      |   12 +-
 source3/torture/masktest.c                         |   11 +-
 source3/torture/nbench.c                           |    2 +
 source3/torture/nbio.c                             |   19 +-
 source3/torture/proto.h                            |    2 +
 source3/torture/scanner.c                          |    5 +-
 source3/torture/test_async_echo.c                  |    1 +
 source3/torture/test_case_insensitive.c            |   80 ++
 source3/torture/test_notify_online.c               |  294 +++++
 source3/torture/test_posix_append.c                |   16 +-
 source3/torture/torture.c                          |  478 +++++----
 source3/torture/utable.c                           |   12 +-
 source3/utils/net.c                                |    2 +-
 source3/utils/net.h                                |    3 +-
 source3/utils/net_ads.c                            |    1 +
 source3/utils/net_conf.c                           |  285 +++---
 source3/utils/net_dom.c                            |    1 +
 source3/utils/net_idmap.c                          |    1 +
 source3/utils/net_idmap_check.c                    |    1 +
 source3/utils/net_printing.c                       |    1 +
 source3/utils/net_proto.h                          |    1 +
 source3/utils/net_rap.c                            |    1 +
 source3/utils/net_rpc.c                            |    5 +-
 source3/utils/net_rpc_join.c                       |    1 +
 source3/utils/net_rpc_printer.c                    |   15 +-
 source3/utils/net_rpc_registry.c                   |    1 +
 source3/utils/net_rpc_shell.c                      |    1 +
 source3/utils/net_rpc_trust.c                      |    1 +
 source3/utils/net_time.c                           |    1 +
 source3/utils/net_util.c                           |    1 +
 source3/utils/netlookup.c                          |    1 +
 source3/utils/smbcacls.c                           |    3 +-
 source3/utils/smbcontrol.c                         |    1 +
 source3/utils/smbcquotas.c                         |    1 +
 source3/utils/smbtree.c                            |    1 +
 source3/web/diagnose.c                             |    1 +
 source3/winbindd/idmap_autorid.c                   |    1 +
 source3/winbindd/idmap_tdb.c                       |    1 +
 source3/winbindd/idmap_tdb2.c                      |    1 +
 source3/winbindd/wb_fill_pwent.c                   |    6 +-
 source3/winbindd/wb_getgrsid.c                     |    9 +-
 source3/winbindd/wb_getpwsid.c                     |    9 +-
 source3/winbindd/wb_gettoken.c                     |    9 +-
 source3/winbindd/wb_group_members.c                |   18 +-
 source3/winbindd/wb_lookupname.c                   |    3 +-
 source3/winbindd/wb_lookupsid.c                    |    3 +-
 source3/winbindd/wb_next_grent.c                   |    6 +-
 source3/winbindd/wb_next_pwent.c                   |    3 +-
 source3/winbindd/wb_sid2gid.c                      |    3 +-
 source3/winbindd/wb_sid2uid.c                      |    3 +-
 source3/winbindd/winbindd.c                        |    7 +-
 source3/winbindd/winbindd.h                        |    2 +
 source3/winbindd/winbindd_cache.c                  |    1 +
 source3/winbindd/winbindd_cm.c                     |   25 +-
 source3/winbindd/winbindd_dual.c                   |   60 +-
 source3/winbindd/winbindd_dual_ndr.c               |    2 +-
 source3/winbindd/winbindd_dual_srv.c               |    2 +-
 source3/winbindd/winbindd_getdcname.c              |    3 +-
 source3/winbindd/winbindd_getgrgid.c               |    6 +-
 source3/winbindd/winbindd_getgrnam.c               |    6 +-
 source3/winbindd/winbindd_getgroups.c              |    6 +-
 source3/winbindd/winbindd_getpwent.c               |    3 +-
 source3/winbindd/winbindd_getpwnam.c               |    6 +-
 source3/winbindd/winbindd_getpwsid.c               |    3 +-
 source3/winbindd/winbindd_getpwuid.c               |    6 +-
 source3/winbindd/winbindd_getsidaliases.c          |    3 +-
 source3/winbindd/winbindd_getuserdomgroups.c       |    3 +-
 source3/winbindd/winbindd_getusersids.c            |    3 +-
 source3/winbindd/winbindd_gid_to_sid.c             |    3 +-
 source3/winbindd/winbindd_lookupname.c             |    3 +-
 source3/winbindd/winbindd_lookupsids.c             |    3 +-
 source3/winbindd/winbindd_pam.c                    |    1 -
 source3/winbindd/winbindd_proto.h                  |    4 +-
 source3/winbindd/winbindd_rpc.c                    |    3 -
 source3/winbindd/winbindd_samr.c                   |    3 -
 source3/winbindd/winbindd_show_sequence.c          |    6 +-
 source3/winbindd/winbindd_sid_to_gid.c             |    3 +-
 source3/winbindd/winbindd_sid_to_uid.c             |    3 +-
 source3/winbindd/winbindd_sids_to_xids.c           |    3 +-
 source3/winbindd/winbindd_uid_to_sid.c             |    3 +-
 source3/winbindd/winbindd_util.c                   |   25 -
 source3/wscript                                    |   37 +
 source3/wscript_build                              |   37 +-
 source4/cluster/local.c                            |    2 +-
 source4/lib/messaging/messaging.c                  |    2 +-
 source4/lib/tdb_wrap.c                             |  117 --
 source4/lib/tdb_wrap.h                             |   45 -
 source4/lib/wscript_build                          |    9 -
 source4/libcli/rap/rap.c                           |   47 +
 source4/libcli/util/nterr.c                        |    2 +
 source4/ntvfs/common/brlock_tdb.c                  |    2 +-
 source4/ntvfs/common/notify.c                      |    2 +-
 source4/ntvfs/common/opendb_tdb.c                  |    2 +-
 source4/ntvfs/posix/python/pyxattr_tdb.c           |    2 +-
 source4/ntvfs/posix/vfs_posix.c                    |    2 +-
 source4/ntvfs/posix/xattr_tdb.c                    |    2 +-
 source4/param/secrets.c                            |    2 +-
 source4/selftest/knownfail                         |    1 +
 source4/torture/local/dbspeed.c                    |    2 +-
 source4/torture/rap/rap.c                          |   17 +
 406 files changed, 6230 insertions(+), 4042 deletions(-)
 create mode 100644 lib/util/tdb_wrap.c
 create mode 100644 lib/util/tdb_wrap.h
 delete mode 100644 source3/include/localedir.h
 create mode 100644 source3/libsmb/libsmb.h
 create mode 100644 source3/libsmb/proto.h
 delete mode 100644 source3/localedir.c
 create mode 100644 source3/modules/vfs_gpfs_hsm_notify.c
 create mode 100644 source3/rpc_server/spoolss/srv_spoolss_nt.h
 create mode 100644 source3/rpc_server/srv_pipe.h
 create mode 100644 source3/rpc_server/srv_pipe_hnd.h
 create mode 100644 source3/rpc_server/srv_pipe_register.h
 create mode 100644 source3/rpc_server/svcctl/srv_svcctl_nt.h
 create mode 100644 source3/torture/test_case_insensitive.c
 create mode 100644 source3/torture/test_notify_online.c
 delete mode 100644 source4/lib/tdb_wrap.c
 delete mode 100644 source4/lib/tdb_wrap.h


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index eaeba02..5626691 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,10 +1,10 @@
-                   =================================
-                   Release Notes for Samba 3.6.0pre3
-                            April 26, 2011
-                   =================================
+                   ================================
+                   Release Notes for Samba 3.6.0rc1
+                             May 17, 2011
+                   ================================
 
 
-This is the third preview release of Samba 3.6.0.  This is *not*
+This is the first 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/.
@@ -228,6 +228,10 @@ smb.conf changes
    username map cache time	       New	       0
    winbind max clients		       New	       200
 
+   The variable substitutions for %i and %I no longer
+   use IPv4 addresses mapped to IPv6, e.g. '::ffff:192.168.0.1',
+   if the host has IPv6 enabled. Now %i and %I contain just
+   '192.168.0.1'.
 
 Commit Highlights
 -----------------
@@ -248,6 +252,44 @@ o   Andreas Schneider <asn at samba.org>
     * Add an Endpoint Mapper daemon.
 
 
+Changes since 3.6.0pre3
+-----------------------
+
+o   Jeremy Allison <jra at samba.org>
+    * BUG 8111: CIFS VFS: Fix unexpected error on SMB posix open.
+    * BUG 8112: POSIX extension opens of a directory are denied with EISDIR.
+    * Remove fstrings from client struct.
+    * BUGFIX when converting from safe_strcpy to strlcpy.
+    * Fix off-by-one calculations with strlcpy.
+    * Ensure we always write the correct incoming mid into the share mode table
+      entries.
+    * Fix the SMB2 oplock showstopper.
+
+
+o   Christian Ambach <christian.ambach at de.ibm.com>
+    * Convert user-specified domain to uppercase in libsmb.
+
+
+o   Günther Deschner <gd at samba.org>
+    * BUG 8132: Fix filling printers location field when using cups.
+    * Fix Coverity CID #2302: FORWARD_NULL.
+    * Fix cups_pull_comment_location().
+    * Fix double free of cups request.
+    * Make cups_pull_comment_location() work again.
+    * Fix potential crash bug in display_print_driver3().
+
+
+o   Volker Lendecke <vl at samba.org>
+    * Properly clean up in pthreadpool_init in case of failure.
+    * Make plaintext session setup async.
+    * Reduce fd load in Winbind children.
+    * Avoid a potential 100% CPU loop in Winbind.
+    * Tune broadcast namequeries for unique names.
+    * Properly deal with exited winbind children.
+    * Fix dup_smb2_vec3.
+    * Fix return check in nss_wins.
+
+
 Changes since 3.6.0pre2
 -----------------------
 
@@ -341,10 +383,6 @@ o   Olly Betts <olly at survex.com>
     * Fix 'net usersidlist' not to skip every other user.
 
 
-o   Gregor Beck <gbeck at sernet.de>
-    * Add "net idmap check", a check and repair tool for the
-      id mapping database.
-
 o   Günther Deschner <gd at samba.org>
     * BUG 7690: Retry DNS updates when connection to one nameserver has failed.
     * BUG 7945: Let winbind try to use samlogon validation level 6.
diff --git a/docs-xml/manpages-3/idmap_ad.8.xml b/docs-xml/manpages-3/idmap_ad.8.xml
index 3ecb07e..e628f0c 100644
--- a/docs-xml/manpages-3/idmap_ad.8.xml
+++ b/docs-xml/manpages-3/idmap_ad.8.xml
@@ -34,7 +34,7 @@
 	to configure it separately for each domain for which one wants
 	to use it, using disjoint ranges. One usually needs to configure
 	a writeable default idmap range, using for example the
-	<parameter>tdb</parameter> or <parameter>ldap</parameter>)
+	<parameter>tdb</parameter> or <parameter>ldap</parameter>
 	backend, in order to be able to map the BUILTIN sids and
 	possibly other trusted domains. The writeable default config
 	is also needed in order to be able to create group mappings.
diff --git a/docs-xml/manpages-3/vfs_gpfs.8.xml b/docs-xml/manpages-3/vfs_gpfs.8.xml
index 5f89ffa..a6b3124 100644
--- a/docs-xml/manpages-3/vfs_gpfs.8.xml
+++ b/docs-xml/manpages-3/vfs_gpfs.8.xml
@@ -276,6 +276,26 @@
 		</listitem>
 		</varlistentry>
 
+		<varlistentry>
+		<term>gpfs:syncio = [yes|no]</term>
+		<listitem>
+		<para>This parameter makes Samba open all files with O_SYNC.
+		  This triggers optimizations in GPFS for workloads that
+		  heavily share files.</para>
+
+		<para>Following is the behaviour of Samba for different
+		  values:
+		</para>
+		<itemizedlist>
+		<listitem><para><command>yes</command>Open files with O_SYNC
+		</para></listitem>
+		<listitem><para><command>no (default)</command>Open files as
+		    normal Samba would do
+		</para></listitem>
+		</itemizedlist>
+		</listitem>
+		</varlistentry>
+
 	</variablelist>
 </refsect1>
 
diff --git a/lib/smbconf/smbconf.c b/lib/smbconf/smbconf.c
index 80fe9aa..e0441ed 100644
--- a/lib/smbconf/smbconf.c
+++ b/lib/smbconf/smbconf.c
@@ -27,12 +27,13 @@
  *
  **********************************************************************/
 
-static WERROR smbconf_global_check(struct smbconf_ctx *ctx)
+static sbcErr smbconf_global_check(struct smbconf_ctx *ctx)
 {
 	if (!smbconf_share_exists(ctx, GLOBAL_NAME)) {
 		return smbconf_create_share(ctx, GLOBAL_NAME);
 	}
-	return WERR_OK;
+
+	return SBC_ERR_OK;
 }
 
 
@@ -42,6 +43,41 @@ static WERROR smbconf_global_check(struct smbconf_ctx *ctx)
  *
  **********************************************************************/
 
+const char *sbcErrorString(sbcErr error)
+{
+	switch (error) {
+		case SBC_ERR_OK:
+			return "SBC_ERR_OK";
+		case SBC_ERR_NOT_IMPLEMENTED:
+			return "SBC_ERR_NOT_IMPLEMENTED";
+		case SBC_ERR_NOT_SUPPORTED:
+			return "SBC_ERR_NOT_SUPPORTED";
+		case SBC_ERR_UNKNOWN_FAILURE:
+			return "SBC_ERR_UNKNOWN_FAILURE";
+		case SBC_ERR_NOMEM:
+			return "SBC_ERR_NOMEM";
+		case SBC_ERR_INVALID_PARAM:
+			return "SBC_ERR_INVALID_PARAM";
+		case SBC_ERR_BADFILE:
+			return "SBC_ERR_BADFILE";
+		case SBC_ERR_NO_SUCH_SERVICE:
+			return "SBC_ERR_NO_SUCH_SERVICE";
+		case SBC_ERR_IO_FAILURE:
+			return "SBC_ERR_IO_FAILURE";
+		case SBC_ERR_CAN_NOT_COMPLETE:
+			return "SBC_ERR_CAN_NOT_COMPLETE";
+		case SBC_ERR_NO_MORE_ITEMS:
+			return "SBC_ERR_NO_MORE_ITEMS";
+		case SBC_ERR_FILE_EXISTS:
+			return "SBC_ERR_FILE_EXISTS";
+		case SBC_ERR_ACCESS_DENIED:
+			return "SBC_ERR_ACCESS_DENIED";
+	}
+
+	return "unknown sbcErr value";
+}
+
+
 /**
  * Tell whether the backend requires messaging to be set up
  * for the backend to work correctly.
@@ -91,7 +127,7 @@ bool smbconf_changed(struct smbconf_ctx *ctx, struct smbconf_csn *csn,
 /**
  * Drop the whole configuration (restarting empty).
  */
-WERROR smbconf_drop(struct smbconf_ctx *ctx)
+sbcErr smbconf_drop(struct smbconf_ctx *ctx)
 {
 	return ctx->ops->drop(ctx);
 }
@@ -105,12 +141,12 @@ WERROR smbconf_drop(struct smbconf_ctx *ctx)
  *  param_names  : list of lists of parameter names for each share
  *  param_values : list of lists of parameter values for each share
  */
-WERROR smbconf_get_config(struct smbconf_ctx *ctx,
+sbcErr smbconf_get_config(struct smbconf_ctx *ctx,
 			  TALLOC_CTX *mem_ctx,
 			  uint32_t *num_shares,
 			  struct smbconf_service ***services)
 {
-	WERROR werr = WERR_OK;
+	sbcErr err;
 	TALLOC_CTX *tmp_ctx = NULL;
 	uint32_t tmp_num_shares;
 	char **tmp_share_names;
@@ -118,36 +154,35 @@ WERROR smbconf_get_config(struct smbconf_ctx *ctx,
 	uint32_t count;
 
 	if ((num_shares == NULL) || (services == NULL)) {
-		werr = WERR_INVALID_PARAM;
+		err = SBC_ERR_INVALID_PARAM;
 		goto done;
 	}
 
 	tmp_ctx = talloc_stackframe();
 
-	werr = smbconf_get_share_names(ctx, tmp_ctx, &tmp_num_shares,
-				       &tmp_share_names);
-	if (!W_ERROR_IS_OK(werr)) {
+	err = smbconf_get_share_names(ctx, tmp_ctx, &tmp_num_shares,
+				      &tmp_share_names);
+	if (!SBC_ERROR_IS_OK(err)) {
 		goto done;
 	}
 
 	tmp_services = talloc_array(tmp_ctx, struct smbconf_service *,
 				    tmp_num_shares);
-
 	if (tmp_services == NULL) {
-		werr = WERR_NOMEM;
+		err = SBC_ERR_NOMEM;
 		goto done;
 	}
 
 	for (count = 0; count < tmp_num_shares; count++) {
-		werr = smbconf_get_share(ctx, tmp_services,
-					 tmp_share_names[count],
-					 &tmp_services[count]);
-		if (!W_ERROR_IS_OK(werr)) {
+		err = smbconf_get_share(ctx, tmp_services,
+					tmp_share_names[count],
+					&tmp_services[count]);
+		if (!SBC_ERROR_IS_OK(err)) {
 			goto done;
 		}
 	}
 
-	werr = WERR_OK;
+	err = SBC_ERR_OK;
 
 	*num_shares = tmp_num_shares;
 	if (tmp_num_shares > 0) {
@@ -158,13 +193,13 @@ WERROR smbconf_get_config(struct smbconf_ctx *ctx,
 
 done:
 	talloc_free(tmp_ctx);
-	return werr;
+	return err;
 }
 
 /**
  * get the list of share names defined in the configuration.
  */
-WERROR smbconf_get_share_names(struct smbconf_ctx *ctx,
+sbcErr smbconf_get_share_names(struct smbconf_ctx *ctx,
 			       TALLOC_CTX *mem_ctx,
 			       uint32_t *num_shares,
 			       char ***share_names)
@@ -185,11 +220,11 @@ bool smbconf_share_exists(struct smbconf_ctx *ctx,
 /**
  * Add a service if it does not already exist.
  */
-WERROR smbconf_create_share(struct smbconf_ctx *ctx,
+sbcErr smbconf_create_share(struct smbconf_ctx *ctx,
 			    const char *servicename)
 {
 	if ((servicename != NULL) && smbconf_share_exists(ctx, servicename)) {
-		return WERR_FILE_EXISTS;
+		return SBC_ERR_FILE_EXISTS;
 	}
 
 	return ctx->ops->create_share(ctx, servicename);
@@ -198,7 +233,7 @@ WERROR smbconf_create_share(struct smbconf_ctx *ctx,
 /**
  * get a definition of a share (service) from configuration.
  */
-WERROR smbconf_get_share(struct smbconf_ctx *ctx,
+sbcErr smbconf_get_share(struct smbconf_ctx *ctx,
 			 TALLOC_CTX *mem_ctx,
 			 const char *servicename,
 			 struct smbconf_service **service)
@@ -209,10 +244,10 @@ WERROR smbconf_get_share(struct smbconf_ctx *ctx,
 /**
  * delete a service from configuration
  */
-WERROR smbconf_delete_share(struct smbconf_ctx *ctx, const char *servicename)
+sbcErr smbconf_delete_share(struct smbconf_ctx *ctx, const char *servicename)
 {
 	if (!smbconf_share_exists(ctx, servicename)) {
-		return WERR_NO_SUCH_SERVICE;
+		return SBC_ERR_NO_SUCH_SERVICE;
 	}
 
 	return ctx->ops->delete_share(ctx, servicename);
@@ -221,7 +256,7 @@ WERROR smbconf_delete_share(struct smbconf_ctx *ctx, const char *servicename)
 /**
  * set a configuration parameter to the value provided.
  */
-WERROR smbconf_set_parameter(struct smbconf_ctx *ctx,
+sbcErr smbconf_set_parameter(struct smbconf_ctx *ctx,
 			     const char *service,
 			     const char *param,
 			     const char *valstr)
@@ -235,30 +270,31 @@ WERROR smbconf_set_parameter(struct smbconf_ctx *ctx,
  *
  * This also creates [global] when it does not exist.
  */
-WERROR smbconf_set_global_parameter(struct smbconf_ctx *ctx,
+sbcErr smbconf_set_global_parameter(struct smbconf_ctx *ctx,
 				    const char *param, const char *val)
 {
-	WERROR werr;
+	sbcErr err;
 
-	werr = smbconf_global_check(ctx);
-	if (W_ERROR_IS_OK(werr)) {
-		werr = smbconf_set_parameter(ctx, GLOBAL_NAME, param, val);
+	err = smbconf_global_check(ctx);
+	if (!SBC_ERROR_IS_OK(err)) {
+		return err;
 	}
+	err = smbconf_set_parameter(ctx, GLOBAL_NAME, param, val);
 
-	return werr;
+	return err;
 }
 
 /**
  * get the value of a configuration parameter as a string
  */
-WERROR smbconf_get_parameter(struct smbconf_ctx *ctx,
+sbcErr smbconf_get_parameter(struct smbconf_ctx *ctx,
 			     TALLOC_CTX *mem_ctx,
 			     const char *service,
 			     const char *param,
 			     char **valstr)
 {
 	if (valstr == NULL) {
-		return WERR_INVALID_PARAM;
+		return SBC_ERR_INVALID_PARAM;
 	}
 
 	return ctx->ops->get_parameter(ctx, mem_ctx, service, param, valstr);
@@ -269,26 +305,28 @@ WERROR smbconf_get_parameter(struct smbconf_ctx *ctx,
  *
  * Create [global] if it does not exist.
  */
-WERROR smbconf_get_global_parameter(struct smbconf_ctx *ctx,
+sbcErr smbconf_get_global_parameter(struct smbconf_ctx *ctx,
 				    TALLOC_CTX *mem_ctx,
 				    const char *param,
 				    char **valstr)
 {
-	WERROR werr;
+	sbcErr err;
 
-	werr = smbconf_global_check(ctx);
-	if (W_ERROR_IS_OK(werr)) {
-		werr = smbconf_get_parameter(ctx, mem_ctx, GLOBAL_NAME, param,
-					     valstr);
+	err = smbconf_global_check(ctx);
+	if (!SBC_ERROR_IS_OK(err)) {
+		return err;
 	}
 
-	return werr;
+	err = smbconf_get_parameter(ctx, mem_ctx, GLOBAL_NAME, param,
+				    valstr);
+
+	return err;
 }
 
 /**
  * delete a parameter from configuration
  */
-WERROR smbconf_delete_parameter(struct smbconf_ctx *ctx,
+sbcErr smbconf_delete_parameter(struct smbconf_ctx *ctx,
 				const char *service, const char *param)
 {
 	return ctx->ops->delete_parameter(ctx, service, param);
@@ -299,20 +337,21 @@ WERROR smbconf_delete_parameter(struct smbconf_ctx *ctx,
  *
  * Create [global] if it does not exist.
  */
-WERROR smbconf_delete_global_parameter(struct smbconf_ctx *ctx,
+sbcErr smbconf_delete_global_parameter(struct smbconf_ctx *ctx,
 				       const char *param)
 {
-	WERROR werr;
+	sbcErr err;
 
-	werr = smbconf_global_check(ctx);
-	if (W_ERROR_IS_OK(werr)) {
-		werr = smbconf_delete_parameter(ctx, GLOBAL_NAME, param);
+	err = smbconf_global_check(ctx);
+	if (!SBC_ERROR_IS_OK(err)) {
+		return err;
 	}
+	err = smbconf_delete_parameter(ctx, GLOBAL_NAME, param);
 
-	return werr;
+	return err;
 }
 
-WERROR smbconf_get_includes(struct smbconf_ctx *ctx,
+sbcErr smbconf_get_includes(struct smbconf_ctx *ctx,
 			    TALLOC_CTX *mem_ctx,
 			    const char *service,
 			    uint32_t *num_includes, char ***includes)
@@ -321,72 +360,75 @@ WERROR smbconf_get_includes(struct smbconf_ctx *ctx,
 				      includes);
 }
 
-WERROR smbconf_get_global_includes(struct smbconf_ctx *ctx,
+sbcErr smbconf_get_global_includes(struct smbconf_ctx *ctx,
 				   TALLOC_CTX *mem_ctx,
 				   uint32_t *num_includes, char ***includes)
 {
-	WERROR werr;
+	sbcErr err;
 
-	werr = smbconf_global_check(ctx);
-	if (W_ERROR_IS_OK(werr)) {
-		werr = smbconf_get_includes(ctx, mem_ctx, GLOBAL_NAME,
-					    num_includes, includes);
+	err = smbconf_global_check(ctx);
+	if (!SBC_ERROR_IS_OK(err)) {
+		return err;
 	}
+	err = smbconf_get_includes(ctx, mem_ctx, GLOBAL_NAME,
+				    num_includes, includes);
 
-	return werr;
+	return err;
 }
 
-WERROR smbconf_set_includes(struct smbconf_ctx *ctx,
+sbcErr smbconf_set_includes(struct smbconf_ctx *ctx,
 			    const char *service,
 			    uint32_t num_includes, const char **includes)
 {
 	return ctx->ops->set_includes(ctx, service, num_includes, includes);
 }
 
-WERROR smbconf_set_global_includes(struct smbconf_ctx *ctx,
+sbcErr smbconf_set_global_includes(struct smbconf_ctx *ctx,
 				   uint32_t num_includes,
 				   const char **includes)
 {
-	WERROR werr;
+	sbcErr err;
 
-	werr = smbconf_global_check(ctx);
-	if (W_ERROR_IS_OK(werr)) {
-		werr = smbconf_set_includes(ctx, GLOBAL_NAME,
-					    num_includes, includes);
+	err = smbconf_global_check(ctx);
+	if (!SBC_ERROR_IS_OK(err)) {
+		return err;
 	}
+	err = smbconf_set_includes(ctx, GLOBAL_NAME,
+				   num_includes, includes);
 
-	return werr;
+	return err;
 }
 
 
-WERROR smbconf_delete_includes(struct smbconf_ctx *ctx, const char *service)
+sbcErr smbconf_delete_includes(struct smbconf_ctx *ctx, const char *service)
 {
 	return ctx->ops->delete_includes(ctx, service);
 }
 
-WERROR smbconf_delete_global_includes(struct smbconf_ctx *ctx)
+sbcErr smbconf_delete_global_includes(struct smbconf_ctx *ctx)
 {
-	WERROR werr;


-- 
Samba Shared Repository


More information about the samba-cvs mailing list