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

Karolin Seeger kseeger at samba.org
Tue Apr 22 06:51:20 GMT 2008


The branch, v3-2-stable has been updated
       via  5ef8028cc7d0d9b522237053c86c859e5725d0e2 (commit)
       via  dbcac781e03c28c442af651b72047cc0aab1b83c (commit)
       via  864f0841f9598835c4dc61bfc12089a2e61ec028 (commit)
       via  76aca0f26f497883b257cf40a9274ff8301e42ad (commit)
       via  8a7eba1ad54920f89575763930945b9978272307 (commit)
       via  d9f683e887e1d9e8df31c69ef8b903d6ed2bb958 (commit)
       via  19cb530338ccffd7844954322c4b5d2528b38d28 (commit)
       via  c48dc91cf2e77bfe36f9617c027133b62de6bb51 (commit)
       via  aa00000e6b239e32898f2a818f372a73e84673c4 (commit)
       via  742891f36a202cbeeeb2374614b35ea9a53aa792 (commit)
       via  8ba9ef4d1db8ee5309c71083038f709513bb7033 (commit)
       via  b5575b70ebdc051fee87404c3e0d630b91cedb79 (commit)
       via  08ff20d99815515479328bd16cdf48f6f0d881f8 (commit)
       via  4a4e577fa9b1b90c176293d6d6d2a10f85a9feba (commit)
       via  b04a135b5bf9981fe987de00f652b8615c3d417c (commit)
       via  eb43bb8ef668aa4b529ae792ec95c5e9f3c9cd2c (commit)
       via  fcf96284078b60bf81f187c0495f54aa9f3e8ee7 (commit)
       via  077318a7989af43349c1c3df55661fe8a897a65b (commit)
       via  0ebdb7368a565dcfc863a02431085bb3f58c0cba (commit)
       via  bafe76351b34dd79cd8891bdeb841496c4a2b71c (commit)
       via  d7c200c35a6ce45e24094728f54a8d62136357fc (commit)
       via  b7d70711d253057899fce423dbb663968443bf24 (commit)
       via  4c1040464b1c0b3e57560269cf8348999f337dda (commit)
       via  84617bafd22ef45ddec20b32888c1c371edfd5e8 (commit)
       via  5e05720ac64c8ce16626153379e400247279e49a (commit)
       via  836a7687a56db5bdb9ae96c9dbb5ed0f4c6fc102 (commit)
       via  5a20d8ce906aacef0acffe764598c432096c3468 (commit)
       via  e9f6e98a3557bac688f60ef141148b4f7e13dd8b (commit)
       via  42128d4121963591daa552491bc92d4de18c7dba (commit)
       via  33dbbb4e3d6265facb30b8a6b6abe22b41b47291 (commit)
       via  b6c4c1df3ed348aa47385274a7ebfa05e19538c3 (commit)
       via  2253b7e520ca7a5e18fa38bf115c92748e6bc95a (commit)
       via  91bf5625a6fb162505c0d63ea00e0788f769033d (commit)
       via  3980c09882ad273066e81b86524b38585f11f940 (commit)
       via  dcac4d08dc1adce11ceca0a48d38865da058c4f7 (commit)
       via  c7f455e06d05bc6c4739fcbec60332bc7d39cb82 (commit)
       via  dad9147a31ceac8dd295021a8f9de7c2f6f357aa (commit)
       via  34d584862805b014a0db1a2f7de0aa01dd99d9ef (commit)
       via  df75c1c0ea562e89ccf073e9e335d65f0eb5a959 (commit)
       via  44cd5b2c5469746c988aaeee0f6eebd059f8efd2 (commit)
       via  305bdec1fd7b6ecf3143239be6d766f19b9407ae (commit)
       via  03b327f03e77466b56de88f54126d338977dba09 (commit)
       via  5669e42513a6a79f0f39a7cf45a2194cd1049c7f (commit)
       via  1a5dd58482829a6edce84a9cf9055635ab92947c (commit)
       via  ad5e11dcb2e5050e0dcf46122b4f94a97115bfa2 (commit)
       via  3886e7431d8d6d573716d7dc9a7a79edc5dd3e3c (commit)
       via  dd282075fa93e1b0f7280721bf0f38f486c864ec (commit)
       via  8efdcccaca7b2027d8abc794faeba3f69ef6e383 (commit)
       via  bbd1a04a178a8c4e9dd4ddc13d8d5ba6b514c69a (commit)
       via  a2f2452f7a061e24478e8faba9bda0ea3267cdca (commit)
       via  aa9a9badc8f1ff9a58fa5378027a9743b549bece (commit)
       via  819be4282eb92c0ef461de22d1fc4bee84ee3f15 (commit)
       via  045f10c43366e974fed895fdb662b5cdbf9df8bc (commit)
       via  ba206b26516780600d0feabbf247cfd7334eb56e (commit)
       via  ef569671b10604b2d2ffba0ba6233877f37dea69 (commit)
       via  387ea506f3c89a255b764d65f859a40aeb34c191 (commit)
       via  cb625e1ef87dc2ddd5b7d361d2ac7ab263ea48a8 (commit)
       via  d811fe375dab6e5606021783cd14b29748c62b17 (commit)
       via  dbc4bb804c8e00876283c41e737a5ba4759d0018 (commit)
       via  9b4a6ce9cca5d871c7e5988c5ae6b7395aebcf8a (commit)
       via  b8bb24a5e1be440003694d6cf077b53e54f8b66c (commit)
       via  ac751e20155041eeaeba31848139cc260c1de92a (commit)
       via  16f805059ecd33afd7e2b935ef75a6a14f36114b (commit)
       via  4856bedcbc4a30cd43f8905b40719284ec13f763 (commit)
       via  1ec4a768e006cb87a7ddd31141e5ff14305a0d16 (commit)
       via  67871bdc98b474762c6a8f27be71ce56a21e2988 (commit)
       via  bb79642a1362270ac6925dbb44bfe29ea40ffdef (commit)
       via  6f852a46963313678a1e51fce68e46f98dfea5ca (commit)
       via  b1057bca7fbe8d8b3ae8d2cf7d4d78148a89c3d3 (commit)
       via  fabfb265fa424d143f9f028d1a77a88c1f44583a (commit)
       via  efb5c2d59e664fa1d39a767da36f8b9393133354 (commit)
       via  bd2f4bcfaa783e840373a639db801d0fd33a64d6 (commit)
       via  e24a26dbee472ac00bf61723145572e19964e333 (commit)
       via  e9d5f77f571f5e7ec6dff1dac69ee26c2af61f89 (commit)
      from  a76356a717fd7b340ff93f8e7a43aff0827ed25d (commit)

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


- Log -----------------------------------------------------------------
commit 5ef8028cc7d0d9b522237053c86c859e5725d0e2
Author: Günther Deschner <gd at samba.org>
Date:   Tue Apr 22 01:54:49 2008 +0200

    libnetjoin: identify type of domain early.
    
    This finally enables joining AD using workgroup or realm name.
    
    Guenther
    (cherry picked from commit 0cf16e6b47f5978bdcb84ac8a29ef13ff2b5cca8)

commit dbcac781e03c28c442af651b72047cc0aab1b83c
Author: Günther Deschner <gd at samba.org>
Date:   Tue Apr 22 00:06:57 2008 +0200

    build: fix the build.
    
    Guenther
    (cherry picked from commit 09a0001063d5bdd9bdc7abfbf1467beb062de049)

commit 864f0841f9598835c4dc61bfc12089a2e61ec028
Author: Günther Deschner <gd at samba.org>
Date:   Tue Apr 22 00:05:05 2008 +0200

    dsgetdcname: Fix discover_dc_dns().
    
    Guenther
    (cherry picked from commit ec86deb349850c634b49cd5a536e9281a4a6e7d8)

commit 76aca0f26f497883b257cf40a9274ff8301e42ad
Author: Günther Deschner <gd at samba.org>
Date:   Tue Apr 22 00:04:25 2008 +0200

    dsgetdcname: add very basic flat name support.
    
    Guenther
    (cherry picked from commit bb72d0b71e2a85d50e7bd893670c3eec69717580)

commit 8a7eba1ad54920f89575763930945b9978272307
Author: Günther Deschner <gd at samba.org>
Date:   Mon Apr 21 20:14:32 2008 +0200

    net: Add libnetapi context to net's impressive list of globals.
    
    Guenther
    (cherry picked from commit 8a5fadf6a183e4e4ccc77283b3ddba0748c6abfb)

