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

Michael Adam ma at sernet.de
Mon Apr 16 23:26:48 GMT 2007


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

------------------------------------------------------------
revno: 5365
revision-id: ma at sernet.de-20070416232634-c01bd4ddb6932dd1
parent: ma at sernet.de-20070416230151-bfcfb70d496cc600
parent: jra at samba.org-20070416230319-bj51pdyg19el7zr6
committer: Michael Adam <ma at sernet.de>
branch nick: SAMBA_3_0-registry.bzr
timestamp: Tue 2007-04-17 01:26:34 +0200
message:
  merge from upstream
removed:
  source/tdb/                    tdb-20060530022626-c4945d2048b732b7
  source/tdb/Makefile.in         Makefile.in-20060823151024-79ea4e845fdfe14a
  source/tdb/aclocal.m4          aclocal.m4-20060823151025-3b4d0f22678fd4c4
  source/tdb/autogen.sh          autogen.sh-20060823151027-977227dca6391fdf
  source/tdb/common/             common-20060823151029-039884a926fe1edb
  source/tdb/common/dump.c       dump.c-20060823151029-433b1b557011ad5a
  source/tdb/common/error.c      error.c-20060823151029-3d84207201e7660e
  source/tdb/common/freelist.c   freelist.c-20060823151029-f12820c2066c7a68
  source/tdb/common/freelistcheck.c freelistcheck.c-20061130130727-uf5r442rqar51dkc-1
  source/tdb/common/io.c         io.c-20060823151029-637ec4cb476bff18
  source/tdb/common/lock.c       lock.c-20060823151029-46d2c64c2a0bac79
  source/tdb/common/open.c       open.c-20060823151029-1ae0dccc240463aa
  source/tdb/common/tdb.c        tdb.c-20060823151029-1368a084072c7537
  source/tdb/common/tdb_private.h tdb_private.h-20060823151029-3c355986ee25e70a
  source/tdb/common/tdbback.c    tdbback.c-20060823151029-9911bfec37f4c0dc
  source/tdb/common/transaction.c transaction.c-20060823151029-6cd356e535b2baa2
  source/tdb/common/traverse.c   traverse.c-20060823151029-af2f14f23a9f6fc6
  source/tdb/config.m4           config.m4-20060823151040-3b6c54001563c1cd
  source/tdb/config.mk           config.mk-20060823151042-1f8ccaa9a25613e5
  source/tdb/configure.in        configure.in-20060823151043-1bee0b7f41fd7ba9
  source/tdb/docs/               docs-20060823151044-31724d5676aa81cf
  source/tdb/docs/README         README-20060823151044-69091bab73bcd872
  source/tdb/docs/tdb.magic      tdb.magic-20060823151044-dec701d2cc04b8da
  source/tdb/include/            include-20060823151047-7f47d74af2c97e64
  source/tdb/include/tdb.h       tdb.h-20060823151047-af91f430d9608794
  source/tdb/include/tdbback.h   tdbback.h-20060823151047-1e8ad59072140168
  source/tdb/include/tdbconfig.h.in tdbconfig.h.in-20060823151047-5373b186cf6fdadb
  source/tdb/swig/               swig-20060823151052-21a6b9655a73fbbf
  source/tdb/swig/Tdb.py         Tdb.py-20060823151052-4210f0ca1f256984
  source/tdb/swig/tdb.i          tdb.i-20060823151052-f1868c276c57068f
  source/tdb/tdb.pc.in           tdb.pc.in-20060823151055-9335d2bddf83cbc9
  source/tdb/tools/              tools-20060823151056-f597c2d7c4ab2290
  source/tdb/tools/tdbbackup.c   tdbbackup.c-20060823151056-fc9ebc7259c020ba
  source/tdb/tools/tdbdump.c     tdbdump.c-20060823151056-b91e530dcc96cada
  source/tdb/tools/tdbtest.c     tdbtest.c-20060823151056-23829ec945e59ec6
  source/tdb/tools/tdbtool.c     tdbtool.c-20060823151056-3fc2ae66c2a66158
  source/tdb/tools/tdbtorture.c  tdbtorture.c-20060823151056-1cb96efca74c4a1a
