[SCM] Samba Shared Repository - branch v3-3-stable updated - release-3-2-0pre2-3772-g7aa04ad

Karolin Seeger kseeger at samba.org
Thu Aug 21 12:42:22 GMT 2008


The branch, v3-3-stable has been updated
       via  7aa04ad3750ca04688897b3cc3ebc916086f2a27 (commit)
       via  3e821afd693bdc5f48446cf6e7fdbb67aaf55fab (commit)
       via  4ca784f3ea7b4e0d2dc3fd71b4ddf2329730a519 (commit)
       via  ab24d0ecea1425135e17950f9b6aad910597e9da (commit)
       via  2e888df56e2980ef324e36498c22c0b00d9af56e (commit)
       via  e5162080b71e9f0f21f8e70a5f9d94cc2dc6d30d (commit)
       via  7a460de6aff537bb39fc4382eb81c03325ee9c6f (commit)
       via  41cf708ce31f25169ca1f5d99fa243af1ee8d931 (commit)
       via  131145a49a049af0ab762f4cf2de9e8313168e11 (commit)
       via  21a1e419626418049cc235bee50a9d9388c223cc (commit)
       via  9df200bb2f77f59ff5d361ab15a26b382e6d98ae (commit)
       via  65fb57eb4efe03baae1486ca27317c4f40b19c2f (commit)
       via  0b6c81c5924ca2ac3721649daac1e471edce9c8c (commit)
       via  1ed2ae936b3dd3c5248d7707a7e53bbc190b97c6 (commit)
       via  b87bc783013105eb8b3bb80b43727e9d2759a8cb (commit)
       via  964dfee1180093f47e5dd9424b67de912bb7993a (commit)
       via  dedc248b562aed5ec3f456f9528ea8bddb8dece0 (commit)
       via  735929ac2bcc2ba553726b01effa6f1916662413 (commit)
       via  d44cb5e5aa31911d2de761da1ea3b25c0c88452e (commit)
       via  242e8f0c61b2f94000855b0ae07ece21f62f2f15 (commit)
       via  005255e43c177965ae1d232cd96b96849b081420 (commit)
       via  5389a1e5b841346ff77699929602865848ec79bb (commit)
       via  af72fca1446fda571b6b145010cb0b1921a81f08 (commit)
       via  eeb9c59117b3a480727c0ad7044375e4757600f0 (commit)
       via  79923ac543152e854da20f93d4460c24a09d6a9c (commit)
       via  4856d70b46ee5e2bdd74fff810a662bc08b1f2a3 (commit)
       via  b8d6e8322652493c1b53689b2dcad29490e656a2 (commit)
       via  ffebe2e16ff41a90695076952e4a2c02766f8310 (commit)
       via  30e6b4f4a45643c7a0fe4f2ae038148e50b1f8c4 (commit)
       via  0f71b748a580defaf994809f91c9d9654eab3554 (commit)
       via  f84d9907a3744df6ee59d5de4d3ffe121cf247c8 (commit)
       via  eab3667490df5c2008b7aaaef5e626c099ea86fd (commit)
       via  65688c9eca396ef95b39e0ae7ce5c0f8c7fe078d (commit)
      from  a43bbfbe0464da4f3d6c90590245aa3d65739570 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-stable


- Log -----------------------------------------------------------------
commit 7aa04ad3750ca04688897b3cc3ebc916086f2a27
Author: Michael Adam <obnox at samba.org>
Date:   Wed Aug 20 22:31:53 2008 +0200

    gitignore: add examples/libsmbclient/tree
    
    Michael
    (cherry picked from commit e5c4cbbf5a4b3e5db1732043a74cd1f4a5eec136)
    (cherry picked from commit 53cb5c7336d898c75915b9ab368069b087ca61f5)

commit 3e821afd693bdc5f48446cf6e7fdbb67aaf55fab
Author: Michael Adam <obnox at samba.org>
Date:   Wed Aug 20 22:31:07 2008 +0200

    gitignore: add lib/netapi/tests/Makefile
    
    Michael
    (cherry picked from commit fdf29c1cdf6b9bd1c6fb7a9f070084e0df5470bb)
    (cherry picked from commit df01ba06121430ec7f151fa9ffc518425d9d7be6)

commit 4ca784f3ea7b4e0d2dc3fd71b4ddf2329730a519
Author: Michael Adam <obnox at samba.org>
Date:   Wed Aug 20 22:34:26 2008 +0200

    gitignore: add libsmbsharemodes.syms - this is now generated
    
    Michael
    (cherry picked from commit 11458f9a9ac17c68aa0496d2ade4b93d02e7ebcc)
    (cherry picked from commit fd83cc1b47e776263ea3f3cb12a17195f4f6847e)

commit ab24d0ecea1425135e17950f9b6aad910597e9da
Author: Michael Adam <obnox at samba.org>
Date:   Wed Aug 20 15:09:27 2008 +0200

    build: auto-generate symbols for libsmbsharemodes.
    
    Michael
    (cherry picked from commit f1d84e76bb6935e80b01d13414980f8de1f71824)
    (cherry picked from commit 58628cb4bcf3417c8d242b556bb353ba0ebe6295)

commit 2e888df56e2980ef324e36498c22c0b00d9af56e
Author: Michael Adam <obnox at samba.org>
Date:   Wed Aug 20 22:33:17 2008 +0200

    gitignore: add libsmbclient.syms - this is now generated
    
    Michael
    (cherry picked from commit 02d4b820fccfef1387f47db4bb5ade3dfd0d25bb)
    (cherry picked from commit a0b90e42fe24e42b785111428836078b194728de)

