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

Michael Adam ma at sernet.de
Mon Mar 19 13:37:06 GMT 2007


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

------------------------------------------------------------
revno: 5291
revision-id: ma at sernet.de-20070319133658-0f42afdc9ca9540f
parent: ma at sernet.de-20070314231834-7472ea4283b4c1fd
parent: vlendec at samba.org-20070318170151-w37lib8lucvmdrm8
committer: Michael Adam <ma at sernet.de>
branch nick: SAMBA_3_0-registry.bzr
timestamp: Mon 2007-03-19 14:36:58 +0100
message:
  merge from upstream
added:
  source/libsmb/smb_seal.c       smb_seal.c-20070317050048-jthijp4m79ic4h3q-1
modified:
  REVISION                       REVISION-20060530022625-68239662668b41c3
  source/Makefile.in             Makefile.in-20060530022626-b16dac2328ebe703
  source/auth/auth.c             auth.c-20060530022627-0865681abfd2872c
  source/auth/auth_server.c      auth_server.c-20060530022627-5d30fd4f1d21fdc2
  source/client/mount.cifs.c     mount.cifs.c-20060530022627-eacab1c36c071af7
  source/configure.in            configure.in-20060530022626-07e74bc1e326c82d
  source/include/auth.h          auth.h-20060530022627-05b1faa5ae652d06
  source/include/includes.h      includes.h-20060530022627-d1a059a99c05e8be
  source/include/smb.h           smb.h-20060530022627-6c2e6fe4eb631e83
  source/include/trans2.h        trans2.h-20060530022627-ff896a707ae81fc0
  source/lib/debug.c             debug.c-20060530022627-f23cb2ef8f91a8a6
  source/lib/interface.c         interface.c-20060530022627-40daf4e4a6016938
  source/lib/util.c              util.c-20060530022627-d569af0e687a4dd3
  source/lib/util_sock.c         util_sock.c-20060530022627-30f22f2d8b038b4b
  source/libaddns/dnsgss.c       dnsgss.c-20060829161806-10df27959cdd359d
  source/libads/kerberos_keytab.c kerberos_keytab.c-20060530031052-997631c6c69b1d48
  source/libads/kerberos_verify.c kerberos_verify.c-20060530022627-7ce45c38ec645075
  source/libads/krb5_errs.c      krb5_errs.c-20060530090218-df0d70fc4b74ac6a
  source/libads/sasl.c           sasl.c-20060530022627-de2e2050d01ecfd2
  source/libads/smb_krb5_locator.c smb_krb5_locator.c-20070313170820-u3uzdbex2e2dgak0-1
  source/libsmb/clientgen.c      clientgen.c-20060530022627-3aad65ce54001b6b
  source/libsmb/clierror.c       clierror.c-20060530022627-da9ad76efe30832f
  source/libsmb/clikrb5.c        clikrb5.c-20060530022627-20af6b3ec85369b2
  source/libsmb/clirap.c         clirap.c-20060530022627-ec81fdd89a06c9ea
  source/nsswitch/winbindd.h     winbindd.h-20060530022627-003a0030248d7f64
  source/nsswitch/winbindd_group.c winbindd_group.c-20060530022627-9288f9a998ed2fbe
  source/nsswitch/winbindd_pam.c winbindd_pam.c-20060530022627-6b827f2f7ba30f85
  source/nsswitch/winbindd_rpc.c winbindd_rpc.c-20060530022627-7b63b2639ff48069
  source/nsswitch/winbindd_user.c winbindd_user.c-20060530022627-bd9d3764eb8e1fd7
  source/param/loadparm.c        loadparm.c-20060530022627-1efa1edb3eb0e897
  source/passdb/lookup_sid.c     lookup_sid.c-20060530022627-e709356ee81bdcb1
  source/printing/nt_printing.c  nt_printing.c-20060530022627-6f18c47e6548d98a
  source/printing/print_cups.c   print_cups.c-20060530022627-849502388ad9e4ac
  source/smbd/conn.c             conn.c-20060530022627-b48d038fbdb7ac1a
  source/smbd/negprot.c          negprot.c-20060530022627-a352553cf95f9931
  source/smbd/process.c          process.c-20060530022627-8fe40017fe0e41ff
  source/smbd/server.c           server.c-20060530022627-212a418ec1144979
  source/smbd/sesssetup.c        sesssetup.c-20060530022627-0a6efae905e1529e
    ------------------------------------------------------------
    merged: vlendec at samba.org-20070318170151-w37lib8lucvmdrm8
    parent: vlendec at samba.org-20070318170104-xs1f5lvbukr3jfnz
    committer: vlendec at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Sun 2007-03-18 12:01:51 -0500
    message:
      vlendec at samba.org (r21871)  2007-03-18 08:19:40 -0500 (Sun, 18 Mar 2007)
          
          Move deadtime processing into an idle event. While there, simplify
          conn_idle_all() a bit.
          
          Volker
          
          
    ------------------------------------------------------------
    merged: vlendec at samba.org-20070318170104-xs1f5lvbukr3jfnz
    parent: vlendec at samba.org-20070318110618-4o3tbadsf9bar0ke
    committer: vlendec at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Sun 2007-03-18 12:01:04 -0500
    message:
      vlendec at samba.org (r21870)  2007-03-18 06:24:10 -0500 (Sun, 18 Mar 2007)
          
          Move sending auth_server keepalives out of the main loop into an idle event.
          
          Volker
          
          
    ------------------------------------------------------------
    merged: vlendec at samba.org-20070318110618-4o3tbadsf9bar0ke
    parent: vlendec at samba.org-20070318110448-tb1jn8ewf7mpp1ta
    committer: vlendec at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Sun 2007-03-18 06:06:18 -0500
    message:
      vlendec at samba.org (r21869)  2007-03-18 05:57:46 -0500 (Sun, 18 Mar 2007)
          
          Move sending keepalives out of the main processing loop into idle event.
          
          On the way, make lp_keepalive() a proper parameter.
          
          Volker
          
          
    ------------------------------------------------------------
    merged: vlendec at samba.org-20070318110448-tb1jn8ewf7mpp1ta
    parent: vlendec at samba.org-20070318110247-09023v5ceiebrmor
    committer: vlendec at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Sun 2007-03-18 06:04:48 -0500
    message:
      vlendec at samba.org (r21868)  2007-03-18 05:13:35 -0500 (Sun, 18 Mar 2007)
          
          Remove check_log_size from the central smbd processing loop. This can be done
          with a become_root/unbecome_root in debug.c.
          
    ------------------------------------------------------------
    merged: vlendec at samba.org-20070318110247-09023v5ceiebrmor
    parent: vlendec at samba.org-20070318110106-ktx03gsu4p0rwb4t
    committer: vlendec at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Sun 2007-03-18 06:02:47 -0500
    message:
      vlendec at samba.org (r21867)  2007-03-18 05:09:16 -0500 (Sun, 18 Mar 2007)
          
          Simplify calling convention of timeout_processing. lp_deadtime is only
          referenced in conn_idle_all().
          
    ------------------------------------------------------------
    merged: vlendec at samba.org-20070318110106-ktx03gsu4p0rwb4t
    parent: jra at samba.org-20070317050051-htu3tf6onfo636qc
    committer: vlendec at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Sun 2007-03-18 06:01:06 -0500
    message:
      vlendec at samba.org (r21866)  2007-03-18 04:54:18 -0500 (Sun, 18 Mar 2007)
          
          Remove unused "lock spin count" parameter
    ------------------------------------------------------------
    merged: jra at samba.org-20070317050051-htu3tf6onfo636qc
    parent: jra at samba.org-20070317050027-6kyhs0p40c22oj3l
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Sat 2007-03-17 00:00:51 -0500
    message:
      jra at samba.org (r21865)  2007-03-16 19:32:54 -0500 (Fri, 16 Mar 2007)
          
          Add in the stubs for SMB transport encryption. Will flesh
          these out as I implement. Don't add to SAMBA_3_0_25, this
          is experimental code.
          NFSv4 you're now officially on notice... :-).
          Jeremy.
          
    ------------------------------------------------------------
    merged: jra at samba.org-20070317050027-6kyhs0p40c22oj3l
    parent: jra at samba.org-20070316230048-r0pmyfoxcnn1ywge
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Sat 2007-03-17 00:00:27 -0500
    message:
      jra at samba.org (r21864)  2007-03-16 19:15:18 -0500 (Fri, 16 Mar 2007)
          
          Reformatting.
          Jeremy.
          
    ------------------------------------------------------------
    merged: jra at samba.org-20070316230048-r0pmyfoxcnn1ywge
    parent: jerry at samba.org-20070316230037-pzshgu7ovumxqg0z
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Fri 2007-03-16 18:00:48 -0500
    message:
      jra at samba.org (r21863)  2007-03-16 17:40:51 -0500 (Fri, 16 Mar 2007)
          
          Fix debug messages with incorrect function name.
          Jeremy.
          
    ------------------------------------------------------------
    merged: jerry at samba.org-20070316230037-pzshgu7ovumxqg0z
    parent: jerry at samba.org-20070316230025-ufih6vrcx35cpo5h
    committer: jerry at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Fri 2007-03-16 18:00:37 -0500
    message:
      jerry at samba.org (r21862)  2007-03-16 16:52:21 -0500 (Fri, 16 Mar 2007)
          
          add the cups comment and location lookup to get_a_printer_2_default() as well
    ------------------------------------------------------------
    merged: jerry at samba.org-20070316230025-ufih6vrcx35cpo5h
    parent: jerry at samba.org-20070316230014-mbpqdhhj901fjvxf
    committer: jerry at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Fri 2007-03-16 18:00:25 -0500
    message:
      jerry at samba.org (r21861)  2007-03-16 16:46:58 -0500 (Fri, 16 Mar 2007)
          
          Pull the comment and location from CUPS if we don't have one
          when fetching a printer from ntprinters.tdb.
          
          Slightly modified from original version submitted on
          samba-technical ml by Andy Polyakov <appro at fy.chalmers.se>
          
          
    ------------------------------------------------------------
    merged: jerry at samba.org-20070316230014-mbpqdhhj901fjvxf
    parent: gd at samba.org-20070316170808-01h207j4mrmqtkhz
    committer: jerry at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Fri 2007-03-16 18:00:14 -0500
    message:
      jerry at samba.org (r21860)  2007-03-16 12:54:10 -0500 (Fri, 16 Mar 2007)
          
          Fixes for "winbind normalize names" functionality:
          
          * Fix getgroups() call called using a normalized name
          * Fix some more name mappings that could cause for example
          a user to be unable to unlock the screen as the username
          would not match in the PAM authenticate call.
          
          
          
    ------------------------------------------------------------
    merged: gd at samba.org-20070316170808-01h207j4mrmqtkhz
    parent: gd at samba.org-20070316170640-jgwasppnw4ehplwp
    committer: gd at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Fri 2007-03-16 12:08:08 -0500
    message:
      gd at samba.org (r21858)  2007-03-16 11:21:38 -0500 (Fri, 16 Mar 2007)
          
          Fix typo.
          
          Guenther
          
    ------------------------------------------------------------
    merged: gd at samba.org-20070316170640-jgwasppnw4ehplwp
    parent: gd at samba.org-20070316170514-skl5gle5fhcds64r
    committer: gd at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Fri 2007-03-16 12:06:40 -0500
    message:
      gd at samba.org (r21857)  2007-03-16 11:20:47 -0500 (Fri, 16 Mar 2007)
          
          Stop pretending to be Vista in the %a macro towards Samba clients.
          
          Guenther
          
    ------------------------------------------------------------
    merged: gd at samba.org-20070316170514-skl5gle5fhcds64r
    parent: gd at samba.org-20070316170332-f2v4njvldk26o6dg
    committer: gd at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Fri 2007-03-16 12:05:14 -0500
    message:
      gd at samba.org (r21855)  2007-03-16 10:48:07 -0500 (Fri, 16 Mar 2007)
          
          Fix a memleak in the krb5 locator and comment out gfree_all() which doesn't
          make sense as long as it doesn't work as an lp_unload().
          
          Guenther
          
    ------------------------------------------------------------
    merged: gd at samba.org-20070316170332-f2v4njvldk26o6dg
    parent: vlendec at samba.org-20070316170156-83db7x4tqir577bg
    committer: gd at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Fri 2007-03-16 12:03:32 -0500
    message:
      gd at samba.org (r21854)  2007-03-16 09:13:46 -0500 (Fri, 16 Mar 2007)
          
          Add gfree_interfaces() to gfree_all().
          
          Guenther
          
    ------------------------------------------------------------
    merged: vlendec at samba.org-20070316170156-83db7x4tqir577bg
    parent: vlendec at samba.org-20070315231829-384f3gbeyfl3mjex
    committer: vlendec at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Fri 2007-03-16 12:01:56 -0500
    message:
      vlendec at samba.org (r21853)  2007-03-16 08:09:09 -0500 (Fri, 16 Mar 2007)
          
          Fix a valgrind error
    ------------------------------------------------------------
    merged: vlendec at samba.org-20070315231829-384f3gbeyfl3mjex
    parent: jra at samba.org-20070315231431-9ba6puwqc054sd3a
    committer: vlendec at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Thu 2007-03-15 18:18:29 -0500
    message:
      vlendec at samba.org (r21851)  2007-03-15 17:48:30 -0500 (Thu, 15 Mar 2007)
          
          Obvious typos...
    ------------------------------------------------------------
    merged: jra at samba.org-20070315231431-9ba6puwqc054sd3a
    parent: jerry at samba.org-20070315230913-qs667op28gcvpu7f
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Thu 2007-03-15 18:14:31 -0500
    message:
      jra at samba.org (r21850)  2007-03-15 17:11:13 -0500 (Thu, 15 Mar 2007)
          
          After Jerry explained to me the HORRIBLE way in which
          the MIT gss libraries *SUCK*, move the frees to the end
          of the function so MIT doesn't segfault.....
          Add a comment so that another engineer knows why I did
          this.
          Jeremy.
          
    ------------------------------------------------------------
    merged: jerry at samba.org-20070315230913-qs667op28gcvpu7f
    parent: jra at samba.org-20070315230723-txtlz8kf1b3kdbuj
    committer: jerry at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Thu 2007-03-15 18:09:13 -0500
    message:
      jerry at samba.org (r21848)  2007-03-15 17:09:03 -0500 (Thu, 15 Mar 2007)
          
          add a comment about gss_import_name() and when to free the krb5 principal data
    ------------------------------------------------------------
    merged: jra at samba.org-20070315230723-txtlz8kf1b3kdbuj
    parent: jra at samba.org-20070315230555-awag2y064rynv67j
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Thu 2007-03-15 18:07:23 -0500
    message:
      jra at samba.org (r21847)  2007-03-15 16:53:53 -0500 (Thu, 15 Mar 2007)
          
          Fix memory leaks in error paths (and in main code path in one case...)
          in sasl bind. Wonder why coverity didn't find these ?
          Jeremy.
          
    ------------------------------------------------------------
    merged: jra at samba.org-20070315230555-awag2y064rynv67j
    parent: jra at samba.org-20070315230246-8h1hi8pa66gfsw5y
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Thu 2007-03-15 18:05:55 -0500
    message:
      jra at samba.org (r21846)  2007-03-15 15:45:27 -0500 (Thu, 15 Mar 2007)
          
          Try and fix the Darwin build which seems to have a strange krb5.
          Jeremy.
          
    ------------------------------------------------------------
    merged: jra at samba.org-20070315230246-8h1hi8pa66gfsw5y
    parent: sfrench at samba.org-20070314230306-ztrcwdr2x4jnq9on
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Thu 2007-03-15 18:02:46 -0500
    message:
      jra at samba.org (r21845)  2007-03-15 14:18:18 -0500 (Thu, 15 Mar 2007)
          
          Refactor the sessionsetupX code a little to allow us
          to return a NT_STATUS_TIME_DIFFERENCE_AT_DC error to
          a client when there's clock skew. Will help people
          debug this. Prepare us for being able to return the
          correct sessionsetupX "NT_STATUS_MORE_PROCESSING_REQUIRED"
          error with associated krb5 clock skew error to allow
          clients to re-sync time with us when we're eventually
          able to be a KDC.
          Jeremy.
          
    ------------------------------------------------------------
    merged: sfrench at samba.org-20070314230306-ztrcwdr2x4jnq9on
    parent: vlendec at samba.org-20070313230623-w0o9kgavoqdfotjc
    committer: sfrench at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Wed 2007-03-14 18:03:06 -0500
    message:
      sfrench at samba.org (r21840)  2007-03-14 17:15:21 -0500 (Wed, 14 Mar 2007)
          
          mount.cifs compile on old libc missing bind mount #define
          
          Thanks to Thomas Jarosch for pointing this out.
          
          

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


More information about the samba-cvs mailing list