added:
  source/lib/replace/strptime.c  strptime.c-20070415230149-awuo498ptsb5qaf0-1
  source/lib/replace/strptime.m4 strptime.m4-20070415230150-azbrr8pi12rrqa6l-1
  source/lib/replace/test/strptime.c strptime.c-20070415230151-yk8ovwuikt3diddm-1
  source/lib/tdb/                tdb-20070416111147-cebijg5x16vcb45j-1
  source/lib/tdb/Makefile.in     makefile.in-20070416111147-cebijg5x16vcb45j-2
  source/lib/tdb/aclocal.m4      aclocal.m4-20070416111147-cebijg5x16vcb45j-3
  source/lib/tdb/autogen.sh      autogen.sh-20070416111147-cebijg5x16vcb45j-4
  source/lib/tdb/common/         common-20070416111147-cebijg5x16vcb45j-5
  source/lib/tdb/common/dump.c   dump.c-20070416111147-cebijg5x16vcb45j-14
  source/lib/tdb/common/error.c  error.c-20070416111147-cebijg5x16vcb45j-15
  source/lib/tdb/common/freelist.c freelist.c-20070416111147-cebijg5x16vcb45j-16
  source/lib/tdb/common/freelistcheck.c freelistcheck.c-20070416111147-cebijg5x16vcb45j-17
  source/lib/tdb/common/io.c     io.c-20070416111147-cebijg5x16vcb45j-18
  source/lib/tdb/common/lock.c   lock.c-20070416111147-cebijg5x16vcb45j-19
  source/lib/tdb/common/open.c   open.c-20070416111147-cebijg5x16vcb45j-20
  source/lib/tdb/common/tdb.c    tdb.c-20070416111147-cebijg5x16vcb45j-21
  source/lib/tdb/common/tdb_private.h tdb_private.h-20070416111147-cebijg5x16vcb45j-22
  source/lib/tdb/common/tdbback.c tdbback.c-20070416111147-cebijg5x16vcb45j-23
  source/lib/tdb/common/transaction.c transaction.c-20070416111147-cebijg5x16vcb45j-24
  source/lib/tdb/common/traverse.c traverse.c-20070416111147-cebijg5x16vcb45j-25
  source/lib/tdb/config.m4       config.m4-20070416111147-cebijg5x16vcb45j-6
  source/lib/tdb/config.mk       config.mk-20070416111147-cebijg5x16vcb45j-7
  source/lib/tdb/configure.in    configure.in-20070416111147-cebijg5x16vcb45j-8
  source/lib/tdb/docs/           docs-20070416111147-cebijg5x16vcb45j-9
  source/lib/tdb/docs/README     readme-20070416111147-cebijg5x16vcb45j-26
  source/lib/tdb/docs/tdb.magic  tdb.magic-20070416111147-cebijg5x16vcb45j-27
  source/lib/tdb/include/        include-20070416111147-cebijg5x16vcb45j-10
  source/lib/tdb/include/tdb.h   tdb.h-20070416111147-cebijg5x16vcb45j-28
  source/lib/tdb/include/tdbback.h tdbback.h-20070416111147-cebijg5x16vcb45j-29
  source/lib/tdb/include/tdbconfig.h.in tdbconfig.h.in-20070416111147-cebijg5x16vcb45j-30
  source/lib/tdb/swig/           swig-20070416111147-cebijg5x16vcb45j-11
  source/lib/tdb/swig/Tdb.py     tdb.py-20070416111147-cebijg5x16vcb45j-31
  source/lib/tdb/swig/tdb.i      tdb.i-20070416111147-cebijg5x16vcb45j-32
  source/lib/tdb/tdb.pc.in       tdb.pc.in-20070416111147-cebijg5x16vcb45j-12
  source/lib/tdb/tools/          tools-20070416111147-cebijg5x16vcb45j-13
  source/lib/tdb/tools/tdbbackup.c tdbbackup.c-20070416111147-cebijg5x16vcb45j-33
  source/lib/tdb/tools/tdbdump.c tdbdump.c-20070416111147-cebijg5x16vcb45j-34
  source/lib/tdb/tools/tdbtest.c tdbtest.c-20070416111147-cebijg5x16vcb45j-35
  source/lib/tdb/tools/tdbtool.c tdbtool.c-20070416111147-cebijg5x16vcb45j-36
  source/lib/tdb/tools/tdbtorture.c tdbtorture.c-20070416111147-cebijg5x16vcb45j-37