commit d9f683e887e1d9e8df31c69ef8b903d6ed2bb958
Author: Günther Deschner <gd at samba.org>
Date:   Mon Apr 21 20:03:17 2008 +0200

    IDL: rerun make idl.
    
    Guenther
    (cherry picked from commit 5e0ccaf0c02a2d2d87ed8a2999c09ae1ccfc48e8)

commit 19cb530338ccffd7844954322c4b5d2528b38d28
Author: Günther Deschner <gd at samba.org>
Date:   Mon Apr 21 20:02:46 2008 +0200

    IDL: now that we have nbt.idl, re-add it to the includes again.
    
    Guenther
    (cherry picked from commit d38c5f4a69f67f29cc057e4aa0ad14f5112f6844)

commit c48dc91cf2e77bfe36f9617c027133b62de6bb51
Author: Günther Deschner <gd at samba.org>
Date:   Mon Apr 21 19:59:27 2008 +0200

    cldap: avoid duplicate definitions so remove ads_cldap.h.
    
    Guenther
    (cherry picked from commit 538eefe22ad69540b9f73ffaa613d6be045de199)

commit aa00000e6b239e32898f2a818f372a73e84673c4
Author: Günther Deschner <gd at samba.org>
Date:   Mon Apr 21 19:47:13 2008 +0200

    cldap: add talloc context to ads_cldap_netlogon().
    
    Guenther
    (cherry picked from commit 4cee7b1bd5cd97c414b73d6f39238958480cdcf3)

commit 742891f36a202cbeeeb2374614b35ea9a53aa792
Author: Günther Deschner <gd at samba.org>
Date:   Mon Apr 21 19:26:32 2008 +0200

    libads: Use libnbt for CLDAP reply parsing.
    
    Guenther
    (cherry picked from commit 751f3064a508341c0ebae45e8de9f5311d915d70)

commit 8ba9ef4d1db8ee5309c71083038f709513bb7033
Author: Günther Deschner <gd at samba.org>
Date:   Mon Apr 21 19:29:24 2008 +0200

    IDL: re-run make idl.
    
    Guenther
    (cherry picked from commit f9d68ca363f7e98bfb21a06283e4f02000d6d79c)

commit b5575b70ebdc051fee87404c3e0d630b91cedb79
Author: Günther Deschner <gd at samba.org>
Date:   Mon Apr 21 19:28:13 2008 +0200

    IDL: make nbt_cldap_netlogon_5 public.
    
    Guenther
    (cherry picked from commit f0917e8990ee6ada993c2c9808179eb0f8cfd662)

commit 08ff20d99815515479328bd16cdf48f6f0d881f8
Author: Günther Deschner <gd at samba.org>
Date:   Mon Apr 21 19:27:45 2008 +0200

    IDL: Add NTLOGON_RESPONSE_FROM_PDC2 to nbt_logon_request.
    
    Guenther
    (cherry picked from commit 1724000a95f3814a5ce4eaf5807dbf20e7e2e4f0)

commit 4a4e577fa9b1b90c176293d6d6d2a10f85a9feba
Author: Günther Deschner <gd at samba.org>
Date:   Mon Apr 21 17:51:36 2008 +0200

    winbind: pass down existing talloc context.
    
    Guenther
    (cherry picked from commit 675bf42cfff89b05f21d77ca74eba20c4a24d44c)

commit b04a135b5bf9981fe987de00f652b8615c3d417c
Author: Günther Deschner <gd at samba.org>
Date:   Mon Apr 21 10:55:23 2008 +0200

    winbind: Use libnbt for NTLOGON SAMLOGON mailslot request and reply.
    
    Guenther
    (cherry picked from commit 2d6a1c5da64195784b0b102edb268356a24d84b5)

commit eb43bb8ef668aa4b529ae792ec95c5e9f3c9cd2c
Author: Günther Deschner <gd at samba.org>
Date:   Sun Apr 20 23:03:33 2008 +0200

    libnetapi: Add Doxyfile.
    
    Guenther
    (cherry picked from commit a34801d67789340b515c5e575c3fd3175dddbecf)

commit fcf96284078b60bf81f187c0495f54aa9f3e8ee7
Author: Günther Deschner <gd at samba.org>
Date:   Sun Apr 20 22:58:52 2008 +0200

    netdomjoin-gui: Omit warning when unjoining a domain fails.
    
    Guenther
    (cherry picked from commit ba1d2e87614a98b4f811c75a0d9cfa8491f5cb4d)

commit 077318a7989af43349c1c3df55661fe8a897a65b
Author: Günther Deschner <gd at samba.org>
Date:   Sun Apr 20 22:56:09 2008 +0200

    cli_cm: Make nicer password prompt in do_connect().
    
    Guenther
    (cherry picked from commit cc967e76a39808e8311cc96c17078a0fce26c11a)

commit 0ebdb7368a565dcfc863a02431085bb3f58c0cba
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 18 11:42:51 2008 +0200

    IDL: make idl.
    
    Guenther
    (cherry picked from commit e1abff301449ad528194206fd953670057eaa12d)

commit bafe76351b34dd79cd8891bdeb841496c4a2b71c
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 18 11:41:35 2008 +0200

    IDL: Add type 23 in nbt_ntlogon_request reply packets.
    
    Guenther
    (cherry picked from commit dbef92c2b2ae6786cf527715adbbd7db8b334fcc)

commit d7c200c35a6ce45e24094728f54a8d62136357fc
Author: Günther Deschner <gd at samba.org>
Date:   Thu Apr 17 18:29:48 2008 +0200

    IDL: Re-run make idl and hand merge some required functions from Samba 4.
    
    Guenther
    (cherry picked from commit edb0092e4d66496181de4e21c91d398d54208e60)

commit b7d70711d253057899fce423dbb663968443bf24
Author: Günther Deschner <gd at samba.org>
Date:   Thu Apr 17 18:18:57 2008 +0200

    IDL: add dom_sid0 to security.idl (hand merge from samba4).
    
    Guenther
    (cherry picked from commit 3e7f302d807905d75949c934d2325cd65d53e6b2)

commit 4c1040464b1c0b3e57560269cf8348999f337dda
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Apr 17 16:26:59 2008 +0200

    nbt.idl: fix parsing und pushing of dom_sids by using dom_sid0
    
    metze
    (cherry picked from commit 0e2f6d481b3e35ed392b2b3340b244c77593819c)
    (cherry picked from commit 70d99d8ed92d13fa3ec308df170595316d091988)

commit 84617bafd22ef45ddec20b32888c1c371edfd5e8
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 16 23:52:34 2008 +0200

    Move GETDC mailslot out of winbindd.
    
    Guenther
    (cherry picked from commit b003ba65e34bb92bf71a7943957715cd7acbcce0)

commit 5e05720ac64c8ce16626153379e400247279e49a
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 16 23:23:24 2008 +0200

    IDL: build generated nbt code.
    
    Guenther
    (cherry picked from commit 554dcfdab03f9d06f319a3234d56cf44dc38c9da)

commit 836a7687a56db5bdb9ae96c9dbb5ed0f4c6fc102
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 16 23:16:59 2008 +0200

    IDL: Add autogenerated nbt files.
    
    Guenther
    (cherry picked from commit 1e05224bda73ec183c5b7c310e8e277f405a847a)

commit 5a20d8ce906aacef0acffe764598c432096c3468
Author: Michael Adam <obnox at samba.org>
Date:   Fri Apr 11 22:22:12 2008 +0200

    build: smbconftort only needs LIBSMB_ERR_OBJ, not LIBSAMBA_OBJ
    
    Michael
    (cherry picked from commit 27fea343d2eeff5b7d38092dd1286cb8e3478cbe)

commit e9f6e98a3557bac688f60ef141148b4f7e13dd8b
Author: Michael Adam <obnox at samba.org>
Date:   Fri Apr 11 22:13:39 2008 +0200

    build: move SECRETS_OBJ into LIBSMB_ERR_OBJ.
    
    LIBSMB_ERR_OBJ depends on SECRETS_OBJ
    
    Michael
    (cherry picked from commit 79b5a0c7a8ea47fbc44fb6582a39152c69edccaa)

commit 42128d4121963591daa552491bc92d4de18c7dba
Author: Michael Adam <obnox at samba.org>
Date:   Fri Apr 11 21:59:39 2008 +0200

    build: move SECRETS_OBJ into LIBSMB_OBJ
    
    LIBSMB_OBJ is not used without SECRETS_OBJ
    
    Michael
    (cherry picked from commit bea66f07b4b8071348fc4d7dc4d13306466af171)

