[SCM] Samba Shared Repository - branch v3-2-stable updated -
initial-v3-2-test-1371-g061c90f
Gerald (Jerry) Carter
jerry at samba.org
Tue Jan 15 13:59:53 GMT 2008
The branch, v3-2-stable has been updated
via 061c90fefef0e6093dfc3912d381cc306549ed4b (commit)
via 5adf38606b4c6918412a3da76e6fb3298ac585af (commit)
via a5fb8b443a7c4ebf68ed005990683718c1092747 (commit)
via ed559b4a59e826851cb9894f0e519eaedb523f9d (commit)
via e37859164c35e8d908f3dfcc99226ee6773ba0a8 (commit)
via 4f05b50d4c626f2c404bb4bfefb65998125b612f (commit)
via 40aeb431604bd26fc543410de24593726ca0a01f (commit)
via f21871c6d60e02ed53f060abbbfb2ef656cdc311 (commit)
via 1a5b72daa36073cc0604211248d869bf0d7546c6 (commit)
via 99e3e4b0dd0b0755189c1c740f2975bc75a0e28d (commit)
via b66ac8567c16f2c35fceceba2f858d5503620309 (commit)
via 2036b4c5ad677b8a477b34b0f076febab0abff5e (commit)
via e6bd1395f2c1da7bcf1a31cdb297919ed6a15469 (commit)
via 7cb81bfc6bcdd56a8886e18aa9a7e05ec963d33d (commit)
via 7dd65599a15bf1d164fcfa554c8057d43c51eb6d (commit)
via 9f05d2eae7c55d39ad61da54c4a38d6b6f8d4d3a (commit)
via ef9b278b6289a9ecdd6b103927058f64fbb7eb97 (commit)
via bb36b74a4e8fa63672031145b6d39d79468241d9 (commit)
via a861ff20917eeca303e2d36de71cd8614e937d5f (commit)
via 3f081ebeadf30a7943723703ecae479e0412c60c (commit)
via 558ce4ec3eaa93c827316d92c346f35c140fadf0 (commit)
via 44d67e84625a2a1a93baecef0e418b48e982443b (commit)
via 94693755a291993217b5cb74794504a8593eae30 (commit)
via 8b63a1665795d2739b54144212926113d9be7f09 (commit)
via be8071779fa14d964e86810f5fb16bc52aea4e36 (commit)
via 33f6eff92b6bdf804d54c84375cece8a867933f2 (commit)
via b37b2b77edec72fc3f53b3461aa1c210e4366c1b (commit)
via add28753b2e740804c48db5f6235cb2f8908d82b (commit)
via dceb9a4c80fb241e12fafc6229aa8e81f5d2df1a (commit)
from 6811ea1ce2d46f7303b4edf661e27d2edf54724f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable
- Log -----------------------------------------------------------------
commit 061c90fefef0e6093dfc3912d381cc306549ed4b
Merge: 5adf38606b4c6918412a3da76e6fb3298ac585af a5fb8b443a7c4ebf68ed005990683718c1092747
Author: Gerald (Jerry) Carter <jerry at samba.org>
Date: Tue Jan 15 07:59:23 2008 -0600
Merge commit 'samba/v3-2-test' into v3-2-stable
commit 5adf38606b4c6918412a3da76e6fb3298ac585af
Author: Gerald (Jerry) Carter <jerry at samba.org>
Date: Tue Jan 15 07:59:18 2008 -0600
Add First draf of release notes.
commit bb36b74a4e8fa63672031145b6d39d79468241d9
Merge: 6811ea1ce2d46f7303b4edf661e27d2edf54724f a861ff20917eeca303e2d36de71cd8614e937d5f
Author: Gerald (Jerry) Carter <jerry at samba.org>
Date: Mon Jan 14 15:10:14 2008 -0600
Merge commit 'samba/v3-2-test' into v3-2-stable
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 136 +++++-
source/Makefile.in | 26 +-
source/configure.in | 8 +-
source/include/reg_objects.h | 4 +
source/include/rpc_lsa.h | 16 -
source/lib/winbind_util.c | 2 +-
source/libads/kerberos.c | 3 +-
source/libnet/libnet_join.c | 134 +++++--
source/librpc/gen_ndr/cli_lsa.c | 20 +-
source/librpc/gen_ndr/cli_lsa.h | 14 +-
source/librpc/gen_ndr/lsa.h | 20 +-
source/librpc/gen_ndr/ndr_lsa.c | 123 +++++-
source/librpc/gen_ndr/ndr_lsa.h | 1 +
source/librpc/gen_ndr/ndr_xattr.c | 102 +++++
source/librpc/gen_ndr/ndr_xattr.h | 16 +
source/librpc/gen_ndr/xattr.h | 18 +
source/librpc/idl/lsa.idl | 18 +-
source/librpc/idl/xattr.idl | 23 +
source/libsmb/clireadwrite.c | 9 +-
source/modules/vfs_ea_tdb.c | 736 ++++++++++++++++++++++++++++++++
source/nsswitch/libwbclient/wbc_err.h | 51 ---
source/nsswitch/libwbclient/wbclient.h | 27 ++-
source/nsswitch/winbind_nss_config.h | 8 +
source/pkgconfig/wbclient.pc.in | 13 +
source/registry/reg_api.c | 8 +-
source/registry/reg_db.c | 29 ++-
source/registry/reg_frontend_hilvl.c | 29 ++
source/registry/reg_printing.c | 2 +-
source/registry/reg_shares.c | 2 +-
source/registry/reg_smbconf.c | 4 +-
source/rpc_client/cli_lsarpc.c | 35 --
source/rpc_parse/parse_lsa.c | 58 ---
source/script/fix_bool.pl | 19 +
source/script/tests/selftest.sh | 1 +
source/script/tests/test_posix_s3.sh | 2 +-
source/utils/net_ads.c | 11 +-
source/utils/net_dns.c | 3 +-
source/utils/net_rpc_audit.c | 182 ++++----
38 files changed, 1560 insertions(+), 353 deletions(-)
create mode 100644 source/librpc/gen_ndr/ndr_xattr.c
create mode 100644 source/librpc/gen_ndr/ndr_xattr.h
create mode 100644 source/librpc/gen_ndr/xattr.h
create mode 100644 source/librpc/idl/xattr.idl
create mode 100644 source/modules/vfs_ea_tdb.c
delete mode 100644 source/nsswitch/libwbclient/wbc_err.h
create mode 100644 source/pkgconfig/wbclient.pc.in
create mode 100755 source/script/fix_bool.pl
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index de8df4b..53a1c84 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,6 +1,6 @@
=================================
Release Notes for Samba 3.2.0pre2
- Oct XX, 2007
+ Jan 16, 2008
=================================
This is the second preview release of Samba 3.2.0. This is *not*
@@ -22,6 +22,7 @@ Major enhancements in Samba 3.2.0 include:
o Introduction of a registry based configuration system.
o Improved CIFS Unix Extensions support.
o Experimental support for file serving clusters.
+ o Support for IPv6 connections.
Winbind and Active Directory Integration:
@@ -32,6 +33,7 @@ Major enhancements in Samba 3.2.0 include:
o Support in pam_winbind for logging on using the userPrincipalName.
o Expansion of nested domain groups via NSS calls.
o Support for Active Directory LDAP Signing policy.
+ o New LGPL Winbind client library (libwbclient.so)
Users & Groups:
@@ -40,7 +42,7 @@ Major enhancements in Samba 3.2.0 include:
Documentation:
- o Inclusion of an HTLM version of the 3rd edition of "Using Samba"
+ o Inclusion of an HTML version of the 3rd edition of "Using Samba"
from O'Reilly Publishing.
@@ -50,12 +52,12 @@ Now Licensed under the GNU GPLv3
The Samba Team has adopted the Version 3 of the GNU General Public
License for the 3.2 and later releases. The GPLv3 is the updated
version of the GPLv2 license under which Samba is currently
-distributed. It has been updated to improvecompatibility with other
-licenses and to make it easier to adopt internationally, and is an
+distributed. It has been updated to improve compatibility with other
+licenses and to make it easier to adopt internationally, and is an
improved version of the license to better suit the needs of Free
Software in the 21st Century.
-The original announcement is available on-line at
+The original announcement is available on-line at
http://news.samba.org/announcements/samba_gplv3/
@@ -63,12 +65,12 @@ The original announcement is available on-line at
New Security Defaults for Authentication
========================================
-Support for LanMan passwords is now disabled in both client and server
-applications. Additionally, clear text authentication requests are
+Support for LanMan passwords is now disabled in both client and server
+applications. Additionally, clear text authentication requests are
disabled by default in client utilities such as smbclient and all
-libsmbclient based applications. This will affect connection both
-to and from hosts running DOS, Windows 9x/ME, and OS/2. Please refer
-to the "Changes" section for details on the exact parameters that were
+libsmbclient based applications. This will affect connection both
+to and from hosts running DOS, Windows 9x/ME, and OS/2. Please refer
+to the "Changes" section for details on the exact parameters that were
updated.
@@ -78,10 +80,10 @@ Registry Configuration Backend
Samba is now able to use a registry based configuration backed to
supplement smb.conf setting. This feature may be enabled by setting
-"include = registry" and "registry shares = yes" in the [global]
-section of smb.conf and may be managed using the "net conf" command.
+"include = registry" and "registry shares = yes" in the [global]
+section of smb.conf and may be managed using the "net conf" command.
-More information may be obtained from the smb.conf(5) and net(8) man
+More information may be obtained from the smb.conf(5) and net(8) man
pages.
@@ -110,7 +112,8 @@ smb.conf changes
ctdb socket New ""
lanman auth Changed Default No
mangle map Removed
- open files database hashsize Removed
+ min receive file size New 0
+ open files database hash size Removed
read bmpx Removed
registry shares New No
winbind expand groups New 1
@@ -120,6 +123,97 @@ smb.conf changes
Changes since 3.2.0pre1:
-----------------------
+o Michael Adam <obnox at samba.org>
+ * Add vfs_zfsacl plugin.
+ * Refactor and consolidate logic for retrieving the machine
+ trust password information.
+ * BUG 4801: Correctly implement LSA lookup levels for LookupNames.
+
+
+o Jeremy Allison <jra at samba.org>
+ * Added support for IPv6 client and server connections.
+ * Add in the recvfile entry to the VFS layer.
+ * Removal of pstring data type.
+ * Remove unused utilities: smbctool and rpctorture.
+ * Fix service principal detection to match Windows Vista
+ (based on work from Andreas Schneider).
+ * Additional work on the session data privacy for clients
+ implementing the Unix CIFS Extensions.
+
+
+o Gerald (Jerry) Carter <jerry at samba.org>
+ * Add Winbind client library.
+ * Decouple static linking between smbd and winbindd's client
+ interface.
+
+
+o Guenther Deschner <gd at samba.org>
+ * Enhance client and server remote registry access.
+ * Add client calls for remotely joining a computer to a domain
+ (including calls from "net dom" command).
+ * Add libnetapi.so library for joining domains including
+ sample GTK+ app.
+
+
+o Steve Langasek <vorlon at debian.org>
+ * Integrate 2 out of 3 --with-fhs patches from Debian packaging
+ for better adherence to the FHS standard.
+
+
+o Volker Lendecke <vl at samba.org>
+ * Add talloc_stackframe() and talloc_pool() features.
+ * Removal of pstring data type.
+ * Add generic a in-memory cache.
+ * Import the Linux red-black tree implementation.
+ * Remove large amount of global variables.
+ * Add vfs_ea_tdb module for file systems that do not implement xattrs.
+
+
+o Stefan Metzmacher <metze at samba.org>
+ * Refactor Winbind internal parent-child interface tables
+ to achieve better unit testing support.
+ * Add nss_wrapper API for local Winbind unit tests.
+ * Networking fixes to the libreplace library.
+ * Pidl fixes.
+ * Remove unused Winbind pipe calls.
+
+
+o James Peach <jpeach at samba.org>
+ * Add support for DNS Service Discovery. Based on work from
+ Rishi Srivatsavai <rishisv at gmail.com>.
+
+
+o Andreas Schneider <anschneider at suse.de>
+ * Don't restart winbind if a corrupted tdb is found during
+ initialization.
+
+
+o Karolin Seeger <ks at sernet.de>
+ * Add net rap file user.
+
+
+o David Shaw <dshaw at jabberwocky.com>
+ * BUG 5073: Allow "delete readonly = yes" to correctly override
+ deletion of a file.
+
+
+o Rishi Srivatsavai <rishisv at gmail.com>
+ * Register the smb service with mDNS if mDNS is supported.
+ * Add smbclient support for basic mDNS browsing.
+
+
+o Andrew Tridgell <tridge at samba.org>
+ * Fix padding between Winbind 32bit/64bit client library in
+ the request/response structures.
+ * Added a syncops VFS module for file systems which do not
+ guarantee meta-data operations are immediately committed to
+ disk in stable form.
+
+
+o Jelmer Vernooij <jelmer at samba.org>
+ * Additional portability support for building shared libraries.
+
+
Original 3.2.0pre1 commits:
---------------------------
@@ -134,16 +228,16 @@ o Michael Adam <obnox at samba.org>
* Merged \winreg server code from the SAMBA_3_2 development branch.
* Fixes for libreplace.
* Implement new registry configuration backend.
-
+
o Jeremy Allison <jra at samba.org>
* Add support for file system objectIDs.
* Winbind cache validation support.
* Add in the UNIX capability for 24-bit readX.
* Improve Delete-on-Close semantics.
- * Removal of static file and path name buffers in SMB file serving
+ * Removal of static file and path name buffers in SMB file serving
code.
-
+
o Danilo Almeida <dalmeida at centeris.com>
* Move the machine account to the OU specified when running "net
@@ -151,7 +245,7 @@ o Danilo Almeida <dalmeida at centeris.com>
o Andrew Bartlett <abartlet at samba.org>
- * Tighten authentication protocol defaults in client tools and
+ * Tighten authentication protocol defaults in client tools and
servers.
@@ -165,7 +259,7 @@ o Gerald (Jerry) Carter <jerry at samba.org>
* Fix lockups in Winbind when running nscd.
* UPN logon support in pam_winbind.
* Add support for GNU linker scripts when build shared libraries
- (based on work by Julien Cristau <jcristau at debian.org> and James
+ (based on work by Julien Cristau <jcristau at debian.org> and James
Peach).
@@ -182,7 +276,7 @@ o Guenther Deschner <gd at samba.org>
o Steve Langasek <vorlon at debian.org>
* Allow SIGTERM to cause nmbd to exit while awaiting a interface
- to come up.
+ to come up.
o Volker Lendecke <vl at samba.org>
@@ -192,7 +286,7 @@ o Volker Lendecke <vl at samba.org>
* Add client support for the SamLogonEx() authentication request.
* Implement RPC proxy stubs in the Samba server code to allow
replacing implementation functions one by one.
- * Remove static incoming and outgoing buffers from core server SMB
+ * Remove static incoming and outgoing buffers from core server SMB
packet processing code.
* Add "net sam rights" command.
diff --git a/source/Makefile.in b/source/Makefile.in
index c34f328..4260145 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -340,13 +340,13 @@ 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/libwbclient/wbclient.o \
+LIBWBCLIENT_OBJ0 = nsswitch/libwbclient/wbclient.o \
nsswitch/libwbclient/wbc_util.o \
nsswitch/libwbclient/wbc_pwd.o \
nsswitch/libwbclient/wbc_idmap.o \
nsswitch/libwbclient/wbc_sid.o \
nsswitch/libwbclient/wbc_pam.o
-
+LIBWBCLIENT_OBJ = $(LIBWBCLIENT_OBJ0) $(WBCOMMON_OBJ) $(TALLOC_OBJ) $(LIBREPLACE_OBJ)
LIBGPO_OBJ0 = libgpo/gpo_ldap.o libgpo/gpo_ini.o libgpo/gpo_util.o \
libgpo/gpo_fetch.o libgpo/gpo_filesync.o libgpo/gpo_sec.o
@@ -503,6 +503,7 @@ VFS_CAP_OBJ = modules/vfs_cap.o
VFS_EXPAND_MSDFS_OBJ = modules/vfs_expand_msdfs.o
VFS_SHADOW_COPY_OBJ = modules/vfs_shadow_copy.o
VFS_AFSACL_OBJ = modules/vfs_afsacl.o
+VFS_EA_TDB_OBJ = modules/vfs_ea_tdb.o librpc/gen_ndr/ndr_xattr.o
VFS_POSIXACL_OBJ = modules/vfs_posixacl.o
VFS_AIXACL_OBJ = modules/vfs_aixacl.o modules/vfs_aixacl_util.o
VFS_AIXACL2_OBJ = modules/vfs_aixacl2.o modules/vfs_aixacl_util.o modules/nfs4_acls.o
@@ -671,7 +672,7 @@ RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \
$(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(LDB_OBJ)
PAM_WINBIND_OBJ = nsswitch/pam_winbind.o $(WBCOMMON_OBJ) \
- $(LIBREPLACE_OBJ) $(SOCKET_WRAPPER_OBJ) @BUILD_INIPARSER@
+ $(LIBREPLACE_OBJ) @BUILD_INIPARSER@
LIBSMBCLIENT_OBJ = libsmb/libsmbclient.o libsmb/libsmb_compat.o \
libsmb/libsmb_cache.o \
@@ -928,7 +929,7 @@ 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 @LIBWBCLIENT_STATIC@
-WINBIND_NSS_OBJ = $(WBCOMMON_OBJ) $(LIBREPLACE_OBJ) $(SOCKET_WRAPPER_OBJ) @WINBIND_NSS_EXTRA_OBJS@
+WINBIND_NSS_OBJ = $(WBCOMMON_OBJ) $(LIBREPLACE_OBJ) @WINBIND_NSS_EXTRA_OBJS@
LDB_COMMON_OBJ=lib/ldb/common/ldb.o lib/ldb/common/ldb_ldif.o \
lib/ldb/common/ldb_parse.o lib/ldb/common/ldb_msg.o lib/ldb/common/ldb_utf8.o \
@@ -966,7 +967,7 @@ LDBDEL_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbdel.o
LDBMODIFY_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbmodify.o
WINBIND_KRB5_LOCATOR_OBJ1 = nsswitch/winbind_krb5_locator.o
-WINBIND_KRB5_LOCATOR_OBJ = $(WINBIND_KRB5_LOCATOR_OBJ1) $(WBCOMMON_OBJ) $(LIBREPLACE_OBJ) $(SOCKET_WRAPPER_OBJ)
+WINBIND_KRB5_LOCATOR_OBJ = $(WINBIND_KRB5_LOCATOR_OBJ1) $(WBCOMMON_OBJ) $(LIBREPLACE_OBJ)
POPT_OBJ=popt/findme.o popt/popt.o popt/poptconfig.o \
popt/popthelp.o popt/poptparse.o
@@ -1060,7 +1061,7 @@ modules: SHOWFLAGS $(MODULES)
## Perl IDL Compiler
IDL_FILES = unixinfo.idl lsa.idl dfs.idl echo.idl winreg.idl initshutdown.idl \
srvsvc.idl svcctl.idl eventlog.idl wkssvc.idl netlogon.idl notify.idl \
- epmapper.idl messaging.idl
+ epmapper.idl messaging.idl xattr.idl
idl:
@IDL_FILES="$(IDL_FILES)" CPP="$(CPP)" PERL="$(PERL)" \
@@ -1396,9 +1397,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) nsswitch/wb_common.o $(LIBSAMBAUTIL_OBJ)
+bin/libwbclient. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ)
@echo Linking shared library $@
- @$(SHLD_DSO) $(LIBWBCLIENT_OBJ) nsswitch/wb_common.o $(LIBSAMBAUTIL_OBJ) \
+ @$(SHLD_DSO) $(LIBWBCLIENT_OBJ) \
@SONAMEFLAG@`basename $@`.$(SONAME_VER)
@ln -s -f `basename $@` $@.$(SONAME_VER)
@@ -1684,6 +1685,10 @@ bin/afsacl. at SHLIBEXT@: $(BINARY_PREREQS) $(VFS_AFSACL_OBJ)
@echo "Building plugin $@"
@$(SHLD_MODULE) $(VFS_AFSACL_OBJ)
+bin/ea_tdb. at SHLIBEXT@: $(BINARY_PREREQS) $(VFS_EA_TDB_OBJ)
+ @echo "Building plugin $@"
+ @$(SHLD_MODULE) $(VFS_EA_TDB_OBJ)
+
bin/posixacl. at SHLIBEXT@: $(BINARY_PREREQS) $(VFS_POSIXACL_OBJ)
@echo "Building plugin $@"
@$(SHLD_MODULE) $(VFS_POSIXACL_OBJ)
@@ -1884,9 +1889,10 @@ installlibaddns: installdirs libaddns
-$(INSTALLLIBCMD_A) bin/libaddns.a $(DESTDIR)$(LIBDIR)
installlibwbclient: installdirs libwbclient
- @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR) $(INCLUDEDIR)/samba
+ @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-$(INSTALLLIBCMD_SH) bin/libwbclient. at SHLIBEXT@ $(DESTDIR)$(LIBDIR)
- -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/nsswitch/libwbclient/wbclient.h $(DESTDIR)${prefix}/include/samba
+ @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
+ -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/nsswitch/libwbclient/wbclient.h $(DESTDIR)${prefix}/include
installlibnetapi: installdirs libnetapi
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
diff --git a/source/configure.in b/source/configure.in
index 4222d93..4ddc644 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -707,7 +707,7 @@ dnl These have to be built static:
default_static_modules="pdb_smbpasswd pdb_tdbsam rpc_lsa rpc_samr rpc_winreg rpc_initshutdown rpc_lsa_ds rpc_wkssvc rpc_svcctl2 rpc_ntsvcs rpc_net rpc_netdfs rpc_srvsvc2 rpc_spoolss rpc_eventlog2 auth_sam auth_unix auth_winbind auth_server auth_domain auth_builtin vfs_default nss_info_template"
dnl These are preferably build shared, and static if dlopen() is not available
-default_shared_modules="vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy charset_CP850 charset_CP437 auth_script vfs_readahead vfs_syncops"
+default_shared_modules="vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy charset_CP850 charset_CP437 auth_script vfs_readahead vfs_syncops vfs_ea_tdb"
if test "x$developer" = xyes; then
default_static_modules="$default_static_modules rpc_rpcecho"
@@ -6489,6 +6489,7 @@ SMB_MODULE(vfs_cap, \$(VFS_CAP_OBJ), "bin/cap.$SHLIBEXT", VFS)
SMB_MODULE(vfs_expand_msdfs, \$(VFS_EXPAND_MSDFS_OBJ), "bin/expand_msdfs.$SHLIBEXT", VFS)
SMB_MODULE(vfs_shadow_copy, \$(VFS_SHADOW_COPY_OBJ), "bin/shadow_copy.$SHLIBEXT", VFS)
SMB_MODULE(vfs_afsacl, \$(VFS_AFSACL_OBJ), "bin/afsacl.$SHLIBEXT", VFS)
+SMB_MODULE(vfs_ea_tdb, \$(VFS_EA_TDB_OBJ), "bin/ea_tdb.$SHLIBEXT", VFS)
SMB_MODULE(vfs_posixacl, \$(VFS_POSIXACL_OBJ), "bin/posixacl.$SHLIBEXT", VFS)
SMB_MODULE(vfs_aixacl, \$(VFS_AIXACL_OBJ), "bin/aixacl.$SHLIBEXT", VFS)
SMB_MODULE(vfs_aixacl2, \$(VFS_AIXACL2_OBJ), "bin/aixacl2.$SHLIBEXT", VFS)
@@ -6656,7 +6657,10 @@ AC_SUBST(SMBD_LIBS)
AC_OUTPUT(Makefile library-versions
script/findsmb smbadduser script/gen-8bit-gap.sh script/installbin.sh script/uninstallbin.sh
lib/netapi/examples/Makefile
- pkgconfig/smbclient.pc pkgconfig/netapi.pc pkgconfig/smbsharemodes.pc
+ pkgconfig/smbclient.pc
+ pkgconfig/wbclient.pc
+ pkgconfig/netapi.pc
+ pkgconfig/smbsharemodes.pc
)
#################################################
diff --git a/source/include/reg_objects.h b/source/include/reg_objects.h
index f6cf9cc..23a14e6 100644
--- a/source/include/reg_objects.h
+++ b/source/include/reg_objects.h
@@ -61,6 +61,7 @@ struct registry_value {
typedef struct {
uint32 num_values;
REGISTRY_VALUE **values;
+ int seqnum;
} REGVAL_CTR;
/* container for registry subkey names */
@@ -68,6 +69,7 @@ typedef struct {
typedef struct {
uint32 num_subkeys;
char **subkeys;
+ int seqnum;
} REGSUBKEY_CTR;
/*
@@ -128,6 +130,8 @@ typedef struct {
struct security_descriptor **psecdesc);
WERROR (*set_secdesc)(const char *key,
struct security_descriptor *sec_desc);
+ bool (*subkeys_need_update)(REGSUBKEY_CTR *subkeys);
+ bool (*values_need_update)(REGVAL_CTR *values);
} REGISTRY_OPS;
typedef struct {
diff --git a/source/include/rpc_lsa.h b/source/include/rpc_lsa.h
index 22436c5..ef6ff6d 100644
--- a/source/include/rpc_lsa.h
+++ b/source/include/rpc_lsa.h
@@ -334,22 +334,6 @@ typedef struct lsa_info_ctr
typedef LSA_INFO_CTR LSA_INFO_CTR2;
-/* LSA_Q_SET_INFO - LSA set info policy */
-typedef struct lsa_set_info
-{
- POLICY_HND pol; /* policy handle */
- uint16 info_class; /* info class */
- LSA_INFO_CTR ctr;
-
-} LSA_Q_SET_INFO;
-
-/* LSA_R_SET_INFO - response to LSA set info policy */
-typedef struct lsa_r_set_info
-{
- NTSTATUS status; /* return code */
-
-} LSA_R_SET_INFO;
-
/* LSA_R_QUERY_INFO - response to LSA query info policy */
typedef struct lsa_r_query_info
{
diff --git a/source/lib/winbind_util.c b/source/lib/winbind_util.c
index 3cf068a..14356b0 100644
--- a/source/lib/winbind_util.c
+++ b/source/lib/winbind_util.c
@@ -201,7 +201,7 @@ bool winbind_lookup_rids(TALLOC_CTX *mem_ctx,
*types = TALLOC_ARRAY(mem_ctx, enum lsa_SidType, num_rids);
for(i=0; i<num_rids; i++) {
- (*names)[i] = talloc_strdup(names, namelist[i]);
+ (*names)[i] = talloc_strdup(*names, namelist[i]);
(*types)[i] = (enum lsa_SidType)name_types[i];
}
diff --git a/source/libads/kerberos.c b/source/libads/kerberos.c
index 4fc2395..e9222e8 100644
--- a/source/libads/kerberos.c
+++ b/source/libads/kerberos.c
@@ -209,7 +209,8 @@ int kerberos_kinit_password_ext(const char *principal,
krb5_set_real_time(ctx, time(NULL) + time_offset, 0);
}
- DEBUG(10,("kerberos_kinit_password: using [%s] as ccache and config [%s]\n",
+ DEBUG(10,("kerberos_kinit_password: as %s using [%s] as ccache and config [%s]\n",
+ principal,
cache_name ? cache_name: krb5_cc_default_name(ctx),
getenv("KRB5_CONFIG")));
diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c
index eaf851c..c60f4c9 100644
--- a/source/libnet/libnet_join.c
+++ b/source/libnet/libnet_join.c
@@ -107,10 +107,6 @@ static ADS_STATUS libnet_join_connect_ads(TALLOC_CTX *mem_ctx,
{
ADS_STATUS status;
- if (r->in.ads) {
- ads_destroy(&r->in.ads);
- }
-
status = libnet_connect_ads(r->in.domain_name,
r->in.domain_name,
r->in.dc_name,
@@ -134,10 +130,6 @@ static ADS_STATUS libnet_unjoin_connect_ads(TALLOC_CTX *mem_ctx,
{
ADS_STATUS status;
- if (r->in.ads) {
- ads_destroy(&r->in.ads);
- }
-
status = libnet_connect_ads(r->in.domain_name,
r->in.domain_name,
r->in.dc_name,
@@ -1013,6 +1005,58 @@ static WERROR do_UnjoinConfig(struct libnet_UnjoinCtx *r)
/****************************************************************
****************************************************************/
+static WERROR libnet_join_pre_processing(TALLOC_CTX *mem_ctx,
+ struct libnet_JoinCtx *r)
+{
+
+ if (!r->in.domain_name) {
--
Samba Shared Repository
More information about the samba-cvs
mailing list