[SCM] Samba Shared Repository - branch v3-2-stable updated - initial-v3-2-unstable-1343-g6811ea1

Gerald (Jerry) Carter jerry at samba.org
Mon Jan 14 15:51:02 GMT 2008


The branch, v3-2-stable has been updated
       via  6811ea1ce2d46f7303b4edf661e27d2edf54724f (commit)
       via  99dd28da84c270f46535bd2ffa6bfef96d2e2eed (commit)
       via  dcb5034acd35d219106e1d855f4c4d36b3c8d83b (commit)
       via  54bdd22a07e885f896a8f784bc12096f65afac75 (commit)
       via  aa3de6f9f5b5375ca9f1e8a60a378afba1c0848b (commit)
       via  5bfb33f1c5a16d10f77cb76962df4a949626a062 (commit)
       via  f2fb3473455f20e7314a9d33f5a1c923d3057d97 (commit)
       via  153e4dd162423a846dbd4a9a1be1fd747792bdbf (commit)
       via  9a435b510f8ccfd0ca3b3d100d6176e643273578 (commit)
       via  ad6cb9afc9794b226e3453d36865edfe5a15f572 (commit)
       via  0093f618e91f7dcc69d57dbd09d23acc614999aa (commit)
       via  9f002eeff9bcf33a00e5641cb14338e866a17afe (commit)
       via  c91e9c785b5bf4b0c479edf8eb33da22bf615387 (commit)
       via  3eedb8928413da102446b76aa64d1feaecb95b52 (commit)
       via  50f65c3c5500da8d657d5fc340e666ee8cfe148e (commit)
       via  b3afc8391d40745328172ba012f0ffc166d75aa9 (commit)
       via  b5c533b06cba9a8ffd28a1fb3bc56ab248340775 (commit)
       via  aed01fd28c8e896e993239cbe9b2681132ddf980 (commit)
       via  90fa2981c949e21f66a44d634ebe9d661819f0a3 (commit)
       via  627a29b690c30f1096a4746186089cd9a1c92407 (commit)
       via  fd99c1804ae04b7c2a2b0a605e83ba88fa362edb (commit)
       via  c050b148d00c79571ef0e85c6e7c86d551ca6efd (commit)
       via  ad2497cfac90b2e91be6995931629453fd6ed5fa (commit)
       via  e2b34e9c028d712c7c8b22aade2c11d347ae176d (commit)
       via  4aaf4e7e73a5c7fa97ef730fbff5c7cb12df2d6c (commit)
       via  edaf52a301a38824c8beb30c49fba27c8fb0461a (commit)
       via  c2a9346faa26e79af5948197a1b322e545f0ed09 (commit)
       via  7e75acfdd1910b3b5908c02d5f343f014eb77841 (commit)
       via  71de4946cf00cf8b7bb2f2d92832166bee12e84a (commit)
       via  616bc34744487450edd47e212a29c0f57eabb722 (commit)
       via  24e719a1d432d5de022ab903457df0dd67c24b85 (commit)
       via  883f7415769ad1e714f636e9d6fbd1f075e69d1e (commit)
       via  8e64107b7846d8f9cce71aabc95b28b7488d01ce (commit)
       via  71b1e6ff1595fbaa8dd49b996c45541531c7e98c (commit)
       via  10b6f52910b4d29da4ea74740a174654dd1d8e8e (commit)
       via  85fe7f3f6ed4aae76e5cf31ab689b2dfacfd74de (commit)
       via  9ff79f231f1206631662b5c521ecddf5df9141c0 (commit)
       via  8809eaeb154ea12543455f589e31172dc905d83a (commit)
       via  c79e9414c4baed6e61fc6a3f766395b873bcc4ea (commit)
       via  2e75f3ecdf9890b9d7d4bd03f3fa15ef74816d5d (commit)
       via  ecb52f50fe3ec8beda48b6c88e9a3ae5a6a98d52 (commit)
       via  0599d57efff0f417f75510e8b08c3cb7b4bcfcd8 (commit)
       via  1b7cc80c61ccbf766801080f5a3f0260f40ccc17 (commit)
       via  041f1d298c1e72adb263b32f454cdf3603e45416 (commit)
       via  7b9d9fba230b9e61079869a6a2751cda37fb8a9e (commit)
       via  0d2c77e8d3a83f2c5e78fa076f22919ef9d124b9 (commit)
       via  05cadffeab38ca9df7ffd46785b536266c4438c4 (commit)
       via  a5cd3c9b65538588a6c982c6d20022e7476cf3de (commit)
       via  4038bb3a9485943db58d9fe30947e11522ce283d (commit)
       via  08645826817d42c9d4b42ea0fd5e633d7fd08d35 (commit)
       via  57368f883fb217b4196858bb2255c0eea59a8917 (commit)
       via  40e8caa2d81168be3e48ececf5746d8f659a96d6 (commit)
       via  8af80976a3a8dd9d02a6763e48b2c1d8003ae4dd (commit)
       via  4a7acf4a2374138b20a5cdebdcc721668bbd865b (commit)
       via  a9b76c9e2d93c8aa482dbee54f29d7e1503abe4f (commit)
       via  b76250f1cf7238613658901b961d68a0da592712 (commit)
       via  48f638a45525c01db9855e3ef809f08ce65da8d8 (commit)
       via  9f4506e5e2828e0f23bc37586770995c3424b208 (commit)
       via  93084487952f4ef23209401d689b3be3af6c9e6e (commit)
       via  82bd6322b691506ddea2b274973e614fa8c6ee5e (commit)
       via  c6609c042b128e7d63eb64cfdfb0f6b65cb59d76 (commit)
       via  75acdb54a454ffda9d422fcafb573c8f5581d2e8 (commit)
       via  83aed537c16f632599484f60c5ccebc3ab713801 (commit)
       via  88874a501d0c086f796e4838af8c9399d3cccc1f (commit)
       via  19a980f52044a170618629e5b0484c1f6b586e5f (commit)
       via  1ad7a0a361edfa5ac738f011db1d6a9db256ac2c (commit)
       via  9cc0d874f6c064e8752d36e72fcc85bf4c85e656 (commit)
       via  01690f85bc7d052d4c57181d74aef27d1776169c (commit)
       via  23b92a6fa57858c8a23c737a9cd00c076ef5dadd (commit)
       via  3b450a8bcc97b6d03c4b7b9373a3a382c0fcea30 (commit)
       via  2e2d058b7e90a158612af4b0a489578431f748e5 (commit)
       via  ed4960baccf687b77c2b0f4ee64cbce2005f3abb (commit)
       via  9707a5eb008788460937104575b7afd733a9f741 (commit)
       via  16ca8d2746a5c2fc7a583d1cf2ebb4d3aa003842 (commit)
       via  767e0164adf8803df50b0b7bd8e81d25af72bb78 (commit)
       via  3caeeaea162e2083a087c242b850c107a3be1bf9 (commit)
       via  3958abffaf2866c69ad9e13ec345364fde5c78bb (commit)
       via  63acaf1b9755cd5be5342929e1210afa06e170f3 (commit)
       via  a52cfb7d777157c93c9dc26c67f457be592dd537 (commit)
       via  3936de735a7bb548df8ce7f06f2cc8f7ffdf56cd (commit)
       via  88102b5b7c4eaad5445e9cb96e547dd918abc0c2 (commit)
       via  7a88cd61e09f6db9db38916704ae65e03b33139c (commit)
       via  c82c1d462be6ddccd6e395b4a9630df91dacbda2 (commit)
       via  c8ae7d095a2a6a7eac920a68ca7244e3a423e1b1 (commit)
       via  a8fc2ddad8d5f7c6c00cb36c74a32a02d69d1d04 (commit)
       via  87456d8eefe630ab6ac685524c4560a71764ea96 (commit)
       via  dec77b387cd9024eb33bb0617c7543814e9c9212 (commit)
      from  22d2ff0bc4d1012cc3ffc7ab0fdbab5a8188a0cb (commit)

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


