Rev 11332: Merge upstream. in file:///home/jelmer/bzr.samba/4.0-debian/

Jelmer Vernooij jelmer at samba.org
Tue Mar 13 20:52:07 GMT 2007


At file:///home/jelmer/bzr.samba/4.0-debian/

------------------------------------------------------------
revno: 11332
revision-id: jelmer at samba.org-20070313205153-o1ik2w72muyfwwat
parent: jelmer at samba.org-20070313205054-0f76eur2wd9zjteg
parent: svn-v2:21830 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 4.0-debian
timestamp: Tue 2007-03-13 21:51:53 +0100
message:
  Merge upstream.
modified:
  source/headermap.txt           svn-v2:14481 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fheadermap.txt
  source/lib/registry/config.mk  svn-v2:851 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2fregistry%2fconfig.mk
  source/lib/registry/registry.h svn-v2:10026 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2fregistry%2fregistry.h
  source/libnet/libnet_become_dc.c svn-v2:20008 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flibnet%2flibnet_become_dc.c
  source/libnet/libnet_unbecome_dc.c svn-v2:20040 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flibnet%2flibnet_unbecome_dc.c
  source/librpc/config.mk        svn-v2:3433 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flibrpc%2fconfig.mk
  source/torture/config.mk       svn-v2:860 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2ftorture%2fconfig.mk
  source/torture/rpc/testjoin.c  svn-v2:1041 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2ftorture%2frpc%2ftestjoin.c
    ------------------------------------------------------------
    revno: 11321.1.413
    merged: svn-v2:21830 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
    parent: svn-v2:21829 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
    parent: jelmer at samba.org-20070313204224-ssn7l16ctkr5p0w0
    committer: jelmer
    timestamp: Tue 2007-03-13 20:44:14 +0000
    message:
      Fix header installation, remove proto header with a single prototype.
        ------------------------------------------------------------
        revno: 11321.1.412.1.1
        merged: jelmer at samba.org-20070313204224-ssn7l16ctkr5p0w0
        parent: svn-v2:21829 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: SAMBA_4_0
        timestamp: Tue 2007-03-13 21:42:24 +0100
        message:
          Fix header installation, remove proto header with a single prototype.
    ------------------------------------------------------------
    revno: 11321.1.412
    merged: svn-v2:21829 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
    parent: svn-v2:21828 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
    parent: jelmer at samba.org-20070313202440-uyubhn42y3fwjg0t
    committer: jelmer
    timestamp: Tue 2007-03-13 20:26:35 +0000
    message:
       Integrate mgmt in libdcerpc. We have enough libraries as it is and mgmt is part of the DCE/RPC standard.
        ------------------------------------------------------------
        revno: 11321.1.411.1.1
        merged: jelmer at samba.org-20070313202440-uyubhn42y3fwjg0t
        parent: svn-v2:21828 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: SAMBA_4_0
        timestamp: Tue 2007-03-13 21:24:40 +0100
        message:
           Integrate mgmt in libdcerpc. We have enough libraries as it is and mgmt is part of the DCE/RPC standard.
    ------------------------------------------------------------
    revno: 11321.1.411
    merged: svn-v2:21828 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
    parent: svn-v2:21827 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
    parent: jelmer at samba.org-20070313194454-chvbxxm800kavtek
    committer: jelmer
    timestamp: Tue 2007-03-13 20:08:44 +0000
    message:
      Hardcode prototypes, as they're a public API.
        ------------------------------------------------------------
        revno: 11321.1.410.1.1
        merged: jelmer at samba.org-20070313194454-chvbxxm800kavtek
        parent: svn-v2:21827 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: SAMBA_4_0
        timestamp: Tue 2007-03-13 20:44:54 +0100
        message:
          Hardcode prototypes, as they're a public API.
    ------------------------------------------------------------
    revno: 11321.1.410
    merged: svn-v2:21827 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
    parent: svn-v2:21826 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
    committer: metze
    timestamp: Tue 2007-03-13 18:17:31 +0000
    message:
      move comments to the place where the functionality is implemented
      
      metze
    ------------------------------------------------------------
    revno: 11321.1.409
    merged: svn-v2:21826 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
    parent: svn-v2:21821 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
    committer: metze
    timestamp: Tue 2007-03-13 18:12:21 +0000
    message:
      reorder functions
      
      metze
    ------------------------------------------------------------
    revno: 11321.1.408
    merged: svn-v2:21821 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
    parent: svn-v2:21820 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
    committer: metze
    timestamp: Tue 2007-03-13 15:41:25 +0000
    message:
      move comment about the becoming a dc to the code which implements it
      and extent the comments a bit
      
      metze
    ------------------------------------------------------------
    revno: 11321.1.407
    merged: svn-v2:21820 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
    parent: svn-v2:21817 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
    committer: metze
    timestamp: Tue 2007-03-13 14:32:20 +0000
    message:
      move function, so that all are in top-down order as they get called
      
      metze

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


More information about the samba-cvs mailing list