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

Michael Adam ma at sernet.de
Sat Mar 31 22:04:00 GMT 2007


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

------------------------------------------------------------
revno: 5314
revision-id: ma at sernet.de-20070331220356-a5fa313509d186b0
parent: ma at sernet.de-20070330203406-7062a5c9141a8f07
parent: herb at samba.org-20070331050501-0zoaqz3ih3pcifaf
committer: Michael Adam <ma at sernet.de>
branch nick: SAMBA_3_0-registry.bzr
timestamp: Sun 2007-04-01 00:03:56 +0200
message:
  merge from upstream
modified:
  REVISION                       REVISION-20060530022625-68239662668b41c3
  source/lib/util.c              util.c-20060530022627-d569af0e687a4dd3
  source/lib/util_str.c          util_str.c-20060530022627-0ba87cda5eaacc2e
  source/libsmb/clidgram.c       clidgram.c-20060530022627-0d16d2ca1044bd3f
  source/libsmb/cliprint.c       cliprint.c-20060530022627-f75a028812ceec6b
  source/libsmb/clirap.c         clirap.c-20060530022627-ec81fdd89a06c9ea
  source/libsmb/clirap2.c        clirap2.c-20060530022627-58b43d466ff7e065
  source/libsmb/smb_seal.c       smb_seal.c-20070317050048-jthijp4m79ic4h3q-1
  source/nmbd/nmbd_browsesync.c  nmbd_browsesync.c-20060530022627-858b93d65834e163
  source/nmbd/nmbd_elections.c   nmbd_elections.c-20060530022627-12c160e0fac7246c
  source/nmbd/nmbd_incomingdgrams.c nmbd_incomingdgrams.c-20060530022627-b6e2009d35303ad7
  source/nmbd/nmbd_packets.c     nmbd_packets.c-20060530022627-5b449aed1c5a87bf
  source/nmbd/nmbd_processlogon.c nmbd_processlogon.c-20060530022627-ba032f504f8ff80c
  source/nmbd/nmbd_sendannounce.c nmbd_sendannounce.c-20060530022627-9a58006dc0de4065
  source/nsswitch/winbindd_ads.c winbindd_ads.c-20060530022627-7c5e13eefe48f902
  source/smbd/lanman.c           lanman.c-20060530022627-4d3ad959fbca66cf
  source/smbd/seal.c             seal.c-20070320050326-brtwj05flzzelvyk-1
    ------------------------------------------------------------
    merged: herb at samba.org-20070331050501-0zoaqz3ih3pcifaf
    parent: jra at samba.org-20070331050315-ei1nvp0d40cndp3y
    committer: herb at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Sat 2007-03-31 00:05:01 -0500
    message:
      herb at samba.org (r22018)  2007-03-30 22:11:02 -0500 (Fri, 30 Mar 2007)
          
          fix compile error
          
    ------------------------------------------------------------
    merged: jra at samba.org-20070331050315-ei1nvp0d40cndp3y
    parent: jra at samba.org-20070331050144-rq9z64tm15ejv192
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Sat 2007-03-31 00:03:15 -0500
    message:
      jra at samba.org (r22017)  2007-03-30 20:14:00 -0500 (Fri, 30 Mar 2007)
          
          After changing 2000 lines of this I think this is needed :-).
          Jeremy.
          
    ------------------------------------------------------------
    merged: jra at samba.org-20070331050144-rq9z64tm15ejv192
    parent: jra at samba.org-20070330230520-y5p31wo5axhs4dlh
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Sat 2007-03-31 00:01:44 -0500
    message:
      jra at samba.org (r22016)  2007-03-30 18:23:45 -0500 (Fri, 30 Mar 2007)
          
          Try and fix the build - move things out of proto.h
          Jeremy.
          
    ------------------------------------------------------------
    merged: jra at samba.org-20070330230520-y5p31wo5axhs4dlh
    parent: jra at samba.org-20070330230342-r63asvjc2fho3vkg
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Fri 2007-03-30 18:05:20 -0500
    message:
      jra at samba.org (r22015)  2007-03-30 17:35:35 -0500 (Fri, 30 Mar 2007)
          
          Fix for memory leak from Steven Danneman <steven.danneman at isilon.com>
          Jeremy.
          
    ------------------------------------------------------------
    merged: jra at samba.org-20070330230342-r63asvjc2fho3vkg
    parent: jra at samba.org-20070330230206-bw2zyxgcfpomg3ez
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Fri 2007-03-30 18:03:42 -0500
    message:
      jra at samba.org (r22014)  2007-03-30 17:25:08 -0500 (Fri, 30 Mar 2007)
          
          Make us pass RANDOMIPC test again :-(. This is an ugly check-in,
          but I've no option.
          Jeremy.
          
    ------------------------------------------------------------
    merged: jra at samba.org-20070330230206-bw2zyxgcfpomg3ez
    parent: jra at samba.org-20070330154548-atk9i7m3y2xxqw2t
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Fri 2007-03-30 18:02:06 -0500
    message:
      jra at samba.org (r22013)  2007-03-30 17:19:51 -0500 (Fri, 30 Mar 2007)
          
          Move to SSPI framing (sig first in NTLM).
          Jeremy
          

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


More information about the samba-cvs mailing list