- Log -----------------------------------------------------------------
commit 6811ea1ce2d46f7303b4edf661e27d2edf54724f
Merge: 22d2ff0bc4d1012cc3ffc7ab0fdbab5a8188a0cb 99dd28da84c270f46535bd2ffa6bfef96d2e2eed
Author: Gerald (Jerry) Carter <jerry at samba.org>
Date:   Mon Jan 14 09:49:47 2008 -0600

    Merge commit 'samba/v3-2-test' into v3-2-stable

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

Summary of changes:
 examples/VFS/skel_opaque.c                         |   16 +-
 examples/VFS/skel_transparent.c                    |   16 +-
 examples/logon/genlogon/genlogon.pl                |    2 +-
 source/Makefile.in                                 |   58 ++--
 source/configure.in                                |   13 +-
 source/include/rpc_lsa.h                           |  153 -------
 source/include/vfs.h                               |   12 +-
 source/include/vfs_macros.h                        |   24 +-
 source/lib/dbwrap_rbt.c                            |  186 ++++++---
 source/lib/dbwrap_tdb.c                            |    3 +-
 source/lib/module.c                                |    2 +
 source/lib/netapi/examples/getdc/getdc.c           |    2 +-
 .../examples/netdomjoin-gui/netdomjoin-gui.c       |    8 +-
 source/lib/netapi/examples/netdomjoin/netdomjoin.c |    4 +-
 source/lib/netapi/joindomain.c                     |    4 +-
 source/lib/netapi/netapi.c                         |   21 +-
 source/lib/netapi/netapi.h                         |   15 +-
 source/lib/netapi/serverinfo.c                     |   18 +-
 source/lib/tdb/common/freelist.c                   |  101 ++++--
 source/lib/tdb/common/io.c                         |   20 +-
 source/lib/tdb/common/lock.c                       |    7 +
 source/lib/tdb/common/open.c                       |   11 +-
 source/lib/tdb/common/tdb.c                        |   77 ++++-
 source/lib/tdb/common/tdb_private.h                |    8 +-
 source/lib/tdb/common/transaction.c                |  408 +++++++++++--------
 source/lib/tdb/common/traverse.c                   |    3 +
 source/lib/tdb/configure.ac                        |    2 +-
 source/lib/tdb/include/tdb.h                       |    4 +
 source/libads/authdata.c                           |    4 +-
 source/libads/kerberos_verify.c                    |    3 +-
 source/libnet/libnet.h                             |    1 +
 source/libnet/libnet_conf.c                        |  279 ++++++++++----
 source/libnet/{libnet.h => libnet_conf.h}          |   13 +-
 source/libnet/libnet_join.c                        |  269 ++++++++-----
 source/libnet/libnet_join.h                        |    2 +
 source/librpc/gen_ndr/dfs.h                        |   15 +-
 source/librpc/gen_ndr/echo.h                       |   10 +-
 source/librpc/gen_ndr/epmapper.h                   |    5 +-
 source/librpc/gen_ndr/lsa.h                        |   22 +-
 source/librpc/gen_ndr/ndr_svcctl.c                 |   12 +-
 source/librpc/gen_ndr/ndr_wkssvc.c                 |    2 +
 source/librpc/gen_ndr/netlogon.h                   |   21 +-
 source/librpc/gen_ndr/srvsvc.h                     |   14 +-
 source/librpc/gen_ndr/svcctl.h                     |    5 +-
 source/librpc/gen_ndr/winreg.h                     |   12 +-
 source/librpc/gen_ndr/wkssvc.h                     |   17 +-
 source/librpc/idl/lsa.idl                          |    2 +-
 source/librpc/idl/netlogon.idl                     |    6 +-
 source/librpc/idl/samr.idl                         |    4 +-
 source/librpc/idl/srvsvc.idl                       |    4 +-
 source/librpc/idl/winreg.idl                       |    2 +-
 source/librpc/idl/wkssvc.idl                       |    2 +-
 source/libsmb/dsgetdcname.c                        |   76 ++--
 source/libsmb/namequery.c                          |   13 +-
 source/locking/locking.c                           |    8 +-
 source/modules/vfs_cacheprime.c                    |   21 +-
 source/modules/vfs_commit.c                        |    3 +-
 source/modules/vfs_default.c                       |   31 +-
 source/modules/vfs_full_audit.c                    |   30 +-
 source/modules/vfs_readahead.c                     |   14 +-
 source/nmbd/nmbd_incomingdgrams.c                  |    4 +-
 source/passdb/pdb_tdb.c                            |    3 +-
 source/printing/nt_printing.c                      |    7 +-
 source/rpc_client/cli_lsarpc.c                     |  219 -----------
 source/rpc_parse/parse_lsa.c                       |  415 --------------------
 source/rpc_server/srv_dfs_nt.c                     |    2 +-
 source/rpc_server/srv_wkssvc_nt.c                  |    3 +-
 source/rpcclient/cmd_lsarpc.c                      |  114 +++---
 source/script/tests/test_local_s3.sh               |    2 +-
 source/script/tests/test_wbinfo_s3.sh              |    2 +
 source/smbd/aio.c                                  |    1 -
 source/smbd/close.c                                |   40 ++-
 source/smbd/dir.c                                  |   96 ++---
 source/smbd/filename.c                             |    6 +-
 source/smbd/mangle_hash2.c                         |    2 +-
 source/smbd/notify.c                               |    1 +
 source/smbd/open.c                                 |   28 +-
 source/smbd/process.c                              |    2 +-
 source/smbd/reply.c                                |   39 +-
 source/smbd/sec_ctx.c                              |   17 +
 source/smbd/server.c                               |   14 +-
 source/smbd/sesssetup.c                            |    3 +-
 source/smbd/vfs.c                                  |   12 +-
 source/torture/cmd_vfs.c                           |    4 +-
 source/utils/net_conf.c                            |  195 +++++++--
 source/utils/net_dom.c                             |    4 +-
 source/utils/net_lookup.c                          |    2 +-
 source/utils/net_rpc.c                             |   22 +-
 source/utils/net_rpc_rights.c                      |    6 +-
 source/utils/ntlm_auth.c                           |    3 +-
 source/winbindd/winbindd_locator.c                 |    6 +-
 source/winbindd/winbindd_rpc.c                     |    2 +-
 92 files changed, 1647 insertions(+), 1749 deletions(-)
 copy source/libnet/{libnet.h => libnet_conf.h} (80%)