commit e5162080b71e9f0f21f8e70a5f9d94cc2dc6d30d
Author: Michael Adam <obnox at samba.org>
Date:   Wed Aug 20 15:06:02 2008 +0200

    build: autogenerate symbols for libsmbclient.so
    
    Michael
    (cherry picked from commit d6fb6348a3672e915556dcb36c1a4999d4abae18)
    (cherry picked from commit f5c484caa57c6aff276118d7c901dda33d32cf3b)

commit 7a460de6aff537bb39fc4382eb81c03325ee9c6f
Author: Michael Adam <obnox at samba.org>
Date:   Wed Aug 20 14:56:18 2008 +0200

    build: fix bug #5590 by not linking in the static libs but the objects.
    
    Michael
    (cherry picked from commit 6ad2090391a92ebe822b2d7b80e180c251dc8e7a)
    (cherry picked from commit d6e32fdef7a321081de6cffa6e25efe0245c40ee)

commit 41cf708ce31f25169ca1f5d99fa243af1ee8d931
Author: Michael Adam <obnox at samba.org>
Date:   Wed Aug 20 14:55:24 2008 +0200

    build: fall down to the same place when using an internal lib statically.
    
    Michael
    (cherry picked from commit 702c0bc04668117e3521d687b9b5a87fd7e0f1b1)
    (cherry picked from commit 8e19123bf0732974ce2df25cca4216b1bd17ca24)

commit 131145a49a049af0ab762f4cf2de9e8313168e11
Author: Michael Adam <obnox at samba.org>
Date:   Wed Aug 20 14:47:26 2008 +0200

    build: remove duplicated and hardcoded definition of LIBSMBSHAREMODES
    
    Michael
    (cherry picked from commit c3c3dadcab81f0a1ae8834e85e7e80a3da6601fb)
    (cherry picked from commit c46f0450e570074bf2530785cacb799e91f81435)

commit 21a1e419626418049cc235bee50a9d9388c223cc
Author: Michael Adam <obnox at samba.org>
Date:   Wed Aug 20 13:22:13 2008 +0200

    build: rename LIBNETAPI_OBJ1 to LIBNETAPI_OBJ0 for consistency.
    
    Michael
    (cherry picked from commit ead9b9d7167d999d73cf4111f3b321236aac2a15)
    (cherry picked from commit 6048ac2981d584e7801d80b8cd7bb11bf6032db9)

commit 9df200bb2f77f59ff5d361ab15a26b382e6d98ae
Author: Michael Adam <obnox at samba.org>
Date:   Fri Aug 15 15:55:17 2008 +0200

    configure: use libdir=${prefix}/lib and modules=${libdir}/samba as default with-fhs.
    
    This is what one actually wants:
    Shared/static libs in /usr/lib, shared modules and so on in /usr/lib/samba.
    
    Michael
    (cherry picked from commit 03de8c1955a85f2e3e9f947309e09023138a1591)
    (cherry picked from commit bbb3f6e9b5abdbe321ad0658c442d5bc6c3a4477)

commit 65fb57eb4efe03baae1486ca27317c4f40b19c2f
Author: Michael Adam <obnox at samba.org>
Date:   Fri Aug 15 14:38:41 2008 +0200

    configure: use ${libdir} instead of \${LIBDIR}.
    
    Now after removing --with-libdir, the value of ${libdir} won't change
    anymore at that stage, so there is no need to have the variable expansion
    deferred to "make".
    
    Michael
    (cherry picked from commit 256977cf05cb4c4073ece1389a7e4939b18f5f13)
    (cherry picked from commit 38f4a77feafdd9c40e1cb670c5e0cd971f130706)

commit 0b6c81c5924ca2ac3721649daac1e471edce9c8c
Author: Michael Adam <obnox at samba.org>
Date:   Fri Aug 15 14:35:46 2008 +0200

    configure: remove the --with-libdir parameter.
    
    This is redundant: use the autoconf-provided --libdir instead.
    This will also make the new distinction between libdir and modulesdir
    more visible.
    
    Michael
    (cherry picked from commit c1d53b7c767275b39dc8ecfcd5b6129ee2cabb6d)
    (cherry picked from commit fd2595b4cf18de08a3124be0080a2c28bdb130ba)

commit 1ed2ae936b3dd3c5248d7707a7e53bbc190b97c6
Author: Michael Adam <obnox at samba.org>
Date:   Fri Aug 15 00:45:57 2008 +0200

    popt: add support for setting MODULESDIR via popt_common_dynconfig.
    
    Michael
    (cherry picked from commit 81030e49ce344260d279a3112b13a21ce3520748)
    (cherry picked from commit b809c5190c9704af8ec4d0157afa6df03ad5a42a)

commit b87bc783013105eb8b3bb80b43727e9d2759a8cb
Author: Michael Adam <obnox at samba.org>
Date:   Fri Aug 15 00:50:56 2008 +0200

    svcctl: use MODULESDIR instead of LIBDIR for the svcctl script directory.
    
    Michael
    (cherry picked from commit bb19634138cfd1f527c44e16a44aa21ebee50c1c)
    (cherry picked from commit 40000ceb2abb859dc21a8aa2d55bfe5c594dcfad)

commit 964dfee1180093f47e5dd9424b67de912bb7993a
Author: Michael Adam <obnox at samba.org>
Date:   Fri Aug 15 00:49:19 2008 +0200

    libgpo: use MODULESDIR instead of LIBDIR for the group policy extensions.
    
    Michael
    (cherry picked from commit 3346dd40832e8d61edfe4c56dce6fe85031f20f1)
    (cherry picked from commit 5550e3903d41927a078084e22539b697c19773b0)