commit 33dbbb4e3d6265facb30b8a6b6abe22b41b47291
Author: Michael Adam <obnox at samba.org>
Date:   Fri Apr 11 21:51:41 2008 +0200

    build: regroup LIBSMB objects to for a smallest linkable uint (LIBSMB_ERR_OBJ)
    
    Michael
    (cherry picked from commit 310fd52ea4d05cdc83a798fda447879e3ebb2bc3)

commit b6c4c1df3ed348aa47385274a7ebfa05e19538c3
Author: Michael Adam <obnox at samba.org>
Date:   Fri Apr 11 16:37:06 2008 +0200

    build: group RPC_PARSE_OBJ1 with LIBSAMBA_OBJ
    
    it is only ever used together
    
    Michael
    (cherry picked from commit 27c7441145190eee7b61bec76edf1d4987a5be8d)

commit 2253b7e520ca7a5e18fa38bf115c92748e6bc95a
Author: Michael Adam <obnox at samba.org>
Date:   Fri Apr 11 16:32:48 2008 +0200

    build: group NTERR/DOSERR/ERRORMAP and LIBSAMBA object differently
    
    Michael
    (cherry picked from commit ddc2292c159700018911c85bcb2b8243b78f4e5c)

commit 91bf5625a6fb162505c0d63ea00e0788f769033d
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 16 23:12:03 2008 +0200

    IDL: Add nbt.idl from Samba4.
    
    Guenther
    (cherry picked from commit 6accbfa66158c6fbebab41b25a99e810ea460c57)

commit 3980c09882ad273066e81b86524b38585f11f940
Author: Günther Deschner <gd at samba.org>
Date:   Thu Apr 17 14:09:29 2008 +0200

    libnetapi: Disable talloc_enable_leak_report.
    
    Guenther
    (cherry picked from commit 4ba98dd0cc13984a8dc54e4d4935487fc8938039)

commit dcac4d08dc1adce11ceca0a48d38865da058c4f7
Author: Günther Deschner <gd at samba.org>
Date:   Thu Apr 17 14:07:53 2008 +0200

    netdomjoin-gui: Fix label alignment showing up with lower screen-resolution.
    
    Guenther
    (cherry picked from commit e06a54aa7da857e006649469e7eb8d76711221c1)

commit c7f455e06d05bc6c4739fcbec60332bc7d39cb82
Author: Günther Deschner <gd at samba.org>
Date:   Thu Apr 17 00:06:00 2008 +0200

    net: Be more tolerant while joining.
    
    Guenther
    (cherry picked from commit 70b7b331d9e2d915e6209fca5900f41fae4866fd)

commit dad9147a31ceac8dd295021a8f9de7c2f6f357aa
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 16 23:59:43 2008 +0200

    NetrUnjoinDomain2: Honor registry config to try config changes.
    
    Guenther
    (cherry picked from commit b42304c299224238a0247e0e1561eb2ad3217b96)

commit 34d584862805b014a0db1a2f7de0aa01dd99d9ef
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 16 23:56:03 2008 +0200

    dsgetdcname: Fix discover_dc_dns.
    
    Guenther
    (cherry picked from commit 2fe416ffa5c7efd2e6a644e4c8bac756152881d9)

commit df75c1c0ea562e89ccf073e9e335d65f0eb5a959
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 16 10:03:06 2008 +0200

    libnetapi: Add initial inline doxygen comments.
    
    Guenther
    (cherry picked from commit 01bc4b6ac03b98c2371b4dfc0948f5ef8d06bcbc)

commit 44cd5b2c5469746c988aaeee0f6eebd059f8efd2
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 16 02:45:00 2008 +0200

    net: Remove unused rpc_user_add/del_internals code.
    
    Guenther
    (cherry picked from commit e68daef0ee051515c8f489820fde9110747e8aa6)

commit 305bdec1fd7b6ecf3143239be6d766f19b9407ae
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 16 02:41:52 2008 +0200

    net: Use NetUserAdd for "net rpc user add".
    
    Guenther
    (cherry picked from commit 4868b4ea1a18d4218330c49bf57818c4b5117d1d)

commit 03b327f03e77466b56de88f54126d338977dba09
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 16 02:39:41 2008 +0200

    net: use NetUserDel for "net rpc user delete".
    
    Guenther
    (cherry picked from commit 0105770c1598e6fcbcaa29e17f3b7fd33114a333)

commit 5669e42513a6a79f0f39a7cf45a2194cd1049c7f
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 16 02:38:13 2008 +0200

    libnetapi: Let NetUserAdd_l/NetUserDel_l talk to the local RPC server.
    
    Guenther
    (cherry picked from commit 9bbb6cea0b21d98ae13f7a41226b437515bd5a2f)

commit 1a5dd58482829a6edce84a9cf9055635ab92947c
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 16 02:37:27 2008 +0200

    errors: Add WERR_NO_SUCH_USER.
    
    Guenther
    (cherry picked from commit 82803186febfe6a55c1a598073657c2c4a513000)

commit ad5e11dcb2e5050e0dcf46122b4f94a97115bfa2
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 16 02:23:20 2008 +0200

    errors: Add WERR_NONE_MAPPED.
    
    Guenther
    (cherry picked from commit dc165e1c80586664ddb4d3d68182598d02ba204a)

commit 3886e7431d8d6d573716d7dc9a7a79edc5dd3e3c
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 16 02:16:08 2008 +0200

    net/libnetapi: Include netapi headers early and free on exit.
    
    Guenther
    (cherry picked from commit 020b1e6431601fadf44dbfe8393908c096ecfa4c)

commit dd282075fa93e1b0f7280721bf0f38f486c864ec
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 16 00:14:52 2008 +0200

    libnetapi: do not overwrite status in libnetapi_get_error_string().
    
    Guenther
    (cherry picked from commit 143e2b573043dd04a6404fc91d781e8a727bd092)

commit 8efdcccaca7b2027d8abc794faeba3f69ef6e383
Author: Günther Deschner <gd at samba.org>
Date:   Tue Apr 15 22:30:06 2008 +0200

    libnetapi: Add missing headers.
    
    Guenther
    (cherry picked from commit 3fda711f2526914bf18ec004d553453e692b1e85)

commit bbd1a04a178a8c4e9dd4ddc13d8d5ba6b514c69a
Author: Günther Deschner <gd at samba.org>
Date:   Mon Apr 14 23:07:55 2008 +0200

    libnetjoin/net: Fix lp_config_backend_is_registry() handling.
    
    Thanks obnox, now we can net ads join and net ads leave with zero
    configuration changes if "config backend = registry".
    
    Guenther
    (cherry picked from commit 9003881773de787a51ceadcdc2cb1e95f6979763)

commit a2f2452f7a061e24478e8faba9bda0ea3267cdca
Author: Günther Deschner <gd at samba.org>
Date:   Mon Apr 14 22:58:38 2008 +0200

    net: abort when lp_realm is not set in net_ads_leave().
    
    Guenther
    (cherry picked from commit 53735edcbb059e73c51ae17d4ff75d2a4dee53e5)

commit aa9a9badc8f1ff9a58fa5378027a9743b549bece
Author: Günther Deschner <gd at samba.org>
Date:   Mon Apr 14 22:57:37 2008 +0200

    libnetjoin: delete the workgroup name when requested while unjoining.
    
    Guenther
    (cherry picked from commit 1782e89f3341eca5ee1fa39881ee8efb3fac9a5b)

commit 819be4282eb92c0ef461de22d1fc4bee84ee3f15
Author: Günther Deschner <gd at samba.org>
Date:   Mon Apr 14 22:56:12 2008 +0200

    libnetjoin: separate out libnet_join_lookup_dc_rpc.
    
    Guenther
    (cherry picked from commit 8d3d1c094a28f75b01315ee05b7939ffba374f20)

commit 045f10c43366e974fed895fdb662b5cdbf9df8bc
Author: Günther Deschner <gd at samba.org>
Date:   Mon Apr 14 16:16:25 2008 +0200

    net: exit early in net_ads_join() if the domain is not set.
    
    Guenther
    (cherry picked from commit 8331fbe735e2bec386ab8fc1645dc371d45d3063)

commit ba206b26516780600d0feabbf247cfd7334eb56e
Author: Günther Deschner <gd at samba.org>
Date:   Mon Apr 14 16:15:18 2008 +0200

    libnetjoin: Fix unjoining when no KRB5CCNAME is around.
    
    Guenther
    (cherry picked from commit 7fd237c545e0a7e0029195dbbb6691571abdfe84)