Changeset truncated at 500 lines:

diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index 8c05479..5b196af 100644
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -130,9 +130,9 @@ static int skel_close(vfs_handle_struct *handle, files_struct *fsp, int fd)
 	return vfswrap_close(NULL, fsp, fd);
 }
 
-static ssize_t skel_read(vfs_handle_struct *handle, files_struct *fsp, int fd, void *data, size_t n)
+static ssize_t skel_read(vfs_handle_struct *handle, files_struct *fsp, void *data, size_t n)
 {
-	return vfswrap_read(NULL, fsp, fd, data, n);
+	return vfswrap_read(NULL, fsp, data, n);
 }
 
 static ssize_t skel_pread(vfs_handle_struct *handle, struct files_struct *fsp, void *data, size_t n, SMB_OFF_T offset)
@@ -140,9 +140,9 @@ static ssize_t skel_pread(vfs_handle_struct *handle, struct files_struct *fsp, v
 	return vfswrap_pread(NULL, fsp, data, n, offset);
 }
 
-static ssize_t skel_write(vfs_handle_struct *handle, files_struct *fsp, int fd, const void *data, size_t n)
+static ssize_t skel_write(vfs_handle_struct *handle, files_struct *fsp, const void *data, size_t n)
 {
-	return vfswrap_write(NULL, fsp, fd, data, n);
+	return vfswrap_write(NULL, fsp, data, n);
 }
 
 ssize_t skel_pwrite(vfs_handle_struct *handle, struct files_struct *fsp, const void *data, size_t n, SMB_OFF_T offset)