commit dedc248b562aed5ec3f456f9528ea8bddb8dece0
Author: Michael Adam <obnox at samba.org>
Date:   Fri Aug 15 00:47:30 2008 +0200

    Use module_path() instead of lib_path() for loading shared modules.
    
    Michael
    (cherry picked from commit 22fb3ef1bb4abb33b49d275f9a5d85a1924c22ea)
    (cherry picked from commit ae45ea1debc38c0c01da3f8cc1dddcc0d1ff30e2)

commit 735929ac2bcc2ba553726b01effa6f1916662413
Author: Michael Adam <obnox at samba.org>
Date:   Fri Aug 15 00:44:14 2008 +0200

    Add modules_path() to construct paths to files in MODULESDIR.
    
    Michael
    (cherry picked from commit 5ef9da6f4f04b07804b389902862fae0fbbfed13)
    (cherry picked from commit c22842440dc1732a77e0bce71fff421b1bca0151)

commit d44cb5e5aa31911d2de761da1ea3b25c0c88452e
Author: Michael Adam <obnox at samba.org>
Date:   Fri Aug 15 00:46:46 2008 +0200

    buildoptions: output MODULESDIR.
    
    Michael
    (cherry picked from commit bcb868e4340a856c4009450479628088a8a1628c)
    (cherry picked from commit e4f2815158bd74245e6c4d7f10d59254e095846c)

commit 242e8f0c61b2f94000855b0ae07ece21f62f2f15
Author: Michael Adam <obnox at samba.org>
Date:   Fri Aug 15 00:43:31 2008 +0200

    dynconfig: add support for MODULESDIR.
    
    Michael
    (cherry picked from commit 34309f097f5c7321930bf6c2ea2447de1008130c)
    (cherry picked from commit d498bdf6e8d77db221bea79b3c0d4a2dd415be46)

commit 005255e43c177965ae1d232cd96b96849b081420
Author: Michael Adam <obnox at samba.org>
Date:   Fri Aug 15 00:36:49 2008 +0200

    configure: Add --with-modulesdir to accompany --with-libdir.
    
    This starts the seplitting of libdir in to libdir and modulesdir.
    Our shared libs should go into libdir, the internal shared modules,
    codepages, and other stuff that was originally in libdir, should
    go into modulesdir.
    
    The idea behind this is, that in a typical installation,
    the shared (and static) libraries (as libtalloc, libsmbclient,
    libwbclient and others) should be put into /usr/lib, while
    the e.g. the vfs modules should reside in /usr/lib/samba.
    
    This is meant to ease the work of packagers and reduce
    the needs for manual interaction and workarounds.
    
    Michael
    (cherry picked from commit b17d1ff646e22c3e979224d119b283fc3af780a8)
    (cherry picked from commit 43a26e856aa39cd70d1428b554532ea6c3f2018c)

commit 5389a1e5b841346ff77699929602865848ec79bb
Author: Michael Adam <obnox at samba.org>
Date:   Fri Aug 15 00:58:47 2008 +0200

    dynconfig: remove commented-out old stuff from dynconfig.c and dynconfig.h
    
    Michael
    (cherry picked from commit 85a781fa0248fcd0cefcc4de25b3dea3e37d5844)
    (cherry picked from commit cf89392a74e84fdd9bfbeb6e9c0bbf2ce298f115)

commit af72fca1446fda571b6b145010cb0b1921a81f08
Author: Michael Adam <obnox at samba.org>
Date:   Thu Aug 14 23:44:06 2008 +0200

    dynconfig: remove unused prototypes.
    
    set_dyn_STATEDIR, is_default_dyn_STATEDIR,
    set_dyn_CACHEDIR, is_default_dyn_CACHEDIR
    are neither used nor implemented.
    
    Michael
    (cherry picked from commit f30b70b2c3a49bc962848039953a565a040b563d)
    (cherry picked from commit 6a5447b15a1b534659e62e929688b6a9d742e2be)

commit eeb9c59117b3a480727c0ad7044375e4757600f0
Author: Michael Adam <obnox at samba.org>
Date:   Thu Aug 14 23:14:42 2008 +0200

    proto.h: remove prototypes from dynconfig.c
    
    These are also in dynconfig.h and were originally added
    by "make proto" by accident.
    
    Michael
    (cherry picked from commit 4fb69fe1eeebc466944f3daacfacec60ad043b0c)
    (cherry picked from commit 02dc99ef564ca7c2da322d2942cf28aeb7bcae2f)

commit 79923ac543152e854da20f93d4460c24a09d6a9c
Author: Michael Adam <obnox at samba.org>
Date:   Thu Aug 14 23:18:28 2008 +0200

    Makefile: print codepagedir in "make showlayout".
    
    Michael
    (cherry picked from commit a823733b91958adf938214113e6875315c6ae5b2)
    (cherry picked from commit 253c3ae70674daa4ad619c2dd66ad8b0c02af908)

commit 4856d70b46ee5e2bdd74fff810a662bc08b1f2a3
Author: Günther Deschner <gd at samba.org>
Date:   Wed Aug 20 18:40:58 2008 +0200

    fix build warning.
    
    Guenther
    (cherry picked from commit a75055be5ff7ebe3476cfac86c6597a56a843c23)
    (cherry picked from commit b0c63c062fe90e4a4ec61ff5b5849e758834b8d7)

commit b8d6e8322652493c1b53689b2dcad29490e656a2
Author: Günther Deschner <gd at samba.org>
Date:   Wed Aug 20 21:17:35 2008 +0200

    libads: remove unused vars.
    
    Guenther
    (cherry picked from commit ea9fc3bea31b11e715d9524defc18b75e5943842)
    (cherry picked from commit 7d96c8ce5c49b031b5a9a60a9ad5252653577513)

