Rev 5374: merge from upstream in http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/

Michael Adam ma at sernet.de
Sun Apr 22 12:41:16 GMT 2007


At http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/

------------------------------------------------------------
revno: 5374
revision-id: ma at sernet.de-20070422124102-67e9094fbfe5981d
parent: ma at sernet.de-20070418202513-d3d87f5f21549949
parent: jerry at samba.org-20070422110421-sbhcwh8m0tebhmuq
committer: Michael Adam <ma at sernet.de>
branch nick: SAMBA_3_0-registry.bzr
timestamp: Sun 2007-04-22 14:41:02 +0200
message:
  merge from upstream
removed:
  source/aclocal.m4              aclocal.m4-20060530022638-3fb89200c87ca422
  source/lib/tdb/config.m4       config.m4-20070416111147-cebijg5x16vcb45j-6
  source/lib/tdb/configure.in    configure.in-20070416111147-cebijg5x16vcb45j-8
  source/lib/tdb/include/tdbconfig.h.in tdbconfig.h.in-20070416111147-cebijg5x16vcb45j-30
  source/tests/os2_delete.c      os2_delete.c-20060530101055-fa0c3f1b1f480be3
added:
  source/depcomp                 depcomp-20070422050141-tt0c9ds0hefchj7x-1
  source/include/smb_launchd.h   smb_launchd.h-20070420230506-bzzt0dsivk1lgm0n-1
  source/lib/launchd.c           launchd.c-20070420230507-ha97cifshg7mlomr-1
  source/lib/tdb/config.guess    config.guess-20070419110506-pq8outcletivtrwu-1
  source/lib/tdb/config.sub      config.sub-20070419110507-pmxly4195cl4xbfj-1
  source/lib/tdb/configure.ac    configure.ac-20070419110508-8vrdl3rjzpj4uz8t-1
  source/lib/tdb/install-sh      installsh-20070419110509-3ndwkwz22i8ajppl-1
  source/lib/tdb/libtdb.m4       libtdb.m4-20070419110510-vmfgscdfwgkvndm1-1
  source/m4/                     m4-20070422050141-j0bc2j39llstz3uq-1
  source/m4/aclocal.m4           aclocal.m4-20070422050141-j0bc2j39llstz3uq-2
  source/m4/check_gnu_make.m4    check_gnu_make.m4-20070422050141-j0bc2j39llstz3uq-3
  source/m4/cond.m4              cond.m4-20070422050141-j0bc2j39llstz3uq-4
  source/m4/depend.m4            depend.m4-20070422050141-j0bc2j39llstz3uq-5
  source/m4/depout.m4            depout.m4-20070422050141-j0bc2j39llstz3uq-6
  source/m4/lead-dot.m4          leaddot.m4-20070422050141-j0bc2j39llstz3uq-7
  source/m4/make.m4              make.m4-20070422050141-j0bc2j39llstz3uq-8
  source/m4/substnot.m4          substnot.m4-20070422050141-j0bc2j39llstz3uq-9
  source/modules/exports.darwin  exports.darwin-20070420170459-ent7jugm4534tgby-1