@@ -155,15 +155,15 @@ static SMB_OFF_T skel_lseek(vfs_handle_struct *handle, files_struct *fsp, SMB_OF
 	return vfswrap_lseek(NULL, fsp, offset, whence);
 }
 
-static ssize_t skel_sendfile(vfs_handle_struct *handle, int tofd, files_struct *fsp, int fromfd, const DATA_BLOB *hdr,
+static ssize_t skel_sendfile(vfs_handle_struct *handle, int tofd, files_struct *fromfsp, const DATA_BLOB *hdr,
 		                        SMB_OFF_T offset, size_t n)
 {
-	return vfswrap_sendfile(NULL, tofd, fsp, fromfd, hdr, offset, n);
+	return vfswrap_sendfile(NULL, tofd, fromfsp, hdr, offset, n);
 }
 
-static ssize_t skel_recvfile(vfs_handle_struct *handle, int fromfd, files_struct *fsp, int tofd, SMB_OFF_T offset, size_t n)
+static ssize_t skel_recvfile(vfs_handle_struct *handle, int fromfd, files_struct *tofsp, SMB_OFF_T offset, size_t n)
 {
-	return vfswrap_recvfile(NULL, fromfd, fsp, tofd, offset, n);
+	return vfswrap_recvfile(NULL, fromfd, tofsp, offset, n);
 }
 
 static int skel_rename(vfs_handle_struct *handle,  const char *oldname, const char *newname)
diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index f15cdfd..55407be 100644
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -124,9 +124,9 @@ static int skel_close(vfs_handle_struct *handle, files_struct *fsp, int fd)
 	return SMB_VFS_NEXT_CLOSE(handle, fsp, fd);
 }
 
-static ssize_t skel_read(vfs_handle_struct *handle, files_struct *fsp, int fd, void *data, size_t n)
+static ssize_t skel_read(vfs_handle_struct *handle, files_struct *fsp, void *data, size_t n)
 {
-	return SMB_VFS_NEXT_READ(handle, fsp, fd, data, n);
+	return SMB_VFS_NEXT_READ(handle, fsp, data, n);
 }
 
 static ssize_t skel_pread(vfs_handle_struct *handle, files_struct *fsp, void *data, size_t n, SMB_OFF_T offset)
@@ -134,9 +134,9 @@ static ssize_t skel_pread(vfs_handle_struct *handle, files_struct *fsp, void *da
 	return SMB_VFS_NEXT_PREAD(handle, fsp, data, n, offset);
 }
 
-static ssize_t skel_write(vfs_handle_struct *handle, files_struct *fsp, int fd, const void *data, size_t n)
+static ssize_t skel_write(vfs_handle_struct *handle, files_struct *fsp, const void *data, size_t n)
 {
-	return SMB_VFS_NEXT_WRITE(handle, fsp, fd, data, n);
+	return SMB_VFS_NEXT_WRITE(handle, fsp, data, n);
 }
 
 static ssize_t skel_pwrite(vfs_handle_struct *handle, files_struct *fsp, const void *data, size_t n, SMB_OFF_T offset)
@@ -149,14 +149,14 @@ static SMB_OFF_T skel_lseek(vfs_handle_struct *handle, files_struct *fsp, SMB_OF
 	return SMB_VFS_NEXT_LSEEK(handle, fsp, offset, whence);
 }
 
-static ssize_t skel_sendfile(vfs_handle_struct *handle, int tofd, files_struct *fsp, int fromfd, const DATA_BLOB *hdr, SMB_OFF_T offset, size_t n)
+static ssize_t skel_sendfile(vfs_handle_struct *handle, int tofd, files_struct *fromfsp, const DATA_BLOB *hdr, SMB_OFF_T offset, size_t n)
 {
-	return SMB_VFS_NEXT_SENDFILE(handle, tofd, fsp, fromfd, hdr, offset, n);
+	return SMB_VFS_NEXT_SENDFILE(handle, tofd, fromfsp, hdr, offset, n);
 }
 