commit ef569671b10604b2d2ffba0ba6233877f37dea69
Author: Günther Deschner <gd at samba.org>
Date:   Mon Apr 14 16:13:52 2008 +0200

    net: use WERROR for check_ads_config().
    
    Guenther
    (cherry picked from commit 9176057986be63c7ebebb56f7daabbc3883802c5)

commit 387ea506f3c89a255b764d65f859a40aeb34c191
Author: Günther Deschner <gd at samba.org>
Date:   Mon Apr 14 15:48:23 2008 +0200

    doserr: Add WERR_INVALID_DOMAIN_STATE and WERR_INVALID_DOMAIN_ROLE.
    
    Guenther
    (cherry picked from commit 91a55fc27dc100cf193cfa2613771312f018449e)

commit cb625e1ef87dc2ddd5b7d361d2ac7ab263ea48a8
Author: Günther Deschner <gd at samba.org>
Date:   Mon Apr 14 15:47:30 2008 +0200

    net: the success of secrets_init is checked by libnetjoin now.
    
    Guenther
    (cherry picked from commit 0a6a5d082426ca82accf18fffa7740683a42cac1)

commit d811fe375dab6e5606021783cd14b29748c62b17
Author: Günther Deschner <gd at samba.org>
Date:   Mon Apr 14 14:46:30 2008 +0200

    WKSSVC: In _wkssvc_NetrJoinDomain2, do modify the local configuration if enabled.
    
    Guenther
    (cherry picked from commit 260efafb8fb6527eb0a182f9a6bfed8239dd8315)

commit dbc4bb804c8e00876283c41e737a5ba4759d0018
Author: Günther Deschner <gd at samba.org>
Date:   Mon Apr 14 14:42:19 2008 +0200

    libnetjoin: Remove machine account if we failed to set password.
    
    Guenther
    (cherry picked from commit db5e0ed186429667a7f6fc67e4b19a7ca75f357e)

commit 9b4a6ce9cca5d871c7e5988c5ae6b7395aebcf8a
Author: Günther Deschner <gd at samba.org>
Date:   Mon Apr 14 12:20:33 2008 +0200

    libnetjoin: Fix joining when no KRB5CCNAME is around.
    
    Guenther
    (cherry picked from commit 512e6ca0a9be9fe35994ec1010110573a5b551d1)

commit b8bb24a5e1be440003694d6cf077b53e54f8b66c
Author: Günther Deschner <gd at samba.org>
Date:   Sun Apr 13 19:22:24 2008 +0200

    libnetapi: add libnetapi_set_use_kerberos
    
    Don't unconditionally set the kerberos flag for authentication.
    
    Guenther
    (cherry picked from commit 15bef5ae413adf278cccc0e547c4b8ccd180eca2)

commit ac751e20155041eeaeba31848139cc260c1de92a
Author: Günther Deschner <gd at samba.org>
Date:   Sun Apr 13 19:23:42 2008 +0200

    libnetapi: Add NetQueryDisplayInformation header.
    
    Guenther
    (cherry picked from commit 3c107934acc907e3eedd116b42d1d07ee0574183)

commit 16f805059ecd33afd7e2b935ef75a6a14f36114b
Author: Günther Deschner <gd at samba.org>
Date:   Sun Apr 13 19:15:15 2008 +0200

    libnetapi: add NetQueryDisplayInformation example.
    
    Guenther
    (cherry picked from commit 5f9332cf1f60bb5a23a16776b95af3a83c5deb40)

commit 4856bedcbc4a30cd43f8905b40719284ec13f763
Author: Günther Deschner <gd at samba.org>
Date:   Sun Apr 13 19:12:31 2008 +0200

    libnetapi: fill in NetQueryDisplayInformation_r.
    
    Guenther
    (cherry picked from commit 7fb9991b4c54fd0b9629e47afc1e5bbc2cfc1088)

commit 1ec4a768e006cb87a7ddd31141e5ff14305a0d16
Author: Günther Deschner <gd at samba.org>
Date:   Sun Apr 13 19:11:01 2008 +0200

    libnetapi: don't reset the error code in NetUserAdd_r if the operation failed.
    
    Guenther
    (cherry picked from commit 9edb067f62b1e36f1da461b3eb09cb123d2089dd)

commit 67871bdc98b474762c6a8f27be71ce56a21e2988
Author: Günther Deschner <gd at samba.org>
Date:   Sun Apr 13 19:04:18 2008 +0200

    libnetapi: add NetQueryDisplayInformation skeleton.
    
    Guenther
    (cherry picked from commit 6ec4a62b6d584f6745c3285474372f235614b598)

commit bb79642a1362270ac6925dbb44bfe29ea40ffdef
Author: Günther Deschner <gd at samba.org>
Date:   Sun Apr 13 19:00:53 2008 +0200

    Re-run make idl.
    
    Guenther
    (cherry picked from commit afd0e925dc63b6f776caa5fd442c4e48e8349682)

commit 6f852a46963313678a1e51fce68e46f98dfea5ca
Author: Günther Deschner <gd at samba.org>
Date:   Sun Apr 13 18:59:42 2008 +0200

    libnetapi: Add IDL for NetQueryDisplayInformation.
    
    Guenther
    (cherry picked from commit 1200eb474c145fdde91bc39546454015fecf22f0)

commit b1057bca7fbe8d8b3ae8d2cf7d4d78148a89c3d3
Author: Günther Deschner <gd at samba.org>
Date:   Sun Apr 13 18:27:03 2008 +0200

    Fix the build of eventlogadm.
    
    Guenther
    (cherry picked from commit 57a5628abf628b6276f36da8ae1f3c15a4db4488)

commit fabfb265fa424d143f9f028d1a77a88c1f44583a
Author: Günther Deschner <gd at samba.org>
Date:   Sun Apr 13 17:33:27 2008 +0200

    libnetapi: don't to try to free NULL struct.
    
    Guenther
    (cherry picked from commit eb33d30d80ab2fe770e248f5b2a70a83a43dd156)

commit efb5c2d59e664fa1d39a767da36f8b9393133354
Author: Günther Deschner <gd at samba.org>
Date:   Sat Apr 12 23:12:53 2008 +0200

    Fix ou handling in netdomjoin-gui.
    
    The ou list was concatenated again and again...
    
    Guenther
    (cherry picked from commit 84608e165e24c68c12d40086f81684ef37f69159)

commit bd2f4bcfaa783e840373a639db801d0fd33a64d6
Author: Günther Deschner <gd at samba.org>
Date:   Sat Apr 12 18:30:14 2008 +0200

    Add WERR_USER_ALREADY_EXISTS and WERR_PASSWORD_RESTRICTION.
    
    Guenther
    (cherry picked from commit eefd03d39b107598e9b0d1f35def7b17073d8ebc)

commit e24a26dbee472ac00bf61723145572e19964e333
Author: Günther Deschner <gd at samba.org>
Date:   Sat Apr 12 18:29:13 2008 +0200

    Move some WERRORs down to the NERR_BASE block.
    
    Guenther
    (cherry picked from commit 2453375ee04f466800f53a0f2991d8d5dee0bd8e)

commit e9d5f77f571f5e7ec6dff1dac69ee26c2af61f89
Author: Günther Deschner <gd at samba.org>
Date:   Tue Mar 4 19:04:54 2008 +0100

    Add secure_channel_type to libnetjoin.
    
    Guenther
    (cherry picked from commit f88910c1e5186737da4eda5a7a396c3238fc6775)

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