commit ffebe2e16ff41a90695076952e4a2c02766f8310
Author: Günther Deschner <gd at samba.org>
Date:   Wed Aug 20 20:24:45 2008 +0200

    fix another build warning.
    
    Guenther
    (cherry picked from commit 43693ce6c678b961fa516bbf502af92f87cd5346)
    (cherry picked from commit 1a85fce6e432bafed98856f22e0736489fa6f1f5)

commit 30e6b4f4a45643c7a0fe4f2ae038148e50b1f8c4
Author: Gerald (Jerry) Carter <jerry at samba.org>
Date:   Wed Aug 20 13:00:40 2008 -0500

    nss_winbind: When returning NSS_UNAVAIL, squash errno to ENOENT
    
    According to the GNU libc nss guide, we should always set
    errno to ENOENT when returning NSS_UNAVAIL.
    
    http://www.gnu.org/software/libtool/manual/libc/NSS-Modules-Interface.html#NSS-Modules-Interface
    
    At least the MQ Series message queing service that runs
    on WebSphere will fail if you return any other errno in this case.
    (cherry picked from commit ee26664602445fa7798e2061f6bcbef0756d6528)
    (cherry picked from commit a46d7ffeef1807bafda15eb76ec74fcf41aae7f6)

commit 0f71b748a580defaf994809f91c9d9654eab3554
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Aug 19 16:34:50 2008 +0200

    smbd: fix the handling of create_options to pass RAW-OPEN
    
    Some of the bits generate INVALID_PARAMETER and some bits
    are ignored when they come from a client, that's why we need
    to use bits from the ignored range for our internal usage.
    
    metze
    (cherry picked from commit 7b4c8a4e39f310eb450918fa841b0ea1b4af19f7)
    (cherry picked from commit a12cbcb009a02ee23ec0b24c2fca5deaa0ba6412)

commit f84d9907a3744df6ee59d5de4d3ffe121cf247c8
Author: Steven Danneman <steven.danneman at isilon.com>
Date:   Tue Aug 19 11:05:07 2008 -0700

    Updated Doxyfile conf to doxygen version 1.5.3
    
    * Removed deprecated configuration parameters
    * Silenced all warnings due to lack of doxygen comments
    * Reordered config parameters to match doxygen's canonical ordering
    (cherry picked from commit c3dda372241c4e7171aa928fe0a4f5889bcb21a8)

commit eab3667490df5c2008b7aaaef5e626c099ea86fd
Author: Jeff Layton <jlayton at redhat.com>
Date:   Tue Aug 19 21:29:41 2008 -0400

    cifs.upcall: handle MSKRB5 OID properly
    
    When the kernel sends the upcall a sec=mskrb5 parameter, that means
    the the MSKRB5 OID is preferred by the server. This patch fixes the
    upcall to use that OID in place of the "normal" krb5 OID when it
    gets a sec=mskrb5 parameter.
    
    Signed-off-by: Jeff Layton <jlayton at redhat.com>
    Acked-by: Steve French <smfrench at gmail.com>
    (cherry picked from commit c30d73035dd202d0055ed7ede243e1703c4e9450)

commit 65688c9eca396ef95b39e0ae7ce5c0f8c7fe078d
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Aug 19 17:32:07 2008 -0700

    Fix bug 5697 nmbd spins in reload_interfaces when only loopback has an IPv4 address
    reported by Ted Percival <ted at midg3t.net>.
    Jeremy.
    (cherry picked from commit cbc6b89feee81710f77c87bb7ce429fb4156ce07)

-----------------------------------------------------------------------

Summary of changes:
 .gitignore                           |    4 +
 source/Doxyfile                      |   78 ++++++++-----
 source/Makefile.in                   |   44 ++++---
 source/client/cifs.upcall.c          |   18 ++-
 source/dynconfig.c                   |  217 +---------------------------------
 source/exports/libsmbclient.syms     |    4 -
 source/exports/libsmbsharemodes.syms |    3 -
 source/include/dynconfig.h           |   29 ++---
 source/include/proto.h               |   28 +----
 source/include/smb.h                 |   15 ++-
 source/lib/interface.c               |    7 +-
 source/lib/module.c                  |    2 +-
 source/lib/popt_common.c             |   10 ++
 source/lib/util.c                    |   13 ++
 source/libads/ldap.c                 |    3 -
 source/libgpo/gpext/gpext.c          |    2 +-
 source/m4/aclocal.m4                 |    4 +-
 source/m4/check_path.m4              |   23 ++--
 source/nmbd/nmbd.c                   |    4 +-
 source/nmbd/nmbd_processlogon.c      |    2 +-
 source/nmbd/nmbd_subnetdb.c          |   11 +-
 source/nsswitch/wb_common.c          |   20 +++-
 source/rpc_client/cli_pipe.c         |    4 +-
 source/script/mkbuildoptions.awk     |    1 +
 source/services/services_db.c        |    6 +-
 source/services/svc_rcinit.c         |    6 +-
 source/smbd/nttrans.c                |   12 ++
 source/smbd/open.c                   |    5 +
 28 files changed, 211 insertions(+), 364 deletions(-)
 delete mode 100644 source/exports/libsmbclient.syms
 delete mode 100644 source/exports/libsmbsharemodes.syms


Changeset truncated at 500 lines:

diff --git a/.gitignore b/.gitignore
index 5e779f1..ca09083 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ source/include/stamp-h
 source/include/version.h
 source/Makefile
 source/lib/netapi/examples/Makefile
+source/lib/netapi/tests/Makefile
 source/config.log
 source/config.status
 source/configure