-static ssize_t skel_recvfile(vfs_handle_struct *handle, int fromfd, files_struct *fsp, int tofd, SMB_OFF_T offset, size_t n)
+static ssize_t skel_recvfile(vfs_handle_struct *handle, int fromfd, files_struct *tofsp, SMB_OFF_T offset, size_t n)
 {
-	return SMB_VFS_NEXT_RECVFILE(handle, fromfd, fsp, tofd, offset, n);
+	return SMB_VFS_NEXT_RECVFILE(handle, fromfd, tofsp, offset, n);
 }
 
 static int skel_rename(vfs_handle_struct *handle,  const char *oldname, const char *newname)
diff --git a/examples/logon/genlogon/genlogon.pl b/examples/logon/genlogon/genlogon.pl
index 8ebf392..4799ac8 100644
--- a/examples/logon/genlogon/genlogon.pl
+++ b/examples/logon/genlogon/genlogon.pl
@@ -45,7 +45,7 @@ if ($ARGV[1] eq "SUPPORT" || $ARGV[0] eq "support")
 }
 
 # Connect shares just used by Administration staff
-If ($ARGV[1] eq "ADMIN" || $ARGV[0] eq "admin")
+if ($ARGV[1] eq "ADMIN" || $ARGV[0] eq "admin")
 {
 	print LOGON "NET USE L: \\\\$ARGV[2]\\ADMIN\r\n";
 	print LOGON "NET USE K: \\\\$ARGV[2]\\MKTING\r\n";
diff --git a/source/Makefile.in b/source/Makefile.in
index 94c3e7b..c34f328 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -285,9 +285,12 @@ NSS_WRAPPER_OBJ = @NSS_WRAPPER_OBJS@
 
 TALLOC_OBJ = lib/talloc/talloc.o
 
-LIBSAMBAUTIL_OBJ = $(TALLOC_OBJ) $(LIBREPLACE_OBJ)
+LIBSAMBAUTIL_OBJ = $(TALLOC_OBJ) \
+		$(LIBREPLACE_OBJ) \
+		$(SOCKET_WRAPPER_OBJ) \
+		$(NSS_WRAPPER_OBJ)
 
-LIB_WITHOUT_PROTO_OBJ = $(LIBREPLACE_OBJ) $(SOCKET_WRAPPER_OBJ) $(NSS_WRAPPER_OBJ) $(TALLOC_OBJ) \
+LIB_WITHOUT_PROTO_OBJ = $(LIBSAMBAUTIL_OBJ) \
 	lib/messages.o librpc/gen_ndr/ndr_messaging.o lib/messages_local.o \
 	lib/messages_ctdbd.o lib/packet.o lib/ctdbd_conn.o lib/talloc_stack.o \
 	lib/interfaces.o lib/rbtree.o lib/memcache.o \
@@ -337,8 +340,7 @@ LIBADDNS_OBJ0 = libaddns/dnsrecord.o libaddns/dnsutils.o  libaddns/dnssock.o \
 	       libaddns/dnsgss.o libaddns/dnsmarshall.o
 LIBADDNS_OBJ = $(LIBADDNS_OBJ0) $(TALLOC_OBJ)
 
-LIBWBCLIENT_OBJ = nsswitch/wb_common.o lib/talloc/talloc.o \
-		  nsswitch/libwbclient/wbclient.o \
+LIBWBCLIENT_OBJ = nsswitch/libwbclient/wbclient.o \
 		  nsswitch/libwbclient/wbc_util.o \
 		  nsswitch/libwbclient/wbc_pwd.o \
 		  nsswitch/libwbclient/wbc_idmap.o \
@@ -573,7 +575,7 @@ SMBD_OBJ_BASE = $(PARAM_WITHOUT_REG_OBJ) $(SMBD_OBJ_SRV) $(LIBSMB_OBJ) \
 		$(NOTIFY_OBJ) $(GROUPDB_OBJ) $(AUTH_OBJ) \
 		$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
 		$(LIBADS_OBJ) $(KRBCLIENT_OBJ) $(LIBADS_SERVER_OBJ) \
-		$(REGISTRY_OBJ) $(POPT_LIB_OBJ) \
+		$(REGISTRY_OBJ) $(POPT_LIB_OBJ) @LIBWBCLIENT_STATIC@ \
 		$(BUILDOPT_OBJ) $(SMBLDAP_OBJ) $(LDB_OBJ) $(LIBNET_OBJ)
 
 PRINTING_OBJ = printing/pcap.o printing/print_svid.o printing/print_aix.o \
@@ -606,7 +608,7 @@ 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) $(SECRETS_OBJ) $(KRBCLIENT_OBJ) \
+	   $(LOCKING_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SECRETS_OBJ) $(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)
@@ -627,7 +629,7 @@ SMBTREE_OBJ = utils/smbtree.o $(PARAM_OBJ) \
 	     $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) $(SECRETS_OBJ) \
              rpc_client/cli_pipe.o $(RPC_PARSE_OBJ2) \
              $(RPC_CLIENT_OBJ1) \
-	     $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(LDB_OBJ) $(GROUPDB_OBJ) \
+	     $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(LDB_OBJ) $(GROUPDB_OBJ) \
 	     $(LIBMSRPC_GEN_OBJ)
 
 TESTPARM_OBJ = utils/testparm.o \