Summary of changes:
 source/Makefile.in                                 |  164 +-
 source/include/ads_cldap.h                         |   60 -
 source/include/doserr.h                            |   33 +-
 source/include/includes.h                          |    1 -
 source/include/nameserv.h                          |    2 +
 source/include/smb.h                               |    1 +
 source/include/smb_macros.h                        |    3 +
 source/lib/netapi/Doxyfile                         | 1362 +++++++
 source/lib/netapi/cm.c                             |    8 +-
 source/lib/netapi/examples/Makefile.in             |    8 +-
 source/lib/netapi/examples/common.c                |    4 +
 .../examples/netdomjoin-gui/netdomjoin-gui.c       |   11 +-
 source/lib/netapi/examples/user/user_dispinfo.c    |   98 +
 source/lib/netapi/libnetapi.c                      |   52 +
 source/lib/netapi/libnetapi.h                      |   11 +
 source/lib/netapi/netapi.c                         |   20 +-
 source/lib/netapi/netapi.h                         |  270 ++-
 source/lib/netapi/user.c                           |  351 ++-
 source/libads/cldap.c                              |  112 +-
 source/libads/ldap.c                               |   61 +-
 source/libcli/nbt/libnbt.h                         |  353 ++
 source/libcli/nbt/nbtname.c                        |  626 +++
 source/libnet/libnet_join.c                        |  242 +-
 source/librpc/gen_ndr/libnet_join.h                |    3 +
 source/librpc/gen_ndr/libnetapi.h                  |   43 +
 source/librpc/gen_ndr/nbt.h                        |  758 ++++
 source/librpc/gen_ndr/ndr_libnet_join.c            |    1 +
 source/librpc/gen_ndr/ndr_libnetapi.c              |  164 +
 source/librpc/gen_ndr/ndr_libnetapi.h              |   16 +-
 source/librpc/gen_ndr/ndr_nbt.c                    | 4149 ++++++++++++++++++++
 source/librpc/gen_ndr/ndr_nbt.h                    |   89 +
 source/librpc/gen_ndr/ndr_netlogon.c               |    1 +
 source/librpc/gen_ndr/netlogon.h                   |   19 +-
 source/librpc/gen_ndr/security.h                   |    1 +
 source/librpc/idl/libnet_join.idl                  |    2 +
 source/librpc/idl/libnetapi.idl                    |   35 +
 source/librpc/idl/nbt.idl                          |  700 ++++
 source/librpc/idl/netlogon.idl                     |   20 +-
 source/librpc/idl/security.idl                     |    3 +
 source/librpc/ndr/libndr.h                         |   11 +
 source/librpc/ndr/ndr_sec_helper.c                 |   26 +
 source/librpc/ndr/sid.c                            |   41 +
 source/libsmb/clidfs.c                             |    7 +-
 source/libsmb/clidgram.c                           |  168 +
 source/libsmb/doserr.c                             |   10 +
 source/libsmb/dsgetdcname.c                        |  271 ++-
 source/libsmb/namequery.c                          |    4 +-
 source/libsmb/namequery_dc.c                       |    2 +-
 source/nmbd/nmbd_processlogon.c                    |    4 +-
 source/rpc_server/srv_wkssvc_nt.c                  |    2 +
 source/utils/eventlogadm.c                         |    2 +-
 source/utils/net.c                                 |    4 +
 source/utils/net.h                                 |    3 +
 source/utils/net_ads.c                             |  109 +-
 source/utils/net_dom.c                             |    3 -
 source/utils/net_rpc.c                             |  296 +--
 source/winbindd/winbindd_cm.c                      |  177 +-
 57 files changed, 10061 insertions(+), 936 deletions(-)
 delete mode 100644 source/include/ads_cldap.h
 create mode 100644 source/lib/netapi/Doxyfile
 create mode 100644 source/lib/netapi/examples/user/user_dispinfo.c
 create mode 100644 source/libcli/nbt/libnbt.h
 create mode 100644 source/libcli/nbt/nbtname.c
 create mode 100644 source/librpc/gen_ndr/nbt.h
 create mode 100644 source/librpc/gen_ndr/ndr_nbt.c
 create mode 100644 source/librpc/gen_ndr/ndr_nbt.h
 create mode 100644 source/librpc/idl/nbt.idl


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index abd60ce..922dbfd 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -252,8 +252,6 @@ SMBLDAP_OBJ = @SMBLDAP@ @SMBLDAPUTIL@
 
 VERSION_OBJ = lib/version.o
 
-DOSERR_OBJ = libsmb/doserr.o
-
 WBCOMMON_OBJ = nsswitch/wb_common.o
 
 AFS_OBJ = lib/afs.o
@@ -262,8 +260,6 @@ AFS_SETTOKEN_OBJ = lib/afs_settoken.o
 
 SERVER_MUTEX_OBJ = lib/server_mutex.o
 
-ERRORMAP_OBJ = libsmb/errormap.o
-
 PASSCHANGE_OBJ = libsmb/passchange.o
 
 
@@ -286,7 +282,6 @@ LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_wkssvc.o \
 		 librpc/gen_ndr/ndr_winreg.o \
 		 librpc/gen_ndr/ndr_initshutdown.o \
 		 librpc/gen_ndr/ndr_srvsvc.o \
-		 librpc/gen_ndr/ndr_svcctl.o \
 		 librpc/gen_ndr/ndr_eventlog.o \
 		 librpc/gen_ndr/ndr_netlogon.o \
 		 librpc/gen_ndr/ndr_samr.o \
@@ -399,12 +394,32 @@ LIBADS_SERVER_OBJ = libads/kerberos_verify.o libads/authdata.o \
 
 SECRETS_OBJ = passdb/secrets.o passdb/machine_sid.o
 
+LIBNBT_OBJ = libcli/nbt/nbtname.o \
+	     librpc/gen_ndr/ndr_nbt.o \
+	     librpc/gen_ndr/ndr_svcctl.o
+
 LIBNMB_OBJ = libsmb/unexpected.o libsmb/namecache.o libsmb/nmblib.o \
 	     libsmb/namequery.o libsmb/conncache.o libads/dns.o
 
-LIBSAMBA_OBJ = libsmb/nterr.o libsmb/dcerpc_err.o libsmb/smbdes.o \
-	       libsmb/smbencrypt.o libsmb/ntlm_check.o \
-	       libsmb/ntlmssp.o libsmb/ntlmssp_parse.o libsmb/ntlmssp_sign.o
+NTERR_OBJ = libsmb/nterr.o
+DOSERR_OBJ = libsmb/doserr.o
+ERRORMAP_OBJ = libsmb/errormap.o
+DCE_RPC_ERR_OBJ = libsmb/dcerpc_err.o
+
+LIBSMB_ERR_OBJ0 = $(NTERR_OBJ) $(DOSERR_OBJ) $(ERRORMAP_OBJ) $(DCE_RPC_ERR_OBJ) \
+		  libsmb/smbdes.o libsmb/smbencrypt.o libsmb/ntlmssp_parse.o
+
+LIBSMB_ERR_OBJ = $(LIBSMB_ERR_OBJ0) \
+		 $(RPC_PARSE_OBJ1) \
+		 $(SECRETS_OBJ)
+
+LIBSMB_OBJ0 = \
+	       libsmb/ntlm_check.o \
+	       libsmb/ntlmssp.o \
+	       libsmb/ntlmssp_sign.o
+
+LIBSAMBA_OBJ = $(LIBSMB_OBJ0) \
+	       $(LIBSMB_ERR_OBJ)
 
 LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
 	     libsmb/clikrb5.o libsmb/clispnego.o libsmb/asn1.o \
@@ -413,9 +428,11 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
 	     libsmb/clitrans.o libsmb/clisecdesc.o libsmb/clidgram.o \
 	     libsmb/clistr.o libsmb/cliquota.o libsmb/clifsinfo.o libsmb/clidfs.o \
              libsmb/smberr.o libsmb/credentials.o libsmb/pwd_cache.o \
-	     libsmb/clioplock.o $(ERRORMAP_OBJ) libsmb/clirap2.o \
-	     libsmb/smb_seal.o $(DOSERR_OBJ) libsmb/async_smb.o \
-	     $(RPC_PARSE_OBJ1) $(LIBSAMBA_OBJ) $(LIBNMB_OBJ)
+	     libsmb/clioplock.o libsmb/clirap2.o \
+	     libsmb/smb_seal.o libsmb/async_smb.o \
+	     $(LIBSAMBA_OBJ) \
+	     $(LIBNMB_OBJ) \
+	     $(LIBNBT_OBJ)
 
 RPC_CLIENT_OBJ1 = rpc_client/cli_netlogon.o
 
@@ -566,10 +583,10 @@ GROUPDB_OBJ = groupdb/mapping.o groupdb/mapping_tdb.o groupdb/mapping_ldb.o
 
 PROFILE_OBJ = profile/profile.o
 PROFILES_OBJ = utils/profiles.o \
-               $(ERRORMAP_OBJ) \
-	       $(RPC_PARSE_OBJ1) $(PARAM_OBJ) $(LIBSAMBA_OBJ) \
-               $(DOSERR_OBJ) $(LIB_OBJ) $(LIB_DUMMY_OBJ) \
-               $(POPT_LIB_OBJ) $(SECRETS_OBJ)
+	       $(LIBSAMBA_OBJ) \
+	       $(PARAM_OBJ) \
+               $(LIB_OBJ) $(LIB_DUMMY_OBJ) \
+               $(POPT_LIB_OBJ)
 
 OPLOCK_OBJ = smbd/oplock.o smbd/oplock_irix.o smbd/oplock_linux.o
 