@@ -32,6 +33,8 @@ source/cscope.out
 source/torture.tdb
 source/pkgconfig/*.pc
 source/st
+source/exports/libsmbclient.syms
+source/exports/libsmbsharemodes.syms
 source/exports/libnetapi.syms
 source/exports/libtalloc.syms
 source/exports/libtdb.syms
@@ -61,6 +64,7 @@ examples/libsmbclient/teststat3
 examples/libsmbclient/testutime
 examples/libsmbclient/testwrite
 examples/libsmbclient/testtruncate
+examples/libsmbclient/tree
 source/librpc/gen_ndr/cli_krb5pac.*
 source/librpc/gen_ndr/cli_messaging.*
 source/librpc/gen_ndr/cli_misc.*
diff --git a/source/Doxyfile b/source/Doxyfile
index c104078..9ade25c 100644
--- a/source/Doxyfile
+++ b/source/Doxyfile
@@ -1,7 +1,7 @@
-# Doxyfile 0.1
+# Doxyfile 1.5.3
 
 #---------------------------------------------------------------------------
-# General configuration options
+# Project related configuration options
 #---------------------------------------------------------------------------
 PROJECT_NAME           = Samba
 PROJECT_NUMBER         = HEAD
@@ -13,68 +13,84 @@ PROJECT_NUMBER         = HEAD
 # doesn't mind variables being redefined.
 
 OUTPUT_DIRECTORY       = dox
-
 OUTPUT_LANGUAGE        = English
-EXTRACT_ALL            = YES
-EXTRACT_PRIVATE        = YES
-EXTRACT_STATIC         = YES
-HIDE_UNDOC_MEMBERS     = NO
-HIDE_UNDOC_CLASSES     = NO
+DOXYFILE_ENCODING      = UTF-8
 BRIEF_MEMBER_DESC      = YES
 REPEAT_BRIEF           = YES
 ALWAYS_DETAILED_SEC    = NO
 FULL_PATH_NAMES        = YES
 STRIP_FROM_PATH        = $(PWD)/
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = YES
+INHERIT_DOCS           = YES
+TAB_SIZE               = 8
+ALIASES                =
+OPTIMIZE_OUTPUT_FOR_C  = YES
+DISTRIBUTE_GROUP_DOC   = NO
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = YES
+EXTRACT_STATIC         = YES
+EXTRACT_LOCAL_CLASSES  = YES
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
 INTERNAL_DOCS          = YES
-CLASS_DIAGRAMS         = YES
-SOURCE_BROWSER         = YES
-INLINE_SOURCES         = YES
-STRIP_CODE_COMMENTS    = NO
 CASE_SENSE_NAMES       = YES
-SHORT_NAMES            = NO
 HIDE_SCOPE_NAMES       = YES
-VERBATIM_HEADERS       = YES
 SHOW_INCLUDE_FILES     = YES
-JAVADOC_AUTOBRIEF      = YES
-INHERIT_DOCS           = YES
 INLINE_INFO            = YES
 SORT_MEMBER_DOCS       = NO
-DISTRIBUTE_GROUP_DOC   = NO
-TAB_SIZE               = 8
+SORT_BRIEF_DOCS        = NO
 GENERATE_TODOLIST      = YES
 GENERATE_TESTLIST      = YES
 GENERATE_BUGLIST       = YES
-ALIASES                = 
+GENERATE_DEPRECATEDLIST= YES
 ENABLED_SECTIONS       = 
 MAX_INITIALIZER_LINES  = 30
-OPTIMIZE_OUTPUT_FOR_C  = YES
 SHOW_USED_FILES        = YES
-REFERENCED_BY_RELATION = YES
+SHOW_DIRECTORIES       = YES
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
 QUIET                  = YES
 WARNINGS               = NO
 WARN_IF_UNDOCUMENTED   = NO
+WARN_IF_DOC_ERROR      = NO
+WARN_NO_PARAMDOC       = NO
 WARN_FORMAT            = "$file:$line: $text"
 WARN_LOGFILE           = 
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
 INPUT                  = . 
+INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          = *.c \
                          *.h \
                          *.idl
 RECURSIVE              = YES
 EXCLUDE                = include/includes.h \
                          include/proto.h
+EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       = 
 EXAMPLE_PATH           = 
 EXAMPLE_PATTERNS       = 
+EXAMPLE_RECURSIVE      = NO
 IMAGE_PATH             = 
 INPUT_FILTER           = 
 FILTER_SOURCE_FILES    = NO
 #---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER         = YES
+INLINE_SOURCES         = YES
+STRIP_CODE_COMMENTS    = NO
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION    = YES
+REFERENCES_LINK_SOURCE = YES
+VERBATIM_HEADERS       = YES
+#---------------------------------------------------------------------------
 # configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 ALPHABETICAL_INDEX     = YES
@@ -85,13 +101,12 @@ IGNORE_PREFIX          =
 #---------------------------------------------------------------------------
 GENERATE_HTML          = YES
 HTML_OUTPUT            = .
+HTML_FILE_EXTENSION    = .html
 HTML_HEADER            = 
 HTML_FOOTER            = 
 HTML_STYLESHEET        = 
 HTML_ALIGN_MEMBERS     = YES
 GENERATE_HTMLHELP      = NO
-GENERATE_CHI           = NO
-BINARY_TOC             = NO
 TOC_EXPAND             = NO
 DISABLE_INDEX          = NO
 ENUM_VALUES_PER_LINE   = 3
@@ -152,25 +167,26 @@ PERL_PATH              = /usr/bin/perl
 # configuration options related to the dot tool   
 #---------------------------------------------------------------------------
 HAVE_DOT               = NO
+CLASS_DIAGRAMS         = YES
+HIDE_UNDOC_RELATIONS   = NO
 CLASS_GRAPH            = YES
 COLLABORATION_GRAPH    = YES
+GROUP_GRAPHS           = YES
 TEMPLATE_RELATIONS     = YES
 INCLUDE_GRAPH          = YES
 INCLUDED_BY_GRAPH      = YES
+CALL_GRAPH             = YES
+CALLER_GRAPH           = YES
 GRAPHICAL_HIERARCHY    = YES
+DIRECTORY_GRAPH        = YES
+DOT_IMAGE_FORMAT       = png
 DOT_PATH               = 
 DOTFILE_DIRS           = 
-MAX_DOT_GRAPH_WIDTH    = 1024
-MAX_DOT_GRAPH_HEIGHT   = 1024
+DOT_GRAPH_MAX_NODES    = 50
+MAX_DOT_GRAPH_DEPTH    = 0
 GENERATE_LEGEND        = YES
 DOT_CLEANUP            = YES
 #---------------------------------------------------------------------------
 # configuration::additions related to the search engine   
 #---------------------------------------------------------------------------
 SEARCHENGINE           = NO
-CGI_NAME               = search.cgi
-CGI_URL                = 
-DOC_URL                = 
-DOC_ABSPATH            = 
-BIN_ABSPATH            = /usr/local/bin/
-EXT_DOC_PATHS          = 
diff --git a/source/Makefile.in b/source/Makefile.in
index d0eba62..100618d 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -99,17 +99,18 @@ BINDIR = @bindir@
 SBINDIR = @sbindir@
 ROOTSBINDIR = @rootsbindir@
 LIBDIR = @libdir@
+MODULESDIR = @modulesdir@
 INCLUDEDIR=@includedir@
 PAMMODULESDIR = @pammodulesdir@
-VFSLIBDIR = $(LIBDIR)/vfs
-PDBLIBDIR = $(LIBDIR)/pdb
-RPCLIBDIR = $(LIBDIR)/rpc
-IDMAPLIBDIR = $(LIBDIR)/idmap
-NSSINFOLIBDIR = $(LIBDIR)/nss_info
-CHARSETLIBDIR = $(LIBDIR)/charset
-AUTHLIBDIR = $(LIBDIR)/auth
-CONFIGLIBDIR = $(LIBDIR)/config
-GPEXTLIBDIR = $(LIBDIR)/gpext
+VFSLIBDIR = $(MODULESDIR)/vfs
+PDBLIBDIR = $(MODULESDIR)/pdb
+RPCLIBDIR = $(MODULESDIR)/rpc
+IDMAPLIBDIR = $(MODULESDIR)/idmap
+NSSINFOLIBDIR = $(MODULESDIR)/nss_info
+CHARSETLIBDIR = $(MODULESDIR)/charset
+AUTHLIBDIR = $(MODULESDIR)/auth
+CONFIGLIBDIR = $(MODULESDIR)/config
+GPEXTLIBDIR = $(MODULESDIR)/gpext
 CONFIGDIR = @configdir@
 VARDIR = @localstatedir@
 MANDIR = @mandir@
@@ -166,6 +167,7 @@ PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" \
 	-DLOCKDIR=\"$(LOCKDIR)\" \
 	-DPIDDIR=\"$(PIDDIR)\" \
 	-DLIBDIR=\"$(LIBDIR)\" \
+	-DMODULESDIR=\"$(MODULESDIR)\" \
 	-DLOGFILEBASE=\"$(LOGFILEBASE)\" \
 	-DSHLIBEXT=\"@SHLIBEXT@\" \
 	-DCTDBDIR=\"$(CTDBDIR)\" \
@@ -1822,7 +1824,7 @@ shlibs test_shlibs: @LIBADDNS_SHARED@
 #
 #-------------------------------------------------------------------
 
-LIBNETAPI_OBJ1 = lib/netapi/netapi.o \
+LIBNETAPI_OBJ0 = lib/netapi/netapi.o \
 		 lib/netapi/cm.o \
 		 librpc/gen_ndr/ndr_libnetapi.o \
 		 lib/netapi/libnetapi.o \
@@ -1835,7 +1837,7 @@ LIBNETAPI_OBJ1 = lib/netapi/netapi.o \
 		 lib/netapi/samr.o \
 		 lib/netapi/sid.o
 
-LIBNETAPI_OBJ  = $(LIBNETAPI_OBJ1) $(LIBNET_OBJ) \
+LIBNETAPI_OBJ  = $(LIBNETAPI_OBJ0) $(LIBNET_OBJ) \
 		 $(LIBSMBCONF_OBJ) \
 		 $(REG_SMBCONF_OBJ) \
 		 $(PARAM_WITHOUT_REG_OBJ) $(LIB_NONSMBD_OBJ) \
@@ -1867,9 +1869,9 @@ $(LIBNETAPI_SHARED_TARGET): $(LIBNETAPI_SHARED_TARGET_SONAME)
 	@rm -f $@
 	@ln -s -f `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` $@
 
-$(LIBNETAPI_STATIC_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ1)
+$(LIBNETAPI_STATIC_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ0)
 	@echo Linking non-shared library $@
-	@-$(AR) -rc $@ $(LIBNETAPI_OBJ1)
+	@-$(AR) -rc $@ $(LIBNETAPI_OBJ0)
 
 libnetapi: $(LIBNETAPI)
 
@@ -1915,10 +1917,13 @@ LIBSMBCLIENT_SOVER=@LIBSMBCLIENT_SOVER@
 LIBSMBCLIENT_SHARED_TARGET_SONAME=$(LIBSMBCLIENT_SHARED_TARGET).$(LIBSMBCLIENT_SOVER)
 LIBSMBCLIENT_STATIC_TARGET=@LIBSMBCLIENT_STATIC_TARGET@
 LIBSMBCLIENT=$(LIBSMBCLIENT_STATIC_TARGET) @LIBSMBCLIENT_SHARED@
-#LIBSMBCLIENT_SYMS=$(srcdir)/exports/libsmbclient. at SYMSEXT@
+LIBSMBCLIENT_SYMS=$(srcdir)/exports/libsmbclient. at SYMSEXT@
 LIBSMBCLIENT_HEADERS=$(srcdir)/include/libsmbclient.h
 
-$(LIBSMBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
+$(LIBSMBCLIENT_SYMS): $(LIBSMBCLIENT_HEADERS)
+	@$(MKSYMS_SH) $(AWK) $@ $(LIBSMBCLIENT_HEADERS)
+
+$(LIBSMBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) $(LIBSMBCLIENT_SYMS) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
 	@echo Linking shared library $@
 	@$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) \
 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) $(LIBS) \
@@ -1984,12 +1989,13 @@ LIBSMBSHAREMODES_SOVER=@LIBSMBSHAREMODES_SOVER@
 LIBSMBSHAREMODES_SHARED_TARGET_SONAME=$(LIBSMBSHAREMODES_SHARED_TARGET).$(LIBSMBSHAREMODES_SOVER)
 LIBSMBSHAREMODES_STATIC_TARGET=@LIBSMBSHAREMODES_STATIC_TARGET@
 LIBSMBSHAREMODES=$(LIBSMBSHAREMODES_STATIC_TARGET) @LIBSMBSHAREMODES_SHARED@
-#LIBSMBSHAREMODES_SYMS=$(srcdir)/exports/libsmbsharemodes. at SYMSEXT@
+LIBSMBSHAREMODES_SYMS=$(srcdir)/exports/libsmbsharemodes. at SYMSEXT@
 LIBSMBSHAREMODES_HEADERS=$(srcdir)/include/smb_share_modes.h
 
-LIBSMBSHAREMODES=bin/libsmbsharemodes.a @LIBSMBSHAREMODES_SHARED@
+$(LIBSMBSHAREMODES_SYMS): $(LIBSMBSHAREMODES_HEADERS)
+	@$(MKSYMS_SH) $(AWK) $@ $(LIBSMBSHAREMODES_HEADERS)
 
-$(LIBSMBSHAREMODES_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
+$(LIBSMBSHAREMODES_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ) $(LIBSMBSHAREMODES_SYMS) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
 	@echo Linking shared library $@
 	@$(SHLD_DSO) $(LIBSMBSHAREMODES_OBJ) \
 		$(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
@@ -2541,6 +2547,7 @@ showlayout::
 	@echo "  bindir:      $(BINDIR)"
 	@echo "  sbindir:     $(SBINDIR)"
 	@echo "  libdir:      $(LIBDIR)"
+	@echo "  modulesdir:  $(MODULESDIR)"
 	@echo "  vardir:      $(VARDIR)"
 	@echo "  mandir:      $(MANDIR)"
 	@echo "  privatedir:  $(PRIVATE_DIR)"
@@ -2548,6 +2555,7 @@ showlayout::
 	@echo "  lockdir:     $(LOCKDIR)"
 	@echo "  piddir:      $(PIDDIR)"
 	@echo "  swatdir:     $(SWATDIR)"
+	@echo "  codepagedir: $(CODEPAGEDIR)"
 
 
 uninstall:: uninstallman uninstallservers uninstallbin @UNINSTALL_CIFSMOUNT@ @UNINSTALL_CIFSUPCALL@ uninstallscripts uninstalldat uninstallswat uninstallmodules uninstalllibs @UNINSTALL_PAM_MODULES@
diff --git a/source/client/cifs.upcall.c b/source/client/cifs.upcall.c
index aa5eb57..fd3ed17 100644
--- a/source/client/cifs.upcall.c
+++ b/source/client/cifs.upcall.c
@@ -29,7 +29,7 @@ create dns_resolver * * /usr/local/sbin/cifs.upcall %k
 
 #include "cifs_spnego.h"
 
-const char *CIFSSPNEGO_VERSION = "1.1";
+const char *CIFSSPNEGO_VERSION = "1.2";
 static const char *prog = "cifs.upcall";
 typedef enum _secType {
 	KRB5,
@@ -73,7 +73,7 @@ int handle_krb5_mech(const char *oid, const char *principal,
 	tkt_wrapped = spnego_gen_krb5_wrap(tkt, TOK_ID_KRB_AP_REQ);
 
 	/* and wrap that in a shiny SPNEGO wrapper */