@@ -637,12 +639,12 @@ TESTPARM_OBJ = utils/testparm.o \
 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) \
+		$(PARAM_OBJ) $(SECRETS_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) \
+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) 
@@ -663,7 +665,7 @@ RPCCLIENT_OBJ1 = rpcclient/rpcclient.o rpcclient/cmd_lsarpc.o \
 
 RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \
              $(PARAM_OBJ) $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) \
-             $(RPC_PARSE_OBJ) $(PASSDB_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_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) \
 	     $(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(LDB_OBJ) 
@@ -676,7 +678,7 @@ LIBSMBCLIENT_OBJ = libsmb/libsmbclient.o libsmb/libsmb_compat.o \
 		   $(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)
+		   $(SECRETS_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ)
 
 LIBSMBSHAREMODES_OBJ = libsmb/smb_share_modes.o $(TDBBASE_OBJ)
 
@@ -687,7 +689,7 @@ LIBSMBSHAREMODES_OBJ = libsmb/smb_share_modes.o $(TDBBASE_OBJ)
 LIBBIGBALLOFMUD_MAJOR = 0
 
 LIBBIGBALLOFMUD_OBJ = $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(SECRETS_OBJ) \
-	$(LIBSMB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) $(PASSDB_OBJ) \
+	$(LIBSMB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ \
 	$(GROUPDB_OBJ) $(KRBCLIENT_OBJ) $(SMBLDAP_OBJ) $(LDB_OBJ)
 
 CLIENT_OBJ1 = client/client.o client/clitar.o rpc_client/cli_pipe.o \
@@ -698,7 +700,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) \
-             $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
+             $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
 	     $(DISPLAY_SEC_OBJ) 
 
 UTIL_REG_OBJ = lib/util_reg.o
@@ -734,7 +736,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) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
+		 $(SECRETS_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
 		 $(DCUTIL_OBJ) $(LIBADS_OBJ)
 
 LIBNET_OBJ = libnet/libnet_conf.o libnet/libnet_join.o
@@ -751,7 +753,7 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_domain.o utils/net_help.o \
 	   utils/net_conf.o auth/token_util.o utils/net_dom.o nsswitch/wb_client.o
 
 NET_OBJ = $(NET_OBJ1) $(PARAM_WITHOUT_REG_OBJ) $(SECRETS_OBJ) $(LIBSMB_OBJ) \
-	  $(RPC_PARSE_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
+	  $(RPC_PARSE_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(GROUPDB_OBJ) \
 	  $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(LIBADDNS_OBJ0) \
 	  $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
 	  $(LIBADS_OBJ) $(LIBADS_SERVER_OBJ) $(POPT_LIB_OBJ) \
@@ -799,7 +801,7 @@ NSSTEST_OBJ = torture/nsstest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
                  $(LIB_NONSMBD_OBJ) $(SECRETS_OBJ)
 
 PDBTEST_OBJ = torture/pdbtest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
-		$(LIB_NONSMBD_OBJ) $(SECRETS_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
+		$(LIB_NONSMBD_OBJ) $(SECRETS_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(GROUPDB_OBJ) \
 		$(SMBLDAP_OBJ) $(POPT_LIB_OBJ) $(LDB_OBJ)
 
 
@@ -814,7 +816,7 @@ LOCKTEST2_OBJ = torture/locktest2.o $(PARAM_OBJ) $(LOCKING_OBJ) $(LIBSMB_OBJ) \
 
 SMBCACLS_OBJ = utils/smbcacls.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
 		$(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(RPC_PARSE_OBJ) \
-		$(PASSDB_OBJ) $(GROUPDB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_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)
 
@@ -822,7 +824,7 @@ 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) \
-		$(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ)
+		$(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ)
 
 EVTLOGADM_OBJ0	= utils/eventlogadm.o
 
@@ -879,7 +881,7 @@ WINBIND_WINS_NSS_OBJ = nsswitch/wins.o $(PARAM_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) $(GROUPDB_OBJ) \
+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)
 
@@ -913,7 +915,7 @@ WINBINDD_OBJ1 = \
 		auth/token_util.o
 
 WINBINDD_OBJ = \
-		$(WINBINDD_OBJ1) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
+		$(WINBINDD_OBJ1) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(GROUPDB_OBJ) \
 		$(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
 		$(LIBSMB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
 		$(PROFILE_OBJ) $(SLCACHE_OBJ) $(SMBLDAP_OBJ) \
@@ -924,7 +926,7 @@ WINBINDD_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
+		$(DOSERR_OBJ) lib/winbind_util.o @LIBWBCLIENT_STATIC@
 
 WINBIND_NSS_OBJ = $(WBCOMMON_OBJ) $(LIBREPLACE_OBJ) $(SOCKET_WRAPPER_OBJ) @WINBIND_NSS_EXTRA_OBJS@
 
@@ -948,7 +950,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) \
-	  $(RPC_PARSE_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
+	  $(RPC_PARSE_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(GROUPDB_OBJ) \
 	  $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(LIBADDNS_OBJ0) \
 	  $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
 	  $(LIBADS_OBJ) $(LIBADS_SERVER_OBJ) $(POPT_LIB_OBJ) \
@@ -990,7 +992,7 @@ 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 \
 		libads/kerberos_verify.o $(SECRETS_OBJ) $(SERVER_MUTEX_OBJ) \
-		libads/authdata.o $(RPC_PARSE_OBJ1) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
+		libads/authdata.o $(RPC_PARSE_OBJ1) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(GROUPDB_OBJ) \
 		$(SMBLDAP_OBJ) $(DOSERR_OBJ) rpc_parse/parse_net.o $(LIBNMB_OBJ) \
 		$(LDB_OBJ) $(ERRORMAP_OBJ) 
 
@@ -999,7 +1001,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) \
-	  $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
+	  $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
 	  $(DISPLAY_SEC_OBJ)
 
 ######################################################################
@@ -1394,9 +1396,9 @@ bin/ldbdel: $(BINARY_PREREQS) $(LDBDEL_OBJ) @BUILD_POPT@ @LIBWBCLIENT_SHARED@
 		@POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) \
 		$(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) @WINBIND_LIBS@
 
-bin/libwbclient. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ)
+bin/libwbclient. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ) nsswitch/wb_common.o $(LIBSAMBAUTIL_OBJ)
 	@echo Linking shared library $@
-	@$(SHLD_DSO) $(LIBWBCLIENT_OBJ) \
+	@$(SHLD_DSO) $(LIBWBCLIENT_OBJ) nsswitch/wb_common.o $(LIBSAMBAUTIL_OBJ) \
 		@SONAMEFLAG@`basename $@`.$(SONAME_VER)
 	@ln -s -f `basename $@` $@.$(SONAME_VER)
 
@@ -1530,8 +1532,8 @@ bin/librpc_echo. at SHLIBEXT@: $(BINARY_PREREQS) $(RPC_ECHO_OBJ)
 bin/winbindd at EXEEXT@: $(BINARY_PREREQS) $(WINBINDD_OBJ) @BUILD_POPT@ @LIBWBCLIENT_SHARED@
 	@echo "Linking $@"
 	@$(CC) $(FLAGS) -o $@ $(WINBINDD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
-		@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) \
-		@WINBIND_LIBS@
+		@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) \
+		$(PASSDB_LIBS) @WINBIND_LIBS@
 
 bin/vlp at EXEEXT@: $(BINARY_PREREQS) $(VLP_OBJ) @LIBWBCLIENT_SHARED@
 	@echo "Linking $@"
diff --git a/source/configure.in b/source/configure.in
index d69928c..4222d93 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -322,6 +322,7 @@ AC_SUBST(LIBADDNS)
 AC_SUBST(INSTALL_LIBWBCLIENT)
 AC_SUBST(UNINSTALL_LIBWBCLIENT)
 AC_SUBST(LIBWBCLIENT_SHARED)
+AC_SUBST(LIBWBCLIENT_STATIC)
 AC_SUBST(LIBWBCLIENT)
 AC_SUBST(WINBIND_LIBS)
 
@@ -6160,7 +6161,15 @@ if test x"$HAVE_WINBIND" = x"no"; then
 	WINBIND_WINS_NSS=""
 fi
 
-if test $BLDSHARED = true -a x"$HAVE_WINBIND" = x"yes"; then
+BUILD_LIBWBCLIENT_SHARED=yes
+
+AC_ARG_ENABLE(libwbclient-shared,
+[ --enable-libwbclient-shared	Build libwbclient as shared object (default=yes, \"no\" only for --enable-developer)],
+	[if eval "test x$enable_developer = xyes -a x$enable_libwbclient_shared = xno" ; then
+		BUILD_LIBWBCLIENT_SHARED=no
+	fi])
+
+if test $BLDSHARED = true -a x"$HAVE_WINBIND" = x"yes" -a x"$BUILD_LIBWBCLIENT_SHARED" = x"yes"; then
 	NSS_MODULES="${WINBIND_NSS} ${WINBIND_WINS_NSS}"
 	## Only worry about libwbclient if we have shared library support
 	## and winbindd
@@ -6170,6 +6179,8 @@ if test $BLDSHARED = true -a x"$HAVE_WINBIND" = x"yes"; then
 	UNINSTALL_LIBWBCLIENT=uninstalllibwbclient
 	WINBIND_LIBS="-lwbclient"
 	LDFLAGS="$LDFLAGS -L./bin"
+else
+	LIBWBCLIENT_STATIC=bin/libwbclient.a
 fi
 
 if test x"$HAVE_WINBIND" = x"yes"; then
diff --git a/source/include/rpc_lsa.h b/source/include/rpc_lsa.h
index 9f90b53..22436c5 100644
--- a/source/include/rpc_lsa.h
+++ b/source/include/rpc_lsa.h
@@ -988,25 +988,6 @@ typedef struct {
 
 /*******************************************************/
 
-/* LSA_Q_OPEN_TRUSTED_DOMAIN_BY_NAME - LSA Query Open Trusted Domain by Name*/
-typedef struct lsa_q_open_trusted_domain_by_name
-{
-	POLICY_HND 	pol; 	/* policy handle */
-	LSA_STRING 	name;	/* domain name */
-	uint32 	access_mask;	/* access mask */
-	
-} LSA_Q_OPEN_TRUSTED_DOMAIN_BY_NAME;
-
-/* LSA_R_OPEN_TRUSTED_DOMAIN_BY_NAME - response to LSA Query Open Trusted Domain by Name */
-typedef struct {
-	POLICY_HND	handle;	/* trustdom policy handle */
-	NTSTATUS	status; /* return code */
-} LSA_R_OPEN_TRUSTED_DOMAIN_BY_NAME;
-
-
-/*******************************************************/
-
-
 typedef struct {
 	POLICY_HND	handle;	
 	UNISTR4		secretname;
@@ -1078,140 +1059,6 @@ typedef struct {
 	NTSTATUS	status;
 } LSA_R_SET_SECRET;
 
-/* LSA_Q_QUERY_TRUSTED_DOMAIN_INFO - LSA query trusted domain info */
-typedef struct lsa_query_trusted_domain_info
-{
-	POLICY_HND	pol; 		/* policy handle */
-	uint16		info_class; 	/* info class */
-
-} LSA_Q_QUERY_TRUSTED_DOMAIN_INFO;
-
-/* LSA_Q_QUERY_TRUSTED_DOMAIN_INFO_BY_SID - LSA query trusted domain info */
-typedef struct lsa_query_trusted_domain_info_by_sid
-{
-	POLICY_HND 	pol; 		/* policy handle */
-	DOM_SID2 	dom_sid;	/* domain sid */
-	uint16		info_class; 	/* info class */
-	
-} LSA_Q_QUERY_TRUSTED_DOMAIN_INFO_BY_SID;
-
-/* LSA_Q_QUERY_TRUSTED_DOMAIN_INFO_BY_NAME - LSA query trusted domain info */
-typedef struct lsa_query_trusted_domain_info_by_name
-{
-	POLICY_HND 	pol; 		/* policy handle */
-	LSA_STRING 	domain_name;	/* domain name */
-	uint16 		info_class; 	/* info class */
-	
-} LSA_Q_QUERY_TRUSTED_DOMAIN_INFO_BY_NAME;
-
-typedef struct trusted_domain_info_name {
-	LSA_STRING 	netbios_name; 
-} TRUSTED_DOMAIN_INFO_NAME;
-
-typedef struct trusted_domain_info_posix_offset {
-	uint32 		posix_offset;
-} TRUSTED_DOMAIN_INFO_POSIX_OFFSET;
-
-typedef struct lsa_data_buf {
-	uint32 size;
-	uint32 offset;
-	uint32 length;
-	uint8 *data;
-} LSA_DATA_BUF;
-
-typedef struct lsa_data_buf_hdr {
-	uint32 length;
-	uint32 size;
-	uint32 data_ptr;
-} LSA_DATA_BUF_HDR;
-
-
-typedef struct lsa_data_buf2 {
-	uint32 size;
-	uint8 *data;
-} LSA_DATA_BUF2;
-
-typedef struct trusted_domain_info_password {
-	uint32 ptr_password;
-	uint32 ptr_old_password;
-	LSA_DATA_BUF_HDR password_hdr;
-	LSA_DATA_BUF_HDR old_password_hdr;
-	LSA_DATA_BUF password;
-	LSA_DATA_BUF old_password;
-} TRUSTED_DOMAIN_INFO_PASSWORD;
-
-typedef struct trusted_domain_info_basic {
-	LSA_STRING 	netbios_name;
-	DOM_SID2 	sid;
-} TRUSTED_DOMAIN_INFO_BASIC;
-
-typedef struct trusted_domain_info_ex {
-	LSA_STRING 	domain_name;
-	LSA_STRING 	netbios_name;
-	DOM_SID2 	sid;
-	uint32 		trust_direction;
-	uint32 		trust_type;
-	uint32 		trust_attributes;
-} TRUSTED_DOMAIN_INFO_EX;
-
-typedef struct trust_domain_info_buffer {
-	NTTIME 		last_update_time;
-	uint32 		secret_type;
-	LSA_DATA_BUF2 	data;
-} LSA_TRUSTED_DOMAIN_INFO_BUFFER;
-
-typedef struct trusted_domain_info_auth_info {
-	uint32 incoming_count;
-	LSA_TRUSTED_DOMAIN_INFO_BUFFER incoming_current_auth_info;
-	LSA_TRUSTED_DOMAIN_INFO_BUFFER incoming_previous_auth_info;
-	uint32 outgoing_count;
-	LSA_TRUSTED_DOMAIN_INFO_BUFFER outgoing_current_auth_info;
-	LSA_TRUSTED_DOMAIN_INFO_BUFFER outgoing_previous_auth_info;
-} TRUSTED_DOMAIN_INFO_AUTH_INFO;
-


-- 
Samba Shared Repository


More information about the samba-cvs mailing list