@@ -659,7 +676,7 @@ SMBD_OBJ_SRV = smbd/files.o smbd/chgpasswd.o smbd/connection.o \
 	       $(MANGLE_OBJ) @VFS_STATIC@
 
 SMBD_OBJ_BASE = $(PARAM_WITHOUT_REG_OBJ) $(SMBD_OBJ_SRV) $(LIBSMB_OBJ) \
-		$(RPC_SERVER_OBJ) $(RPC_PARSE_OBJ) $(SECRETS_OBJ) \
+		$(RPC_SERVER_OBJ) $(RPC_PARSE_OBJ) \
 		$(LOCKING_OBJ) $(PASSDB_OBJ) $(PRINTING_OBJ) $(PROFILE_OBJ) \
 		$(LIB_OBJ) $(PRINTBACKEND_OBJ) $(OPLOCK_OBJ) \
 		$(NOTIFY_OBJ) $(GROUPDB_OBJ) $(AUTH_OBJ) \
@@ -694,13 +711,13 @@ NMBD_OBJ1 = nmbd/asyncdns.o nmbd/nmbd.o nmbd/nmbd_become_dmb.o \
             nmbd/nmbd_workgroupdb.o nmbd/nmbd_synclists.o smbd/connection.o
 
 NMBD_OBJ = $(NMBD_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
-           $(PROFILE_OBJ) $(LIB_NONSMBD_OBJ) $(SECRETS_OBJ) $(POPT_LIB_OBJ)
+           $(PROFILE_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ)
 
 SWAT_OBJ1 = web/cgi.o web/diagnose.o web/startstop.o web/statuspage.o \
            web/swat.o web/neg_lang.o
 
 SWAT_OBJ = $(SWAT_OBJ1) $(PARAM_OBJ) $(PRINTING_OBJ) $(LIBSMB_OBJ) \
-	   $(LOCKING_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SECRETS_OBJ) $(KRBCLIENT_OBJ) \
+	   $(LOCKING_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(KRBCLIENT_OBJ) \
 	   $(LIB_NONSMBD_OBJ) $(GROUPDB_OBJ) $(PLAINTEXT_AUTH_OBJ) \
 	   $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) $(RPC_PARSE_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \
            $(PASSCHANGE_OBJ) $(LDB_OBJ)
@@ -708,17 +725,16 @@ SWAT_OBJ = $(SWAT_OBJ1) $(PARAM_OBJ) $(PRINTING_OBJ) $(LIBSMB_OBJ) \
 STATUS_OBJ = utils/status.o utils/status_profile.o \
 	     $(LOCKING_OBJ) $(PARAM_OBJ) \
              $(PROFILE_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) \
-	     $(SECRETS_OBJ) $(LIBSAMBA_OBJ) $(ERRORMAP_OBJ) $(RPC_PARSE_OBJ1) \
-             $(DOSERR_OBJ)
+	     $(LIBSAMBA_OBJ)
 
 SMBCONTROL_OBJ = utils/smbcontrol.o $(LOCKING_OBJ) $(PARAM_OBJ) \
 	$(PROFILE_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) \
-	$(SECRETS_OBJ) $(LIBSAMBA_OBJ) $(RPC_PARSE_OBJ1) $(DOSERR_OBJ) \
-	$(PRINTBASE_OBJ) $(ERRORMAP_OBJ)
+	$(LIBSAMBA_OBJ) \
+	$(PRINTBASE_OBJ)
 
 SMBTREE_OBJ = utils/smbtree.o $(PARAM_OBJ) \
              $(PROFILE_OBJ) $(LIB_NONSMBD_OBJ) $(LIBSMB_OBJ) \
-	     $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) $(SECRETS_OBJ) \
+	     $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
              rpc_client/cli_pipe.o $(RPC_PARSE_OBJ2) \
              $(RPC_CLIENT_OBJ1) \
 	     $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(LDB_OBJ) $(GROUPDB_OBJ) \
@@ -726,21 +742,21 @@ SMBTREE_OBJ = utils/smbtree.o $(PARAM_OBJ) \
 
 TESTPARM_OBJ = utils/testparm.o \
                $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) \
-	       $(SECRETS_OBJ) $(LIBSAMBA_OBJ) $(RPC_PARSE_OBJ1) $(DOSERR_OBJ) \
-	       $(ERRORMAP_OBJ)
+	       $(LIBSAMBA_OBJ)
 
 PASSWD_UTIL_OBJ = utils/passwd_util.o
 
 SMBPASSWD_OBJ = utils/smbpasswd.o $(PASSWD_UTIL_OBJ) $(PASSCHANGE_OBJ) \
-		$(PARAM_OBJ) $(SECRETS_OBJ) $(LIBSMB_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ \
+		$(PARAM_OBJ) $(LIBSMB_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ \
 		$(GROUPDB_OBJ) $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) \
 		$(POPT_LIB_OBJ) $(SMBLDAP_OBJ) $(RPC_PARSE_OBJ) \
 		$(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) $(LDB_OBJ)
 
 PDBEDIT_OBJ = utils/pdbedit.o $(PASSWD_UTIL_OBJ) $(PARAM_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ \
-		$(LIBSAMBA_OBJ) $(LIB_NONSMBD_OBJ) $(GROUPDB_OBJ) \
-		$(SECRETS_OBJ) $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) libsmb/asn1.o \
-		$(RPC_PARSE_OBJ1) $(DOSERR_OBJ) $(LDB_OBJ) $(ERRORMAP_OBJ) 
+		$(LIBSAMBA_OBJ) \
+		$(LIB_NONSMBD_OBJ) $(GROUPDB_OBJ) \
+		$(POPT_LIB_OBJ) $(SMBLDAP_OBJ) libsmb/asn1.o \
+		$(LDB_OBJ)
 
 SMBGET_OBJ = utils/smbget.o $(POPT_LIB_OBJ) $(LIBSMBCLIENT_OBJ0) @LIBWBCLIENT_STATIC@
 
@@ -759,7 +775,7 @@ RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \
              $(PARAM_OBJ) $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) \
              $(RPC_PARSE_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \
              $(READLINE_OBJ) $(GROUPDB_OBJ) $(KRBCLIENT_OBJ) \
-	     $(LIBADS_OBJ) $(SECRETS_OBJ) $(POPT_LIB_OBJ) \
+	     $(LIBADS_OBJ) $(POPT_LIB_OBJ) \
 	     $(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(LDB_OBJ) 
 
 PAM_WINBIND_OBJ = nsswitch/pam_winbind.o $(WBCOMMON_OBJ) \
@@ -781,7 +797,7 @@ LIBSMBCLIENT_OBJ0 = \
 		    $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
 		    $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
 		    $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
-		    $(SECRETS_OBJ) $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ)
+		    $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ)
 
 LIBSMBCLIENT_OBJ = $(LIBSMBCLIENT_OBJ0) @LIBWBCLIENT_STATIC@
 
@@ -793,7 +809,7 @@ LIBSMBSHAREMODES_OBJ = libsmb/smb_share_modes.o @LIBTDB_STATIC@
 
 LIBBIGBALLOFMUD_MAJOR = 0
 