modified:
  REVISION                       REVISION-20060530022625-68239662668b41c3
  packaging/RHEL/samba.spec.tmpl samba.spec.tmpl-20060530085228-4d0ed36104939391
  source/Makefile.in             Makefile.in-20060530022626-b16dac2328ebe703
  source/auth/auth_util.c        auth_util.c-20060530022627-f9a3e5940d409fe9
  source/autogen.sh              autogen.sh-20060530022626-25da70b5021eee1f
  source/client/client.c         client.c-20060530022627-a5e98bdfdd1ca9d9
  source/configure.in            configure.in-20060530022626-07e74bc1e326c82d
  source/include/idmap.h         idmap.h-20060530022627-c79d088835c5affc
  source/include/popt_common.h   popt_common.h-20060530022627-fe1c0417421bdb1e
  source/include/smb.h           smb.h-20060530022627-6c2e6fe4eb631e83
  source/include/smb_macros.h    smb_macros.h-20060530022627-412e2056512de943
  source/lib/replace/test/os2_delete.c os2_delete.c-20060919015053-50coyc2ouwpsm77j-32
  source/lib/talloc/config.mk    config.mk-20060922043319-043mgtqatvgyg13j-12
  source/lib/talloc/talloc.h     talloc.h-20060922043319-043mgtqatvgyg13j-9
  source/lib/talloc/talloc.pc.in talloc.pc.in-20060922043319-043mgtqatvgyg13j-3
  source/lib/talloc/testsuite.c  testsuite.c-20060922043319-043mgtqatvgyg13j-11
  source/lib/tdb/Makefile.in     makefile.in-20070416111147-cebijg5x16vcb45j-2
  source/lib/tdb/autogen.sh      autogen.sh-20070416111147-cebijg5x16vcb45j-4
  source/lib/tdb/config.mk       config.mk-20070416111147-cebijg5x16vcb45j-7
  source/lib/tdb/tdb.pc.in       tdb.pc.in-20070416111147-cebijg5x16vcb45j-12
  source/lib/tdb/tools/tdbdump.c tdbdump.c-20070416111147-cebijg5x16vcb45j-34
  source/lib/util.c              util.c-20060530022627-d569af0e687a4dd3
  source/libsmb/cliconnect.c     cliconnect.c-20060530022627-fb16a3a9bd86c44d
  source/libsmb/clidgram.c       clidgram.c-20060530022627-0d16d2ca1044bd3f
  source/libsmb/clientgen.c      clientgen.c-20060530022627-3aad65ce54001b6b
  source/libsmb/clifile.c        clifile.c-20060530022627-79535ad57010f85a
  source/libsmb/clifsinfo.c      clifsinfo.c-20060530022627-9360212d14f20006
  source/libsmb/clilist.c        clilist.c-20060530022627-d338e7c0adeb8438
  source/libsmb/climessage.c     climessage.c-20060530022627-97758076a9d54da4
  source/libsmb/clioplock.c      clioplock.c-20060530022627-8c80e632958a5611
  source/libsmb/cliprint.c       cliprint.c-20060530022627-f75a028812ceec6b
  source/libsmb/clireadwrite.c   clireadwrite.c-20060530022627-a8f455ef06f01919
  source/libsmb/clitrans.c       clitrans.c-20060530022627-8d4f01dc98138adf
  source/libsmb/errormap.c       errormap.c-20060530022627-f469e8a07ae28ddc
  source/libsmb/namequery.c      namequery.c-20060530022627-feb8b9ada5278003
  source/libsmb/namequery_dc.c   namequery_dc.c-20060530022627-2eeba6818f7fdba2
  source/libsmb/smb_seal.c       smb_seal.c-20070317050048-jthijp4m79ic4h3q-1
  source/nmbd/nmbd.c             nmbd.c-20060530022627-f3b08abf8f3e3c36
  source/nmbd/nmbd_lmhosts.c     nmbd_lmhosts.c-20060530022627-4545207ab7e510ec
  source/nmbd/nmbd_packets.c     nmbd_packets.c-20060530022627-5b449aed1c5a87bf
  source/nsswitch/idmap.c        idmap.c-20061212152801-ke1ub3n5v1jjf8gy-1
  source/nsswitch/idmap_ad.c     idmap_ad.c-20061212152802-3w9k6jbk4ef61xmv-1
  source/nsswitch/idmap_cache.c  idmap_cache.c-20061212152803-7ux8tgbe0zeiy4lo-1
  source/nsswitch/idmap_ldap.c   idmap_ldap.c-20061212152804-ho38ifnk7se3gdfx-1
  source/nsswitch/idmap_nss.c    idmap_nss.c-20061212152805-z05khfnt6imezx17-1
  source/nsswitch/idmap_passdb.c idmap_passdb.c-20061212152806-8pcsukuhpv9e2wk4-1
  source/nsswitch/idmap_rid.c    idmap_rid.c-20061212152807-oje7ib8mg9u2kxxg-1
  source/nsswitch/idmap_tdb.c    idmap_tdb.c-20061212152807-vd9wgefsa63jj0is-1
  source/nsswitch/idmap_util.c   idmap_util.c-20061212152808-3ob6qkx6llnz2sm0-1
  source/nsswitch/pam_winbind.c  pam_winbind.c-20060530022627-0278ec12ab28e3c8
  source/nsswitch/winbindd.c     winbindd.c-20060530022627-8bb76c46bd1253ec
  source/nsswitch/winbindd_dual.c winbindd_dual.c-20060530022627-d241a3ae20234631
  source/nsswitch/winbindd_nss.h winbindd_nss.h-20060530022627-7c181dc4ce97364d
  source/nsswitch/winbindd_sid.c winbindd_sid.c-20060530022627-88ad7ed4dbf383c7
  source/profile/profile.c       profile.c-20060530022627-ce0e772919212dfb
  source/smbd/aio.c              aio.c-20060530065353-839ba30629e9be61
  source/smbd/blocking.c         blocking.c-20060530022627-b43dcc35e2ddb440
  source/smbd/connection.c       connection.c-20060530022627-15ebf52f0bf0bc43
  source/smbd/error.c            error.c-20060530022627-694d205f3c5c4e3e
  source/smbd/ipc.c              ipc.c-20060530022627-701a160811794d2c
  source/smbd/lanman.c           lanman.c-20060530022627-4d3ad959fbca66cf
  source/smbd/message.c          message.c-20060530022627-58d9a000af7f9db2
  source/smbd/negprot.c          negprot.c-20060530022627-a352553cf95f9931
  source/smbd/notify.c           notify.c-20060530022627-f5b19ce2772c47a0
  source/smbd/nttrans.c          nttrans.c-20060530022627-b483806ef6e0e97d
  source/smbd/oplock.c           oplock.c-20060530022627-438ce54295ab823f
  source/smbd/pipes.c            pipes.c-20060530022627-ba74547fa7110e8a
  source/smbd/process.c          process.c-20060530022627-8fe40017fe0e41ff
  source/smbd/reply.c            reply.c-20060530022627-92de20342694c043
  source/smbd/seal.c             seal.c-20070320050326-brtwj05flzzelvyk-1
  source/smbd/server.c           server.c-20060530022627-212a418ec1144979
  source/smbd/sesssetup.c        sesssetup.c-20060530022627-0a6efae905e1529e
  source/smbd/trans2.c           trans2.c-20060530022627-7ce34cd85c3f02f5
  source/utils/net_sam.c         net_sam.c-20060530090229-59cfabf50ff826bc
    ------------------------------------------------------------
    merged: jerry at samba.org-20070422110421-sbhcwh8m0tebhmuq
    parent: jerry at samba.org-20070422110212-s3khtio7afnduz3h
    committer: jerry at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Sun 2007-04-22 06:04:21 -0500
    message:
      jerry at samba.org (r22447)  2007-04-22 05:09:41 -0500 (Sun, 22 Apr 2007)
          
          Patch from Ying Li <ying.li2 at hp.com> to default tdb idmap 
          plugin when neither idmap domains nor idmap backend have 
          been defined.
          
          
          
    ------------------------------------------------------------
    merged: jerry at samba.org-20070422110212-s3khtio7afnduz3h
    parent: jpeach at samba.org-20070422050150-hfsj0mkjzmbbfr0y
    committer: jerry at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Sun 2007-04-22 06:02:12 -0500
    message:
      jerry at samba.org (r22444)  2007-04-22 04:32:14 -0500 (Sun, 22 Apr 2007)
          
          winbindd interface
          
          
          
          
    ------------------------------------------------------------
    merged: jpeach at samba.org-20070422050150-hfsj0mkjzmbbfr0y
    parent: jerry at samba.org-20070421230439-176wm5ijn4we5bzm
    committer: jpeach at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Sun 2007-04-22 00:01:50 -0500
    message:
      jpeach at samba.org (r22441)  2007-04-21 22:17:31 -0500 (Sat, 21 Apr 2007)
          
          Add automatic dependency tracking. The dependency generation is
          toolchain independent, but since there's no portable method for
          doing makefile includes, we can actually use the dependencies with
          GNU make. It's easy to add this for other makes, but I don't have
          any to test.
          
          This also moves as much m4 as possible into the m4 directory where
          no-one has to look at it. AFAICT, there's no way to hide depcomp
          in there too, which is unfortunate.
          
    ------------------------------------------------------------
    merged: jerry at samba.org-20070421230439-176wm5ijn4we5bzm
    parent: idra at samba.org-20070421230213-v7b95zemjtech946
    committer: jerry at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Sat 2007-04-21 18:04:39 -0500
    message:
      jerry at samba.org (r22430)  2007-04-21 16:29:31 -0500 (Sat, 21 Apr 2007)
          
          Add SID validate to sid2uid() and sid2gid() public entry points in winbindd
    ------------------------------------------------------------
    merged: idra at samba.org-20070421230213-v7b95zemjtech946
    parent: jpeach at samba.org-20070420230643-ve9kh5iiw5luajn0
    committer: idra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Sat 2007-04-21 18:02:13 -0500
    message:
      idra at samba.org (r22425)  2007-04-21 15:43:54 -0500 (Sat, 21 Apr 2007)
          
          
          Avoid to segfault if we only have the realm.
          
          
    ------------------------------------------------------------
    merged: jpeach at samba.org-20070420230643-ve9kh5iiw5luajn0
    parent: jpeach at samba.org-20070420230510-vmysae7zx06foswc
    committer: jpeach at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Fri 2007-04-20 18:06:43 -0500
    message:
      jpeach at samba.org (r22419)  2007-04-20 16:31:04 -0500 (Fri, 20 Apr 2007)
          
          Update configure so that we only need one copy of os2_delete.c
          
    ------------------------------------------------------------
    merged: jpeach at samba.org-20070420230510-vmysae7zx06foswc
    parent: jpeach at samba.org-20070420230334-1ftv086xt7kmwwmr
    committer: jpeach at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Fri 2007-04-20 18:05:10 -0500
    message:
      jpeach at samba.org (r22418)  2007-04-20 16:09:44 -0500 (Fri, 20 Apr 2007)
          
          Support running under launchd. We abstract the method of obtaining
          sockets to listen on a little, because in the launchd case these
          are provided for us. We also add an idle timeout so that a daemon
          can exit after a period of inactivity.
          
    ------------------------------------------------------------
    merged: jpeach at samba.org-20070420230334-1ftv086xt7kmwwmr
    parent: jpeach at samba.org-20070420230146-4lqaxr71n5kram7x
    committer: jpeach at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Fri 2007-04-20 18:03:34 -0500
    message:
      jpeach at samba.org (r22417)  2007-04-20 13:34:33 -0500 (Fri, 20 Apr 2007)
          
          Refactor the various daemon run-mode options to make the semantics
          of the various flags explicit.
          
    ------------------------------------------------------------
    merged: jpeach at samba.org-20070420230146-4lqaxr71n5kram7x
    parent: jpeach at samba.org-20070420170502-8tw9exw8ct3hm5ze
    committer: jpeach at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Fri 2007-04-20 18:01:46 -0500
    message:
      jpeach at samba.org (r22416)  2007-04-20 13:12:07 -0500 (Fri, 20 Apr 2007)
          
          Remove precompiled headers on clean.
          
    ------------------------------------------------------------
    merged: jpeach at samba.org-20070420170502-8tw9exw8ct3hm5ze
    parent: obnox at samba.org-20070420170334-avw309na62dg22b6
    committer: jpeach at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Fri 2007-04-20 12:05:02 -0500
    message:
      jpeach at samba.org (r22413)  2007-04-20 11:07:16 -0500 (Fri, 20 Apr 2007)
          
          Simplify the build rules for plugin modules. Add support for per-platform
          exports files. Fix the shared library build pf pdb_ldap.
          
    ------------------------------------------------------------
    merged: obnox at samba.org-20070420170334-avw309na62dg22b6
    parent: obnox at samba.org-20070420170155-37z23f88zlhwbo2f
    committer: obnox at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Fri 2007-04-20 12:03:34 -0500
    message:
      obnox at samba.org (r22412)  2007-04-20 07:23:36 -0500 (Fri, 20 Apr 2007)
          
          Add a "deletelocalgroup" subcommand to net sam.
          
          Thanks to Karolin Seeger <ks at sernet.de>.
          
          
    ------------------------------------------------------------
    merged: obnox at samba.org-20070420170155-37z23f88zlhwbo2f
    parent: gd at samba.org-20070420110457-1icsd6idfq9vncxe
    committer: obnox at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Fri 2007-04-20 12:01:55 -0500
    message:
      obnox at samba.org (r22411)  2007-04-20 07:06:38 -0500 (Fri, 20 Apr 2007)
          
          Fix the build:
          
          Prototype of create_aio_ex_read, set_message and definition of
          UNIXERROR have changed in r22389 and r22391? to require an additional
          "inbuf" argument. Some places in smbd/aio.c had not been adapted.
          
          This patch fixes the build.
          
          Michael
          
          
    ------------------------------------------------------------
    merged: gd at samba.org-20070420110457-1icsd6idfq9vncxe
    parent: obnox at samba.org-20070420110228-jifif258kj8kxn5y
    committer: gd at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Fri 2007-04-20 06:04:57 -0500
    message:
      gd at samba.org (r22402)  2007-04-20 05:54:55 -0500 (Fri, 20 Apr 2007)
          
          Fix build warning.
          
          Guenther
          
    ------------------------------------------------------------
    merged: obnox at samba.org-20070420110228-jifif258kj8kxn5y
    parent: herb at samba.org-20070420050637-8mb7c1hdtll9mzot
    committer: obnox at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Fri 2007-04-20 06:02:28 -0500
    message:
      obnox at samba.org (r22401)  2007-04-20 05:27:33 -0500 (Fri, 20 Apr 2007)
          
          
          Add bzr revision+nick support to mkversion.sh.
          
          The plan is to actually synchronize with SAMBA_4_0's mkversion.sh,
          which is more elaborate. But there are a few differences in 
          behaviour I still have to check. So I am cheching this here in for
          a start...
          
          Michael
          
          
    ------------------------------------------------------------
    merged: herb at samba.org-20070420050637-8mb7c1hdtll9mzot
    parent: jpeach at samba.org-20070420050509-fee8tzn3hksn0937
    committer: herb at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Fri 2007-04-20 00:06:37 -0500
    message:
      herb at samba.org (r22395)  2007-04-19 20:52:44 -0500 (Thu, 19 Apr 2007)
          
          allow profiling level to be set on startup
          
    ------------------------------------------------------------
    merged: jpeach at samba.org-20070420050509-fee8tzn3hksn0937
    parent: idra at samba.org-20070420050342-3oog8s17srxqj9lf
    committer: jpeach at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Fri 2007-04-20 00:05:09 -0500
    message:
      jpeach at samba.org (r22394)  2007-04-19 18:47:55 -0500 (Thu, 19 Apr 2007)
          
          Remove test directory once we are finished.
          
    ------------------------------------------------------------
    merged: idra at samba.org-20070420050342-3oog8s17srxqj9lf
    parent: idra at samba.org-20070420050157-lpxrs7we846hvinv
    committer: idra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Fri 2007-04-20 00:03:42 -0500
    message:
      idra at samba.org (r22393)  2007-04-19 18:25:37 -0500 (Thu, 19 Apr 2007)
          
          
          fix cut&paste error
          
          
    ------------------------------------------------------------
    merged: idra at samba.org-20070420050157-lpxrs7we846hvinv
    parent: jra at samba.org-20070419230658-hpiwortybnx5w4wk
    committer: idra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Fri 2007-04-20 00:01:57 -0500
    message:
      idra at samba.org (r22392)  2007-04-19 18:15:33 -0500 (Thu, 19 Apr 2007)
          
          
          Remove leftover potentially segfaulty code.
          Check we are online before actually trying to connect anywhere
          
          
    ------------------------------------------------------------
    merged: jra at samba.org-20070419230658-hpiwortybnx5w4wk
    parent: jerry at samba.org-20070419230518-lko7wfvbol6w0awy
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Thu 2007-04-19 18:06:58 -0500
    message:
      jra at samba.org (r22391)  2007-04-19 17:40:32 -0500 (Thu, 19 Apr 2007)
          
          Looks bigger than it is. Make "inbuf" available
          to all callers of smb_setlen (via set_message()
          calls). This will allow the server to reflect back
          the correct encryption context.
          Jeremy.
          
    ------------------------------------------------------------
    merged: jerry at samba.org-20070419230518-lko7wfvbol6w0awy
    parent: jra at samba.org-20070419230347-m57v6lk1ikub5r98
    committer: jerry at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Thu 2007-04-19 18:05:18 -0500
    message:
      jerry at samba.org (r22390)  2007-04-19 17:26:09 -0500 (Thu, 19 Apr 2007)
          
          Patchset sent to samba-technical to address the winbind 
          loop when allocating a new id for a SID:
          
          
          auth_util.patch		Revert create_local_token() to
          the 3.0.24 codebase
          
          idmap_type.patch	Have the caller fillin the
          id_map.xid.type field when
          resolving a SID so that if we allocate
          a new id, we know what type to use
          
          winbindd_api.patch	Remove the WINBINDD_SIDS_TO_XIDS calls
          from the public winbindd interface
          for the 3.0.25 release
          
          idmap_rid.patch		Cleanup the idmap_rid backend to not
          call back into winbindd to resolve
          the SID in order to verify it's type.
          
          
          
          
          
          
    ------------------------------------------------------------
    merged: jra at samba.org-20070419230347-m57v6lk1ikub5r98
    parent: idra at samba.org-20070419230201-wxchng3d55kx06i7
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Thu 2007-04-19 18:03:47 -0500
    message:
      jra at samba.org (r22389)  2007-04-19 15:50:49 -0500 (Thu, 19 Apr 2007)
          
          Start preparing for multiple encryption contexts in the
          server. Allow server to reflect back to calling client
          the encryption context that was sent.
          Jeremy.
          
    ------------------------------------------------------------
    merged: idra at samba.org-20070419230201-wxchng3d55kx06i7
    parent: gd at samba.org-20070419170318-hy5qc7c9so2v3d6d
    committer: idra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Thu 2007-04-19 18:02:01 -0500
    message:
      idra at samba.org (r22388)  2007-04-19 15:00:40 -0500 (Thu, 19 Apr 2007)
          
          clearer message, thanks David
    ------------------------------------------------------------
    merged: gd at samba.org-20070419170318-hy5qc7c9so2v3d6d
    parent: metze at samba.org-20070419110642-5es3ntce7rysad2q
    committer: gd at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Thu 2007-04-19 12:03:18 -0500
    message:
      gd at samba.org (r22376)  2007-04-19 09:58:22 -0500 (Thu, 19 Apr 2007)
          
          Make sure we use krb5 when we identify just an older heimdal lib (0.6.x)
          Timur, please check.
          
          Guenther
          
    ------------------------------------------------------------
    merged: metze at samba.org-20070419110642-5es3ntce7rysad2q
    parent: metze at samba.org-20070419110512-3xr7c7isicwg3ii7
    committer: metze at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Thu 2007-04-19 06:06:42 -0500
    message:
      metze at samba.org (r22366)  2007-04-19 04:08:53 -0500 (Thu, 19 Apr 2007)
          
          sync lib/talloc/ with samba4
          
          metze
    ------------------------------------------------------------
    merged: metze at samba.org-20070419110512-3xr7c7isicwg3ii7
    parent: metze at samba.org-20070419110333-e30ljdn4aeqyffa6
    committer: metze at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Thu 2007-04-19 06:05:12 -0500
    message:
      metze at samba.org (r22364)  2007-04-19 03:50:14 -0500 (Thu, 19 Apr 2007)
          
          sync lib/tdb/ with samba4
          
          there's no code change here...
          
          metze
    ------------------------------------------------------------
    merged: metze at samba.org-20070419110333-e30ljdn4aeqyffa6
    parent: metze at samba.org-20070419110153-zm5tmn9zvl0v1y48
    committer: metze at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Thu 2007-04-19 06:03:33 -0500
    message:
      metze at samba.org (r22363)  2007-04-19 03:49:09 -0500 (Thu, 19 Apr 2007)
          
          merge from samba4:
          
          fix compiler warning
          
          metze
    ------------------------------------------------------------
    merged: metze at samba.org-20070419110153-zm5tmn9zvl0v1y48
    parent: jra at samba.org-20070419051104-28wtkfie6uguze6o
    committer: metze at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Thu 2007-04-19 06:01:53 -0500
    message:
      metze at samba.org (r22362)  2007-04-19 03:45:29 -0500 (Thu, 19 Apr 2007)
          
          fix the build on othersystems
          
          metze
    ------------------------------------------------------------
    merged: jra at samba.org-20070419051104-28wtkfie6uguze6o
    parent: jra at samba.org-20070419050936-aahppom8qnzoa4bf
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Thu 2007-04-19 00:11:04 -0500
    message:
      jra at samba.org (r22358)  2007-04-18 20:26:38 -0500 (Wed, 18 Apr 2007)
          
          Use gss error to NTSTATUS mapping function for errors.
          Jeremy.
          
    ------------------------------------------------------------
    merged: jra at samba.org-20070419050936-aahppom8qnzoa4bf
    parent: jra at samba.org-20070419050808-buyj0968zuljadwe
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Thu 2007-04-19 00:09:36 -0500
    message:
      jra at samba.org (r22355)  2007-04-18 20:20:37 -0500 (Wed, 18 Apr 2007)
          
          Ensure we get good debug messages from gss_XX calls.
          Jeremy.
          
    ------------------------------------------------------------
    merged: jra at samba.org-20070419050808-buyj0968zuljadwe
    parent: jra at samba.org-20070419050624-j6n7gjd90msksxlr
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Thu 2007-04-19 00:08:08 -0500
    message:
      jra at samba.org (r22354)  2007-04-18 19:51:18 -0500 (Wed, 18 Apr 2007)
          
          Make client select krb5 encrpyt if krb5 already on.
          Jeremy.
          
    ------------------------------------------------------------
    merged: jra at samba.org-20070419050624-j6n7gjd90msksxlr
    parent: jra at samba.org-20070419050457-16iziid83jeoyymu
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Thu 2007-04-19 00:06:24 -0500
    message:
      jra at samba.org (r22353)  2007-04-18 19:45:01 -0500 (Wed, 18 Apr 2007)
          
          Fix bad #ifdefs.
          Jeremy.
          
    ------------------------------------------------------------
    merged: jra at samba.org-20070419050457-16iziid83jeoyymu
    parent: jra at samba.org-20070419050331-bkg4pc8gtvurjylt
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Thu 2007-04-19 00:04:57 -0500
    message:
      jra at samba.org (r22352)  2007-04-18 19:44:39 -0500 (Wed, 18 Apr 2007)
          
          Wow - working gss SMB sealing !
          Jeremy.
          
    ------------------------------------------------------------
    merged: jra at samba.org-20070419050331-bkg4pc8gtvurjylt
    parent: jra at samba.org-20070419050154-nxj0qnetfgrbk0m5
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Thu 2007-04-19 00:03:31 -0500
    message:
      jra at samba.org (r22351)  2007-04-18 19:40:08 -0500 (Wed, 18 Apr 2007)
          
          Making progress in tests...
          Jeremy.
          
    ------------------------------------------------------------
    merged: jra at samba.org-20070419050154-nxj0qnetfgrbk0m5
    parent: jra at samba.org-20070418231422-bhizy3nvffsmapjo
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Thu 2007-04-19 00:01:54 -0500
    message:
      jra at samba.org (r22350)  2007-04-18 19:35:18 -0500 (Wed, 18 Apr 2007)
          
          Add some helpful debug messages.
          Jeremy.
          
    ------------------------------------------------------------
    merged: jra at samba.org-20070418231422-bhizy3nvffsmapjo
    parent: idra at samba.org-20070418231122-21iyy815q3wxrxyv
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Wed 2007-04-18 18:14:22 -0500
    message:
      jra at samba.org (r22349)  2007-04-18 17:34:23 -0500 (Wed, 18 Apr 2007)
          
          Fix missing ) in #else path.
          Jeremy.
          
    ------------------------------------------------------------
    merged: idra at samba.org-20070418231122-21iyy815q3wxrxyv
    parent: jra at samba.org-20070418230846-qgvqoswg5alffvcf
    committer: idra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Wed 2007-04-18 18:11:22 -0500
    message:
      idra at samba.org (r22348)  2007-04-18 17:25:17 -0500 (Wed, 18 Apr 2007)
          
          
          3_0 as well
          
          
    ------------------------------------------------------------
    merged: jra at samba.org-20070418230846-qgvqoswg5alffvcf
    parent: jra at samba.org-20070418230632-5tq4fqkqnwgwp1it
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Wed 2007-04-18 18:08:46 -0500
    message:
      jra at samba.org (r22345)  2007-04-18 17:02:30 -0500 (Wed, 18 Apr 2007)
          
          Only use new krb5 OID.
          Jeremy.
          
    ------------------------------------------------------------
    merged: jra at samba.org-20070418230632-5tq4fqkqnwgwp1it
    parent: idra at samba.org-20070418230436-s1xuqm39phq2mq2p
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Wed 2007-04-18 18:06:32 -0500
    message:
      jra at samba.org (r22344)  2007-04-18 16:56:18 -0500 (Wed, 18 Apr 2007)
          
          Correctly create sub-struct for GSS encryption.
          Jeremy.
          
    ------------------------------------------------------------
    merged: idra at samba.org-20070418230436-s1xuqm39phq2mq2p
    parent: obnox at samba.org-20070418230230-s0qvnpqizaxz2mi8
    committer: idra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Wed 2007-04-18 18:04:36 -0500
    message:
      idra at samba.org (r22343)  2007-04-18 16:10:37 -0500 (Wed, 18 Apr 2007)
          
          
          Commit to 3_0 as well after adapting the patch.
          (tdb_delete_bystring instead of tdb_delete is used here)
          
          
    ------------------------------------------------------------
    merged: obnox at samba.org-20070418230230-s0qvnpqizaxz2mi8
    parent: jerry at samba.org-20070418170336-xa1273iy55qd0ptu
    committer: obnox at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Wed 2007-04-18 18:02:30 -0500
    message:
      obnox at samba.org (r22341)  2007-04-18 15:18:43 -0500 (Wed, 18 Apr 2007)
          
          
          Fix build of examples/VFS: adapt include for new place of tdb...
          
          

Diff too large for email (13095 lines, the limit is 1000).


More information about the samba-cvs mailing list