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

Michael Adam ma at sernet.de
Thu Mar 22 10:11:23 GMT 2007


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

------------------------------------------------------------
revno: 5298
revision-id: ma at sernet.de-20070322101118-9de028650dea3522
parent: ma at sernet.de-20070321161632-9f930c76f8ad2815
parent: jra at samba.org-20070322050756-divqi2nud5ipdx8k
committer: Michael Adam <ma at sernet.de>
branch nick: SAMBA_3_0-registry.bzr
timestamp: Thu 2007-03-22 11:11:18 +0100
message:
  merge from upstream
modified:
  REVISION                       REVISION-20060530022625-68239662668b41c3
  packaging/RHEL/samba.spec.tmpl samba.spec.tmpl-20060530085228-4d0ed36104939391
  source/Makefile.in             Makefile.in-20060530022626-b16dac2328ebe703
  source/include/client.h        client.h-20060530022627-f51e99ba840436e5
  source/include/includes.h      includes.h-20060530022627-d1a059a99c05e8be
  source/lib/util_sock.c         util_sock.c-20060530022627-30f22f2d8b038b4b
  source/libads/ads_status.c     ads_status.c-20060530022627-7d57be87f7b83055
  source/libsmb/cliconnect.c     cliconnect.c-20060530022627-fb16a3a9bd86c44d
  source/libsmb/clientgen.c      clientgen.c-20060530022627-3aad65ce54001b6b
  source/libsmb/clifsinfo.c      clifsinfo.c-20060530022627-9360212d14f20006
  source/libsmb/smb_seal.c       smb_seal.c-20070317050048-jthijp4m79ic4h3q-1
  source/libsmb/smb_signing.c    smb_signing.c-20060530022627-1e3c4643957ae652
  source/nsswitch/idmap_ad.c     idmap_ad.c-20061212152802-3w9k6jbk4ef61xmv-1
  source/nsswitch/idmap_cache.c  idmap_cache.c-20061212152803-7ux8tgbe0zeiy4lo-1
  source/nsswitch/winbindd_util.c winbindd_util.c-20060530022627-e014c9e53147dffe
  source/param/loadparm.c        loadparm.c-20060530022627-1efa1edb3eb0e897
  source/smbd/seal.c             seal.c-20070320050326-brtwj05flzzelvyk-1
    ------------------------------------------------------------
    merged: jra at samba.org-20070322050756-divqi2nud5ipdx8k
    parent: jra at samba.org-20070322050630-a4rodzcmhqf55l8c
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Thu 2007-03-22 00:07:56 -0500
    message:
      jra at samba.org (r21927)  2007-03-21 21:25:16 -0500 (Wed, 21 Mar 2007)
          
          Removed unused variable.
          Jeremy.
          
    ------------------------------------------------------------
    merged: jra at samba.org-20070322050630-a4rodzcmhqf55l8c
    parent: jra at samba.org-20070322050505-3o1oumbgjqno55jb
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Thu 2007-03-22 00:06:30 -0500
    message:
      jra at samba.org (r21926)  2007-03-21 21:24:12 -0500 (Wed, 21 Mar 2007)
          
          Fix missing enum specifier pointed out by Don McCall @ HP.
          Thanks Don !
          Jeremy.
          
    ------------------------------------------------------------
    merged: jra at samba.org-20070322050505-3o1oumbgjqno55jb
    parent: jra at samba.org-20070322050324-xv164h27bgbdi39b
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Thu 2007-03-22 00:05:05 -0500
    message:
      jra at samba.org (r21925)  2007-03-21 20:14:55 -0500 (Wed, 21 Mar 2007)
          
          Start to code up the gss acquire creds calls.
          Jeremy.
          
    ------------------------------------------------------------
    merged: jra at samba.org-20070322050324-xv164h27bgbdi39b
    parent: jra at samba.org-20070322050156-6sg2uodgsaioydvk
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Thu 2007-03-22 00:03:24 -0500
    message:
      jra at samba.org (r21923)  2007-03-21 19:08:22 -0500 (Wed, 21 Mar 2007)
          
          Add in the gss decrypt.
          Jeremy.
          
    ------------------------------------------------------------
    merged: jra at samba.org-20070322050156-6sg2uodgsaioydvk
    parent: idra at samba.org-20070321231335-wgi8yg1z5ol7gv3l
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Thu 2007-03-22 00:01:56 -0500
    message:
      jra at samba.org (r21922)  2007-03-21 18:49:57 -0500 (Wed, 21 Mar 2007)
          
          Fixed the build by rather horrid means. I really need
          to restructure libsmb/smb_signing.c so it isn't in
          the base libs path but lives in libsmb instead (like
          smb_seal.c does).
          Jeremy.
          
    ------------------------------------------------------------
    merged: idra at samba.org-20070321231335-wgi8yg1z5ol7gv3l
    parent: jerry at samba.org-20070321231133-ltf2bvdcrxhjfdv2
    committer: idra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Wed 2007-03-21 18:13:35 -0500
    message:
      idra at samba.org (r21919)  2007-03-21 16:10:59 -0500 (Wed, 21 Mar 2007)
          
          
          now that the local passdb abd BUILTIN have been blacklisted and they always
          point to the passdb module, remove this comment and move the explanation in
          the dimap_ad man page.
          
          Simo.
          
          
    ------------------------------------------------------------
    merged: jerry at samba.org-20070321231133-ltf2bvdcrxhjfdv2
    parent: jra at samba.org-20070321230841-4zuwtrrjqvy4fayq
    committer: jerry at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Wed 2007-03-21 18:11:33 -0500
    message:
      jerry at samba.org (r21918)  2007-03-21 16:08:15 -0500 (Wed, 21 Mar 2007)
          
          Reverting this change as it is now causing aborts() in 
          find_builtin_domain().    This all needs more testing
          before anyone starts changing these lookup routines again.
          
          
          
    ------------------------------------------------------------
    merged: jra at samba.org-20070321230841-4zuwtrrjqvy4fayq
    parent: jra at samba.org-20070321230635-ppwn8h8khzqtvofz
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Wed 2007-03-21 18:08:41 -0500
    message:
      jra at samba.org (r21917)  2007-03-21 14:15:14 -0500 (Wed, 21 Mar 2007)
          
          Start to do the gss versions of sign+seal.
          Jeremy.
          
    ------------------------------------------------------------
    merged: jra at samba.org-20070321230635-ppwn8h8khzqtvofz
    parent: jerry at samba.org-20070321230433-g4n7b4s7l832rr2m
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Wed 2007-03-21 18:06:35 -0500
    message:
      jra at samba.org (r21916)  2007-03-21 13:33:13 -0500 (Wed, 21 Mar 2007)
          
          Fix couple of "return" calls on void functions.
          Ensure we ignore reqests to free keepalive buffers
          as we only copied these.
          Jeremy.
          
    ------------------------------------------------------------
    merged: jerry at samba.org-20070321230433-g4n7b4s7l832rr2m
    parent: jra at samba.org-20070321230223-8v8ojazr45e9bap6
    committer: jerry at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Wed 2007-03-21 18:04:33 -0500
    message:
      jerry at samba.org (r21913)  2007-03-21 12:43:49 -0500 (Wed, 21 Mar 2007)
          
          fix one bug in build 717: correctly check the return from sid_peek_check_rid() when trying to find a matching domain
    ------------------------------------------------------------
    merged: jra at samba.org-20070321230223-8v8ojazr45e9bap6
    parent: jerry at samba.org-20070321170345-4hm1cnlp5dqdvixc
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Wed 2007-03-21 18:02:23 -0500
    message:
      jra at samba.org (r21912)  2007-03-21 12:13:35 -0500 (Wed, 21 Mar 2007)
          
          There's no point checksumming the packet length
          this already has to be right. This makes the
          signed+sealed area the same as it will be with
          gss calls. Now to go implement them.
          Jeremy.
          
    ------------------------------------------------------------
    merged: jerry at samba.org-20070321170345-4hm1cnlp5dqdvixc
    parent: jerry at samba.org-20070321170239-3kizo54btznvkkts
    committer: jerry at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Wed 2007-03-21 12:03:45 -0500
    message:
      jerry at samba.org (r21908)  2007-03-21 10:55:45 -0500 (Wed, 21 Mar 2007)
          
          update with the 3.0.25 packaging
    ------------------------------------------------------------
    merged: jerry at samba.org-20070321170239-3kizo54btznvkkts
    parent: vlendec at samba.org-20070321170139-ro96v8qry9hvph6h
    committer: jerry at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Wed 2007-03-21 12:02:39 -0500
    message:
      jerry at samba.org (r21905)  2007-03-21 10:21:28 -0500 (Wed, 21 Mar 2007)
          
          Rename
          idmap expire time 	-> idmap cache time
          idmap negative time	-> idmap negative cache time
          
          
    ------------------------------------------------------------
    merged: vlendec at samba.org-20070321170139-ro96v8qry9hvph6h
    parent: jra at samba.org-20070321050334-barxfl0kcqqewl34
    committer: vlendec at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Wed 2007-03-21 12:01:39 -0500
    message:
      vlendec at samba.org (r21904)  2007-03-21 09:13:42 -0500 (Wed, 21 Mar 2007)
          
          Fix HP build -- thanks, Don

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


More information about the samba-cvs mailing list