modified:
  REVISION                       REVISION-20060530022625-68239662668b41c3
  source/Makefile.in             Makefile.in-20060530022626-b16dac2328ebe703
  source/configure.in            configure.in-20060530022626-07e74bc1e326c82d
  source/include/smb.h           smb.h-20060530022627-6c2e6fe4eb631e83
  source/include/smb_macros.h    smb_macros.h-20060530022627-412e2056512de943
  source/lib/ldb/include/includes.h includes.h-20060924130013-wfsw0zps5y9p71dq-37
  source/lib/messages.c          messages.c-20060530022627-fcc341b253a85c20
  source/lib/replace/Makefile.in makefile.in-20060919015053-50coyc2ouwpsm77j-6
  source/lib/replace/README      readme-20060919015053-50coyc2ouwpsm77j-17
  source/lib/replace/libreplace.m4 libreplace.m4-20060919015053-50coyc2ouwpsm77j-4
  source/lib/replace/replace.c   replace.c-20060919015053-50coyc2ouwpsm77j-15
  source/lib/replace/replace.h   replace.h-20060919015053-50coyc2ouwpsm77j-19
  source/lib/replace/samba.m4    samba.m4-20060919015053-50coyc2ouwpsm77j-21
  source/lib/replace/system/wait.h wait.h-20060919015053-50coyc2ouwpsm77j-40
  source/lib/replace/test/testsuite.c testsuite.c-20060919015053-50coyc2ouwpsm77j-33
  source/lib/talloc/talloc.h     talloc.h-20060922043319-043mgtqatvgyg13j-9
  source/nsswitch/idmap.c        idmap.c-20061212152801-ke1ub3n5v1jjf8gy-1
  source/nsswitch/winbindd_util.c winbindd_util.c-20060530022627-e014c9e53147dffe
  source/param/loadparm.c        loadparm.c-20060530022627-1efa1edb3eb0e897
  source/smbd/connection.c       connection.c-20060530022627-15ebf52f0bf0bc43
  source/smbd/seal.c             seal.c-20070320050326-brtwj05flzzelvyk-1
  source/smbd/trans2.c           trans2.c-20060530022627-7ce34cd85c3f02f5
  source/utils/net_status.c      net_status.c-20060530022628-da2712a920e5a3aa
  source/utils/status.c          status.c-20060530022628-a33523ea13048a7e
  source/web/statuspage.c        statuspage.c-20060530022628-025a29e25b6e33c7
    ------------------------------------------------------------
    merged: jra at samba.org-20070416230319-bj51pdyg19el7zr6
    parent: jerry at samba.org-20070416230251-c87drvuft38j9sec
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Mon 2007-04-16 18:03:19 -0500
    message:
      jra at samba.org (r22285)  2007-04-16 17:42:45 -0500 (Mon, 16 Apr 2007)
          
          Allow arbitrary bases in int and ulong parsing.
          Jeremy.
          
    ------------------------------------------------------------
    merged: jerry at samba.org-20070416230251-c87drvuft38j9sec
    parent: jra at samba.org-20070416230222-3bus6l2a0s0zvkhm
    committer: jerry at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Mon 2007-04-16 18:02:51 -0500
    message:
      jerry at samba.org (r22283)  2007-04-16 15:29:33 -0500 (Mon, 16 Apr 2007)
          
          Remove very old bug where we assigned the online mode of 
          the domain to queried to our own domain.
          
          
    ------------------------------------------------------------
    merged: jra at samba.org-20070416230222-3bus6l2a0s0zvkhm
    parent: metze at samba.org-20070416230144-a18qq624jzodr2vz
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Mon 2007-04-16 18:02:22 -0500
    message:
      jra at samba.org (r22282)  2007-04-16 15:06:02 -0500 (Mon, 16 Apr 2007)
          
          Fix last few name -> servicename changes.
          Jeremy.
          
    ------------------------------------------------------------
    merged: metze at samba.org-20070416230144-a18qq624jzodr2vz
    parent: metze at samba.org-20070416230129-mwcp0fkp0navlf1p
    committer: metze at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Mon 2007-04-16 18:01:44 -0500
    message:
      metze at samba.org (r22280)  2007-04-16 14:56:42 -0500 (Mon, 16 Apr 2007)
          
          merge from samba4:
          
          add a lot more detailed strtoll() and strtoull() tests
          
          metze
    ------------------------------------------------------------
    merged: metze at samba.org-20070416230129-mwcp0fkp0navlf1p
    parent: jra at samba.org-20070416230115-zi3l0dcd6v1ddp9e
    committer: metze at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Mon 2007-04-16 18:01:29 -0500
    message:
      metze at samba.org (r22277)  2007-04-16 14:51:30 -0500 (Mon, 16 Apr 2007)
          
          __location__ is defined in libreplace now
          
          metze
    ------------------------------------------------------------
    merged: jra at samba.org-20070416230115-zi3l0dcd6v1ddp9e
    parent: metze at samba.org-20070416230102-v4jncb4citlmkrkp
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Mon 2007-04-16 18:01:15 -0500
    message:
      jra at samba.org (r22276)  2007-04-16 14:47:41 -0500 (Mon, 16 Apr 2007)
          
          Fix name -> servicename in messages.c
          Jeremy.
          
    ------------------------------------------------------------
    merged: metze at samba.org-20070416230102-v4jncb4citlmkrkp
    parent: metze at samba.org-20070416230049-w28ow3bv9ccsx9p8
    committer: metze at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Mon 2007-04-16 18:01:02 -0500
    message:
      metze at samba.org (r22274)  2007-04-16 14:46:06 -0500 (Mon, 16 Apr 2007)
          
          merge from samba4:
          
          - provide __LINESTR__ macro
          - add __STRINGSTRING() macro to really create a string of __LINE__
          - fix __location__ macro
          
          metze
    ------------------------------------------------------------
    merged: metze at samba.org-20070416230049-w28ow3bv9ccsx9p8
    parent: metze at samba.org-20070416230036-9kh7833et983xrye
    committer: metze at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Mon 2007-04-16 18:00:49 -0500
    message:
      metze at samba.org (r22271)  2007-04-16 14:23:00 -0500 (Mon, 16 Apr 2007)
          
          merge from samba4: 
          
          provide __location__ in replace.h
          
          and see how the build-farm likes this simpler version
          
          metze
    ------------------------------------------------------------
    merged: metze at samba.org-20070416230036-9kh7833et983xrye
    parent: jra at samba.org-20070416230023-4rtav4qd3v03bbt4
    committer: metze at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Mon 2007-04-16 18:00:36 -0500
    message:
      metze at samba.org (r22268)  2007-04-16 14:15:57 -0500 (Mon, 16 Apr 2007)
          
          merge from samba4:
          
          protect #define __location__ with an #ifndef
          
          metze
    ------------------------------------------------------------
    merged: jra at samba.org-20070416230023-4rtav4qd3v03bbt4
    parent: metze at samba.org-20070416170338-fkbvudy69l66dtms
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Mon 2007-04-16 18:00:23 -0500
    message:
      jra at samba.org (r22266)  2007-04-16 14:10:16 -0500 (Mon, 16 Apr 2007)
          
          Fix bug #4512 - we were returning a volume label greater than
          32 unicode chars. Windows XP doesn't like that :-).
          Jeremy
          
    ------------------------------------------------------------
    merged: metze at samba.org-20070416170338-fkbvudy69l66dtms
    parent: metze at samba.org-20070416170159-war5p9208fr5a55w
    committer: metze at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Mon 2007-04-16 12:03:38 -0500
    message:
      metze at samba.org (r22264)  2007-04-16 07:43:54 -0500 (Mon, 16 Apr 2007)
          
          merge from samba4:
          
          use AC_HAVE_DECL() because AC_CHECK_DECLS() defines to 1 or 0
          and #ifndef doesn't work.
          
          metze
    ------------------------------------------------------------
    merged: metze at samba.org-20070416170159-war5p9208fr5a55w
    parent: metze at samba.org-20070416111549-gnvt0tbgfky7hydm
    committer: metze at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Mon 2007-04-16 12:01:59 -0500
    message:
      metze at samba.org (r22262)  2007-04-16 07:00:08 -0500 (Mon, 16 Apr 2007)
          
          fix the build on systems without GSS_C_NT_HOSTBASED_SERVICE
          
          metze
    ------------------------------------------------------------
    merged: metze at samba.org-20070416111549-gnvt0tbgfky7hydm
    parent: metze at samba.org-20070416111405-0sw8fotzcbmap7li
    committer: metze at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Mon 2007-04-16 06:15:49 -0500
    message:
      metze at samba.org (r22254)  2007-04-16 04:44:00 -0500 (Mon, 16 Apr 2007)
          
          merge from samba4:
          
          - make the strtoll tests more verbose
          - add initial strtoull tests
          
          metze
    ------------------------------------------------------------
    merged: metze at samba.org-20070416111405-0sw8fotzcbmap7li
    parent: metze at samba.org-20070416111151-90qj02gjl15cdinw
    committer: metze at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Mon 2007-04-16 06:14:05 -0500
    message:
      metze at samba.org (r22252)  2007-04-16 04:20:52 -0500 (Mon, 16 Apr 2007)
          
          merge from samba4:
          
          add prototype of setenv
          
          metze
    ------------------------------------------------------------
    merged: metze at samba.org-20070416111151-90qj02gjl15cdinw
    parent: metze at samba.org-20070416110729-0nlfg30twneys2ku
    committer: metze at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Mon 2007-04-16 06:11:51 -0500
    message:
      metze at samba.org (r22249)  2007-04-16 03:20:13 -0500 (Mon, 16 Apr 2007)
          
          move tdb code to lib/tdb/ as in samba4
          
          metze
    ------------------------------------------------------------
    merged: metze at samba.org-20070416110729-0nlfg30twneys2ku
    parent: metze at samba.org-20070416110449-zb3fliwtqnsflafk
    committer: metze at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Mon 2007-04-16 06:07:29 -0500
    message:
      metze at samba.org (r22247)  2007-04-16 02:41:01 -0500 (Mon, 16 Apr 2007)
          
          merge from samba4:
          
          only test strtoll once
          
          metze
    ------------------------------------------------------------
    merged: metze at samba.org-20070416110449-zb3fliwtqnsflafk
    parent: metze at samba.org-20070416110254-b06y5b7o7zq2dnbs
    committer: metze at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Mon 2007-04-16 06:04:49 -0500
    message:
      metze at samba.org (r22244)  2007-04-16 01:30:08 -0500 (Mon, 16 Apr 2007)
          
          merge from samba4:
          
          remove useless printf's
          
          metze
    ------------------------------------------------------------
    merged: metze at samba.org-20070416110254-b06y5b7o7zq2dnbs
    parent: idra at samba.org-20070416050857-d2d2el54gkx8dhos
    committer: metze at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Mon 2007-04-16 06:02:54 -0500
    message:
      metze at samba.org (r22240)  2007-04-16 01:08:43 -0500 (Mon, 16 Apr 2007)
          
          merge from samba4:
          
          use strlcpy instead of strcpy to make the IBM checker happy
          
          metze
    ------------------------------------------------------------
    merged: idra at samba.org-20070416050857-d2d2el54gkx8dhos
    parent: metze at samba.org-20070415230626-i1th6op2c75vufsz
    committer: idra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Mon 2007-04-16 00:08:57 -0500
    message:
      idra at samba.org (r22230)  2007-04-15 18:58:39 -0500 (Sun, 15 Apr 2007)
          
          
          Let's just cast here, the 2 calls have different allocation mechanisms.
          We just let domname and name hang on the mem ctx until the call returns,
          and the context will be destroyed.
          
          Simo.
          
          
    ------------------------------------------------------------
    merged: metze at samba.org-20070415230626-i1th6op2c75vufsz
    parent: metze at samba.org-20070415230458-xsy04275g8lti9kl
    committer: metze at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Sun 2007-04-15 18:06:26 -0500
    message:
      metze at samba.org (r22229)  2007-04-15 16:14:37 -0500 (Sun, 15 Apr 2007)
          
          discard_const_p is in lib/replace now
          
          metze
    ------------------------------------------------------------
    merged: metze at samba.org-20070415230458-xsy04275g8lti9kl
    parent: metze at samba.org-20070415230333-6a5n0ikk0m1jdo51
    committer: metze at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Sun 2007-04-15 18:04:58 -0500
    message:
      metze at samba.org (r22227)  2007-04-15 16:13:48 -0500 (Sun, 15 Apr 2007)
          
          merge from samba4:
          
          move discard_const macros to librelace
          
          metze
    ------------------------------------------------------------
    merged: metze at samba.org-20070415230333-6a5n0ikk0m1jdo51
    parent: metze at samba.org-20070415230155-nuk0gdhp0ex2zarg
    committer: metze at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Sun 2007-04-15 18:03:33 -0500
    message:
      metze at samba.org (r22224)  2007-04-15 15:57:48 -0500 (Sun, 15 Apr 2007)
          
          merge from samba4:
          
          make comparing of struct tm more verbose and portable
          
          metze
    ------------------------------------------------------------
    merged: metze at samba.org-20070415230155-nuk0gdhp0ex2zarg
    parent: vlendec at samba.org-20070414110415-pcc5u5ltrtes11qn
    committer: metze at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Sun 2007-04-15 18:01:55 -0500
    message:
      metze at samba.org (r22221)  2007-04-15 15:12:09 -0500 (Sun, 15 Apr 2007)
          
          merge from samba4:
          
          - libreplace unsetenv() and strptime() replacements
          
          metze

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


More information about the samba-cvs mailing list