-	*secblob = gen_negTokenInit(OID_KERBEROS5, tkt_wrapped);
+	*secblob = gen_negTokenInit(oid, tkt_wrapped);
 
 	data_blob_free(&tkt_wrapped);
 	data_blob_free(&tkt);
@@ -118,6 +118,9 @@ int decode_key_description(const char *desc, int *ver, secType_t * sec,
 			if (strncmp(tkn + 4, "krb5", 4) == 0) {
 				retval |= DKD_HAVE_SEC;
 				*sec = KRB5;
+			} else if (strncmp(tkn + 4, "mskrb5", 6) == 0) {
+				retval |= DKD_HAVE_SEC;
+				*sec = MS_KRB5;
 			}
 		} else if (strncmp(tkn, "uid=", 4) == 0) {
 			errno = 0;
@@ -219,7 +222,7 @@ int main(const int argc, char *const argv[])
 	uid_t uid;
 	int kernel_upcall_version;
 	int c, use_cifs_service_prefix = 0;
-	char *buf, *hostname = NULL;
+	char *buf, *oid, *hostname = NULL;
 
 	openlog(prog, 0, LOG_DAEMON);
 
@@ -301,6 +304,7 @@ int main(const int argc, char *const argv[])
 
 	// do mech specific authorization
 	switch (sectype) {
+	case MS_KRB5:
 	case KRB5:{
 			char *princ;
 			size_t len;
@@ -319,8 +323,12 @@ int main(const int argc, char *const argv[])
 			}
 			strlcpy(princ + 5, hostname, len - 5);
 
-			rc = handle_krb5_mech(OID_KERBEROS5, princ,
-					      &secblob, &sess_key);
+			if (sectype == MS_KRB5)
+				oid = OID_KERBEROS5_OLD;
+			else
+				oid = OID_KERBEROS5;
+
+			rc = handle_krb5_mech(oid, princ, &secblob, &sess_key);
 			SAFE_FREE(princ);
 			break;
 		}
diff --git a/source/dynconfig.c b/source/dynconfig.c
index 57008ec..3a54507 100644
--- a/source/dynconfig.c
+++ b/source/dynconfig.c
@@ -40,12 +40,6 @@
  * table?  There's kind of a chicken-and-egg situation there...
  **/
 
-#if 0
-static char const *dyn_SBINDIR = SBINDIR;
-static char const *dyn_BINDIR = BINDIR;
-static char const *dyn_SWATDIR = SWATDIR;
-#endif
-
 #define DEFINE_DYN_CONFIG_PARAM(name) \
 static char *dyn_##name; \
 \
@@ -79,222 +73,13 @@ DEFINE_DYN_CONFIG_PARAM(LOGFILEBASE) /** Log file directory. **/
 DEFINE_DYN_CONFIG_PARAM(LMHOSTSFILE) /** Statically configured LanMan hosts. **/
 DEFINE_DYN_CONFIG_PARAM(CODEPAGEDIR)
 DEFINE_DYN_CONFIG_PARAM(LIBDIR)
+DEFINE_DYN_CONFIG_PARAM(MODULESDIR)
 DEFINE_DYN_CONFIG_PARAM(SHLIBEXT)
 DEFINE_DYN_CONFIG_PARAM(LOCKDIR)
 DEFINE_DYN_CONFIG_PARAM(PIDDIR)
 DEFINE_DYN_CONFIG_PARAM(SMB_PASSWD_FILE)
 DEFINE_DYN_CONFIG_PARAM(PRIVATE_DIR)
 
-#if 0
-static char *dyn_CONFIGFILE; /**< Location of smb.conf file. **/
-
-const char *get_dyn_CONFIGFILE(void)
-{
-	if (dyn_CONFIGFILE == NULL) {
-		return CONFIGFILE;
-	}
-	return dyn_CONFIGFILE;
-}
-
-const char *set_dyn_CONFIGFILE(const char *newpath)
-{
-	if (dyn_CONFIGFILE) {
-		SAFE_FREE(dyn_CONFIGFILE);
-	}
-	dyn_CONFIGFILE = SMB_STRDUP(newpath);
-	return dyn_CONFIGFILE;
-}
-
-/** Log file directory. **/
-static char *dyn_LOGFILEBASE;
-
-const char *get_dyn_LOGFILEBASE(void)
-{
-	if (dyn_LOGFILEBASE == NULL) {
-		return LOGFILEBASE;
-	}
-	return dyn_LOGFILEBASE;
-}
-
-const char *set_dyn_LOGFILEBASE(const char *newpath)
-{
-	if (dyn_LOGFILEBASE) {
-		SAFE_FREE(dyn_LOGFILEBASE);
-	}
-	dyn_LOGFILEBASE = SMB_STRDUP(newpath);
-	return dyn_LOGFILEBASE;
-}
-
-/** Statically configured LanMan hosts. **/
-static char *dyn_LMHOSTSFILE;
-
-const char *get_dyn_LMHOSTSFILE(void)
-{
-	if (dyn_LMHOSTSFILE == NULL) {
-		return LMHOSTSFILE;
-	}
-	return dyn_LMHOSTSFILE;
-}
-
-const char *set_dyn_LMHOSTSFILE(const char *newpath)
-{
-	if (dyn_LMHOSTSFILE) {
-		SAFE_FREE(dyn_LMHOSTSFILE);
-	}
-	dyn_LMHOSTSFILE = SMB_STRDUP(newpath);
-	return dyn_LMHOSTSFILE;
-}
-
-/**
- * @brief Samba data directory.
- *
- * @sa data_path() to get the path to a file inside the CODEPAGEDIR.
- **/
-static char *dyn_CODEPAGEDIR;
-
-const char *get_dyn_CODEPAGEDIR(void)
-{
-	if (dyn_CODEPAGEDIR == NULL) {
-		return CODEPAGEDIR;
-	}
-	return dyn_CODEPAGEDIR;
-}
-
-const char *set_dyn_CODEPAGEDIR(const char *newpath)
-{
-	if (dyn_CODEPAGEDIR) {
-		SAFE_FREE(dyn_CODEPAGEDIR);
-	}
-	dyn_CODEPAGEDIR = SMB_STRDUP(newpath);
-	return dyn_CODEPAGEDIR;
-}
-
-/**
- * @brief Samba library directory.
- *
- * @sa lib_path() to get the path to a file inside the LIBDIR.
- **/
-static char *dyn_LIBDIR;
-
-const char *get_dyn_LIBDIR(void)


-- 
Samba Shared Repository


More information about the samba-cvs mailing list