-LIBBIGBALLOFMUD_OBJ = $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(SECRETS_OBJ) \
+LIBBIGBALLOFMUD_OBJ = $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
 	$(LIBSMB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ \
 	$(GROUPDB_OBJ) $(KRBCLIENT_OBJ) $(SMBLDAP_OBJ) $(LDB_OBJ)
 
@@ -804,7 +820,7 @@ CLIENT_OBJ1 = client/client.o client/clitar.o rpc_client/cli_pipe.o \
 
 CLIENT_OBJ = $(CLIENT_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
 	     $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(LIBMSRPC_GEN_OBJ) \
-             $(READLINE_OBJ) $(POPT_LIB_OBJ) $(SECRETS_OBJ) \
+             $(READLINE_OBJ) $(POPT_LIB_OBJ) \
              $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
 	     $(DISPLAY_SEC_OBJ) 
 
@@ -823,7 +839,7 @@ LIBNETAPI_OBJ  = $(LIBNETAPI_OBJ1) $(LIBNET_OBJ) \
 		 $(PARAM_WITHOUT_REG_OBJ) $(LIB_NONSMBD_OBJ) \
 		 $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
 		 $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
-		 $(SECRETS_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
+		 $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
 		 $(DCUTIL_OBJ) $(LIBADS_OBJ) $(PRIVILEGES_BASIC_OBJ)
 
 LIBSMBCONF_OBJ = lib/smbconf/smbconf.o lib/smbconf/smbconf_util.o \
@@ -836,11 +852,7 @@ SMBCONFTORT_OBJ0 = lib/smbconf/testsuite.o
 SMBCONFTORT_OBJ = $(SMBCONFTORT_OBJ0) \
 		  $(LIB_NONSMBD_OBJ) \
 		  $(PARAM_OBJ) \
-		  $(ERRORMAP_OBJ) \
-		  $(RPC_PARSE_OBJ1) \
-		  $(LIBSAMBA_OBJ) \
-		  $(DOSERR_OBJ) \
-		  $(SECRETS_OBJ) \
+		  $(LIBSMB_ERR_OBJ) \
 		  $(POPT_LIB_OBJ)
 
 LIBNET_OBJ = libnet/libnet_join.o \
@@ -864,7 +876,7 @@ NET_OBJ2 = utils/net_registry_util.o
 
 NET_OBJ = $(NET_OBJ1) \
 	  $(NET_OBJ2) \
-	  $(PARAM_WITHOUT_REG_OBJ) $(SECRETS_OBJ) $(LIBSMB_OBJ) \
+	  $(PARAM_WITHOUT_REG_OBJ) $(LIBSMB_OBJ) \
 	  $(RPC_PARSE_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
 	  $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(LIBADDNS_OBJ0) \
 	  $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
@@ -878,7 +890,7 @@ NET_OBJ = $(NET_OBJ1) \
 	  $(PRIVILEGES_BASIC_OBJ)
 
 CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
-	  $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(SECRETS_OBJ) $(POPT_LIB_OBJ)
+	  $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ)
 
 CIFS_MOUNT_OBJ = client/mount.cifs.o
 
@@ -886,69 +898,65 @@ CIFS_UMOUNT_OBJ = client/umount.cifs.o
 
 CIFS_SPNEGO_OBJ = client/cifs.spnego.o
 
-NMBLOOKUP_OBJ = utils/nmblookup.o $(PARAM_OBJ) $(LIBNMB_OBJ) $(RPC_PARSE_OBJ1) $(DOSERR_OBJ) \
-               $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) $(SECRETS_OBJ) $(LIBSAMBA_OBJ) \
-	       $(ERRORMAP_OBJ)
+NMBLOOKUP_OBJ = utils/nmblookup.o $(PARAM_OBJ) $(LIBNMB_OBJ) \
+               $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) $(LIBSAMBA_OBJ)
 
 SMBTORTURE_OBJ1 = torture/torture.o torture/nbio.o torture/scanner.o torture/utable.o \
 		torture/denytest.o torture/mangle_test.o
 
 SMBTORTURE_OBJ = $(SMBTORTURE_OBJ1) $(PARAM_OBJ) \
-	$(LIBSMB_OBJ) $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(SECRETS_OBJ)
+	$(LIBSMB_OBJ) $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ)
 
 MASKTEST_OBJ = torture/masktest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
-                 $(LIB_NONSMBD_OBJ) $(SECRETS_OBJ)
+                 $(LIB_NONSMBD_OBJ)
 
 MSGTEST_OBJ = torture/msgtest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
-                 $(LIB_NONSMBD_OBJ) $(SECRETS_OBJ)
+                 $(LIB_NONSMBD_OBJ)
 
 LOCKTEST_OBJ = torture/locktest.o $(PARAM_OBJ) $(LOCKING_OBJ) $(KRBCLIENT_OBJ) \
-               $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(SECRETS_OBJ)
+               $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ)
 
 NSSTEST_OBJ = torture/nsstest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
-                 $(LIB_NONSMBD_OBJ) $(SECRETS_OBJ)
+                 $(LIB_NONSMBD_OBJ)
 
 PDBTEST_OBJ = torture/pdbtest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
-		$(LIB_NONSMBD_OBJ) $(SECRETS_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(GROUPDB_OBJ) \
+		$(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(GROUPDB_OBJ) \
 		$(SMBLDAP_OBJ) $(POPT_LIB_OBJ) $(LDB_OBJ)
 
 
 VFSTEST_OBJ = torture/cmd_vfs.o torture/vfstest.o $(SMBD_OBJ_BASE) $(READLINE_OBJ)
 
-SMBICONV_OBJ = $(PARAM_OBJ) torture/smbiconv.o $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) $(SECRETS_OBJ) $(LIBSAMBA_OBJ) $(DOSERR_OBJ) $(RPC_PARSE_OBJ1) $(ERRORMAP_OBJ)
+SMBICONV_OBJ = $(PARAM_OBJ) torture/smbiconv.o $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) $(LIBSAMBA_OBJ)
 
 LOG2PCAP_OBJ = utils/log2pcaphex.o
 
 LOCKTEST2_OBJ = torture/locktest2.o $(PARAM_OBJ) $(LOCKING_OBJ) $(LIBSMB_OBJ) \
-		$(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(SECRETS_OBJ)
+		$(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ)
 
 SMBCACLS_OBJ = utils/smbcacls.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
 		$(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(RPC_PARSE_OBJ) \
 		$(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(GROUPDB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
-		$(SECRETS_OBJ) \
 		$(POPT_LIB_OBJ) $(DCUTIL_OBJ) $(LIBADS_OBJ) $(SMBLDAP_OBJ) $(LDB_OBJ)
 
 SMBCQUOTAS_OBJ = utils/smbcquotas.o $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
 		$(PARAM_OBJ) \
 		$(LIB_NONSMBD_OBJ) $(RPC_PARSE_OBJ) \
-		$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(SECRETS_OBJ) $(POPT_LIB_OBJ) \
+		$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(POPT_LIB_OBJ) \
 		$(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ)
 
 EVTLOGADM_OBJ0	= utils/eventlogadm.o
 
 EVTLOGADM_OBJ	= $(EVTLOGADM_OBJ0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
-		$(ERRORMAP_OBJ) $(RPC_PARSE_OBJ1) $(LIBSAMBA_OBJ) $(DOSERR_OBJ) \
-		$(SECRETS_OBJ) \
+		$(LIBSAMBA_OBJ) \
 	        registry/reg_eventlog.o rpc_server/srv_eventlog_lib.o
 
 SHARESEC_OBJ0 = utils/sharesec.o
 SHARESEC_OBJ  = $(SHARESEC_OBJ0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
-		$(ERRORMAP_OBJ) $(RPC_PARSE_OBJ1) $(LIBSAMBA_OBJ) $(DOSERR_OBJ) \
-                $(POPT_LIB_OBJ) $(SECRETS_OBJ)
+		$(LIBSAMBA_OBJ) \
+                $(POPT_LIB_OBJ)
 
 TALLOCTORT_OBJ = @tallocdir@/testsuite.o $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
-                 $(RPC_PARSE_OBJ1) $(DOSERR_OBJ) $(LIBSAMBA_OBJ) $(SECRETS_OBJ) \
-		 $(ERRORMAP_OBJ)
+                 $(LIBSAMBA_OBJ)
 
 REPLACETORT_OBJ = lib/replace/test/testsuite.o \
 		lib/replace/test/getifaddrs.o \
@@ -957,14 +965,13 @@ REPLACETORT_OBJ = lib/replace/test/testsuite.o \
 		$(LIBREPLACE_OBJ)
 
 NDRDUMP_OBJ = librpc/tools/ndrdump.o \
-			  $(PARAM_OBJ) $(LIBNDR_GEN_OBJ) \
-			  $(LIBSAMBA_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) \
-			  $(RPC_PARSE_OBJ1) $(DOSERR_OBJ) $(SECRETS_OBJ) \
-			  $(ERRORMAP_OBJ)
+	      $(PARAM_OBJ) $(LIBNDR_GEN_OBJ) \
+	      $(LIBSAMBA_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) \
+	      librpc/gen_ndr/ndr_svcctl.o
 
 DEBUG2HTML_OBJ = utils/debug2html.o utils/debugparse.o
 
-SMBFILTER_OBJ = utils/smbfilter.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(SECRETS_OBJ) \
+SMBFILTER_OBJ = utils/smbfilter.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
                  $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ)
 
 PROTO_OBJ = $(SMBD_OBJ_MAIN) $(LIBNDR_OBJ) $(LIBNDR_GEN_OBJ) \
@@ -973,7 +980,7 @@ PROTO_OBJ = $(SMBD_OBJ_MAIN) $(LIBNDR_OBJ) $(LIBNDR_GEN_OBJ) \
 	    $(LIBMSRPC_OBJ) \
 	    $(LIB_WITH_PROTO_OBJ) \
 	    $(RPC_PIPE_OBJ) $(RPC_PARSE_OBJ) $(KRBCLIENT_OBJ) \
-	    $(AUTH_OBJ) $(PARAM_WITHOUT_REG_OBJ) $(LOCKING_OBJ) $(SECRETS_OBJ) \
+	    $(AUTH_OBJ) $(PARAM_WITHOUT_REG_OBJ) $(LOCKING_OBJ) \
 	    $(PRINTING_OBJ) $(PRINTBACKEND_OBJ) $(OPLOCK_OBJ) $(NOTIFY_OBJ) \
 	    $(PASSDB_OBJ) $(GROUPDB_OBJ) \
 	    $(READLINE_OBJ) $(PROFILE_OBJ) $(LIBADS_OBJ) $(LIBADS_SERVER_OBJ) \
@@ -988,13 +995,13 @@ PROTO_OBJ = $(SMBD_OBJ_MAIN) $(LIBNDR_OBJ) $(LIBNDR_GEN_OBJ) \
 	    $(PRIVILEGES_BASIC_OBJ)
 
 WINBIND_WINS_NSS_OBJ = nsswitch/wins.o $(PARAM_OBJ) \
-	$(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ) $(SECRETS_OBJ)
+	$(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ)
 
 PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \
 		pam_smbpass/pam_smb_acct.o pam_smbpass/support.o
 PAM_SMBPASS_OBJ = $(PAM_SMBPASS_OBJ_0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(GROUPDB_OBJ) \
-		$(SECRETS_OBJ) $(SMBLDAP_OBJ) $(LIBSAMBA_OBJ) \
-		$(RPC_PARSE_OBJ1) $(DOSERR_OBJ) $(LDB_OBJ) $(ERRORMAP_OBJ)
+		$(SMBLDAP_OBJ) $(LIBSAMBA_OBJ) \
+		$(LDB_OBJ)
 
 IDMAP_OBJ     = winbindd/idmap.o winbindd/idmap_cache.o winbindd/idmap_util.o @IDMAP_STATIC@
 
@@ -1032,15 +1039,14 @@ WINBINDD_OBJ = \
 		$(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
 		$(LIBSMB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
 		$(PROFILE_OBJ) $(SLCACHE_OBJ) $(SMBLDAP_OBJ) \
-		$(SECRETS_OBJ) $(LIBADS_OBJ) $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
+		$(LIBADS_OBJ) $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
 		$(DCUTIL_OBJ) $(IDMAP_OBJ) $(NSS_INFO_OBJ) \
 		$(AFS_OBJ) $(AFS_SETTOKEN_OBJ) \
 		$(LIBADS_SERVER_OBJ) $(SERVER_MUTEX_OBJ) $(LDB_OBJ) 
 
 WBINFO_OBJ = nsswitch/wbinfo.o $(LIBSAMBA_OBJ) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
-		$(SECRETS_OBJ) $(POPT_LIB_OBJ) $(AFS_SETTOKEN_OBJ) $(RPC_PARSE_OBJ1) \
-		$(DOSERR_OBJ) lib/winbind_util.o $(WBCOMMON_OBJ) @LIBWBCLIENT_STATIC@ \
-		$(ERRORMAP_OBJ)
+		$(POPT_LIB_OBJ) $(AFS_SETTOKEN_OBJ) \
+		lib/winbind_util.o $(WBCOMMON_OBJ) @LIBWBCLIENT_STATIC@
 
 WINBIND_NSS_OBJ = $(WBCOMMON_OBJ) $(LIBREPLACE_OBJ) @WINBIND_NSS_EXTRA_OBJS@
 
@@ -1063,7 +1069,7 @@ LDB_LDAP_OBJ=@LDBLDAP@
 
 LDB_OBJ = ${LDB_COMMON_OBJ} ${LDB_TDB_OBJ} ${LDB_LDAP_OBJ} ${LDB_MODULES_OBJ}
 
-LDB_CMDLINE_OBJ = $(PARAM_OBJ) $(SECRETS_OBJ) $(LIBSMB_OBJ) \
+LDB_CMDLINE_OBJ = $(PARAM_OBJ) $(LIBSMB_OBJ) \
 	  $(RPC_PARSE_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(GROUPDB_OBJ) \
 	  $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(LIBADDNS_OBJ0) \
 	  $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
@@ -1105,10 +1111,10 @@ NTLM_AUTH_OBJ1 = utils/ntlm_auth.o utils/ntlm_auth_diagnostics.o
 
 NTLM_AUTH_OBJ = ${NTLM_AUTH_OBJ1} $(LIBSAMBA_OBJ) $(POPT_LIB_OBJ) \
 		libsmb/asn1.o libsmb/spnego.o libsmb/clikrb5.o libads/kerberos.o \
-		$(SECRETS_OBJ) $(SERVER_MUTEX_OBJ) $(LIBADS_SERVER_OBJ) \
-		$(RPC_PARSE_OBJ1) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
-		$(SMBLDAP_OBJ) $(DOSERR_OBJ) $(LIBNMB_OBJ) \
-		$(LDB_OBJ) $(ERRORMAP_OBJ) $(WBCOMMON_OBJ) @LIBWBCLIENT_STATIC@ \
+		$(SERVER_MUTEX_OBJ) $(LIBADS_SERVER_OBJ) \
+		$(PASSDB_OBJ) $(GROUPDB_OBJ) \
+		$(SMBLDAP_OBJ) $(LIBNMB_OBJ) \
+		$(LDB_OBJ) $(WBCOMMON_OBJ) @LIBWBCLIENT_STATIC@ \
 		librpc/gen_ndr/ndr_samr.o \
 		librpc/gen_ndr/ndr_lsa.o \
 		librpc/gen_ndr/ndr_netlogon.o
@@ -1118,7 +1124,7 @@ VLP_OBJ1 = ../testsuite/printing/vlp.o $(RPC_CLIENT_OBJ1) $(RPC_PARSE_OBJ2) $(RP
 
 VLP_OBJ = $(VLP_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
 	  $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(LIBMSRPC_GEN_OBJ) \
-	  $(READLINE_OBJ) $(POPT_LIB_OBJ) $(SECRETS_OBJ) \
+	  $(READLINE_OBJ) $(POPT_LIB_OBJ) \
 	  $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
 	  $(DISPLAY_SEC_OBJ)
 
diff --git a/source/include/ads_cldap.h b/source/include/ads_cldap.h
deleted file mode 100644
index 692fc1b..0000000
--- a/source/include/ads_cldap.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* 
-   Samba Unix/Linux SMB client library 
-   net ads cldap functions 
-   Copyright (C) 2001 Andrew Tridgell (tridge at samba.org)
-   Copyright (C) 2003 Jim McDonough (jmcd at us.ibm.com)
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  
-*/
-
-#ifndef _INCLUDE_ADS_CLDAP_H_
-#define _INCLUDE_ADS_CLDAP_H_
-
-#define MAX_DNS_LABEL 255 + 1
-
-struct cldap_netlogon_reply {
-	uint32 type;
-	uint32 flags;
-	UUID_FLAT guid;
-
-	char forest[MAX_DNS_LABEL];
-	char domain[MAX_DNS_LABEL];
-	char hostname[MAX_DNS_LABEL];
-
-	char netbios_domain[MAX_DNS_LABEL];
-	char netbios_hostname[MAX_DNS_LABEL];
-
-	char unk[MAX_DNS_LABEL];
-	char user_name[MAX_DNS_LABEL];
-	char server_site_name[MAX_DNS_LABEL];
-	char client_site_name[MAX_DNS_LABEL];
-
-	uint32 version;
-	uint16 lmnt_token;
-	uint16 lm20_token;
-};
-
-/* Mailslot or cldap getdcname response flags */
-#define ADS_PDC            0x00000001  /* DC is PDC */
-#define ADS_GC             0x00000004  /* DC is a GC of forest */
-#define ADS_LDAP           0x00000008  /* DC is an LDAP server */
-#define ADS_DS             0x00000010  /* DC supports DS */
-#define ADS_KDC            0x00000020  /* DC is running KDC */
-#define ADS_TIMESERV       0x00000040  /* DC is running time services */
-#define ADS_CLOSEST        0x00000080  /* DC is closest to client */
-#define ADS_WRITABLE       0x00000100  /* DC has writable DS */
-#define ADS_GOOD_TIMESERV  0x00000200  /* DC has hardware clock (and running time) */
-#define ADS_NDNC           0x00000400  /* DomainName is non-domain NC serviced by LDAP server */
-
-#endif /* _INCLUDE_ADS_CLDAP_H_ */
diff --git a/source/include/doserr.h b/source/include/doserr.h
index d5892c1..65892d3 100644
--- a/source/include/doserr.h
+++ b/source/include/doserr.h
@@ -206,9 +206,15 @@


-- 
Samba Shared Repository


More information about the samba-cvs mailing list