svn commit: samba r19810 - in branches/SAMBA_3_0_24/source: . auth client include lib libmsrpc libsmb locking modules nmbd nsswitch param passdb printing python rpc_server smbd torture utils web

jerry at samba.org jerry at samba.org
Tue Nov 21 01:11:13 GMT 2006


Author: jerry
Date: 2006-11-21 01:11:05 +0000 (Tue, 21 Nov 2006)
New Revision: 19810

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19810

Log:
more merge work....does not compile currently.  Working on smbd merge
Added:
   branches/SAMBA_3_0_24/source/include/locking.h
   branches/SAMBA_3_0_24/source/modules/vfs_cacheprime.c
   branches/SAMBA_3_0_24/source/modules/vfs_commit.c
   branches/SAMBA_3_0_24/source/modules/vfs_default.c
   branches/SAMBA_3_0_24/source/modules/vfs_prealloc.c
   branches/SAMBA_3_0_24/source/printing/print_test.c
Removed:
   branches/SAMBA_3_0_24/source/smbd/vfs-wrap.c
Modified:
   branches/SAMBA_3_0_24/source/Makefile.in
   branches/SAMBA_3_0_24/source/auth/auth_server.c
   branches/SAMBA_3_0_24/source/auth/auth_util.c
   branches/SAMBA_3_0_24/source/client/client.c
   branches/SAMBA_3_0_24/source/client/smbctool.c
   branches/SAMBA_3_0_24/source/client/smbmount.c
   branches/SAMBA_3_0_24/source/client/smbspool.c
   branches/SAMBA_3_0_24/source/include/includes.h
   branches/SAMBA_3_0_24/source/include/libsmb_internal.h
   branches/SAMBA_3_0_24/source/include/nt_status.h
   branches/SAMBA_3_0_24/source/include/nterr.h
   branches/SAMBA_3_0_24/source/include/printing.h
   branches/SAMBA_3_0_24/source/include/reg_objects.h
   branches/SAMBA_3_0_24/source/include/rpc_misc.h
   branches/SAMBA_3_0_24/source/include/smb.h
   branches/SAMBA_3_0_24/source/include/smb_macros.h
   branches/SAMBA_3_0_24/source/include/vfs.h
   branches/SAMBA_3_0_24/source/include/vfs_macros.h
   branches/SAMBA_3_0_24/source/lib/afs.c
   branches/SAMBA_3_0_24/source/lib/data_blob.c
   branches/SAMBA_3_0_24/source/lib/sharesec.c
   branches/SAMBA_3_0_24/source/lib/substitute.c
   branches/SAMBA_3_0_24/source/lib/util.c
   branches/SAMBA_3_0_24/source/lib/util_str.c
   branches/SAMBA_3_0_24/source/libmsrpc/cac_lsarpc.c
   branches/SAMBA_3_0_24/source/libmsrpc/cac_samr.c
   branches/SAMBA_3_0_24/source/libmsrpc/cac_svcctl.c
   branches/SAMBA_3_0_24/source/libmsrpc/libmsrpc_internal.c
   branches/SAMBA_3_0_24/source/libsmb/cliconnect.c
   branches/SAMBA_3_0_24/source/libsmb/clidfs.c
   branches/SAMBA_3_0_24/source/libsmb/clientgen.c
   branches/SAMBA_3_0_24/source/libsmb/clikrb5.c
   branches/SAMBA_3_0_24/source/libsmb/clirap.c
   branches/SAMBA_3_0_24/source/libsmb/libsmb_cache.c
   branches/SAMBA_3_0_24/source/libsmb/libsmbclient.c
   branches/SAMBA_3_0_24/source/libsmb/passchange.c
   branches/SAMBA_3_0_24/source/locking/brlock.c
   branches/SAMBA_3_0_24/source/locking/locking.c
   branches/SAMBA_3_0_24/source/locking/posix.c
   branches/SAMBA_3_0_24/source/modules/vfs_audit.c
   branches/SAMBA_3_0_24/source/modules/vfs_cap.c
   branches/SAMBA_3_0_24/source/modules/vfs_catia.c
   branches/SAMBA_3_0_24/source/modules/vfs_default_quota.c
   branches/SAMBA_3_0_24/source/modules/vfs_expand_msdfs.c
   branches/SAMBA_3_0_24/source/modules/vfs_extd_audit.c
   branches/SAMBA_3_0_24/source/modules/vfs_fake_perms.c
   branches/SAMBA_3_0_24/source/modules/vfs_full_audit.c
   branches/SAMBA_3_0_24/source/modules/vfs_netatalk.c
   branches/SAMBA_3_0_24/source/modules/vfs_readonly.c
   branches/SAMBA_3_0_24/source/modules/vfs_recycle.c
   branches/SAMBA_3_0_24/source/modules/vfs_shadow_copy.c
   branches/SAMBA_3_0_24/source/nmbd/nmbd_synclists.c
   branches/SAMBA_3_0_24/source/nsswitch/winbindd_cm.c
   branches/SAMBA_3_0_24/source/param/loadparm.c
   branches/SAMBA_3_0_24/source/passdb/passdb.c
   branches/SAMBA_3_0_24/source/passdb/pdb_ldap.c
   branches/SAMBA_3_0_24/source/passdb/pdb_tdb.c
   branches/SAMBA_3_0_24/source/printing/nt_printing.c
   branches/SAMBA_3_0_24/source/printing/print_generic.c
   branches/SAMBA_3_0_24/source/printing/printfsp.c
   branches/SAMBA_3_0_24/source/printing/printing.c
   branches/SAMBA_3_0_24/source/python/py_smb.c
   branches/SAMBA_3_0_24/source/rpc_server/srv_srvsvc_nt.c
   branches/SAMBA_3_0_24/source/smbd/blocking.c
   branches/SAMBA_3_0_24/source/smbd/close.c
   branches/SAMBA_3_0_24/source/smbd/conn.c
   branches/SAMBA_3_0_24/source/smbd/dir.c
   branches/SAMBA_3_0_24/source/smbd/dosmode.c
   branches/SAMBA_3_0_24/source/smbd/error.c
   branches/SAMBA_3_0_24/source/smbd/fake_file.c
   branches/SAMBA_3_0_24/source/smbd/fileio.c
   branches/SAMBA_3_0_24/source/smbd/files.c
   branches/SAMBA_3_0_24/source/smbd/lanman.c
   branches/SAMBA_3_0_24/source/smbd/message.c
   branches/SAMBA_3_0_24/source/smbd/msdfs.c
   branches/SAMBA_3_0_24/source/smbd/negprot.c
   branches/SAMBA_3_0_24/source/smbd/ntquotas.c
   branches/SAMBA_3_0_24/source/smbd/nttrans.c
   branches/SAMBA_3_0_24/source/smbd/open.c
   branches/SAMBA_3_0_24/source/smbd/oplock_linux.c
   branches/SAMBA_3_0_24/source/smbd/password.c
   branches/SAMBA_3_0_24/source/smbd/pipes.c
   branches/SAMBA_3_0_24/source/smbd/posix_acls.c
   branches/SAMBA_3_0_24/source/smbd/process.c
   branches/SAMBA_3_0_24/source/smbd/reply.c
   branches/SAMBA_3_0_24/source/smbd/server.c
   branches/SAMBA_3_0_24/source/smbd/service.c
   branches/SAMBA_3_0_24/source/smbd/share_access.c
   branches/SAMBA_3_0_24/source/smbd/trans2.c
   branches/SAMBA_3_0_24/source/smbd/uid.c
   branches/SAMBA_3_0_24/source/smbd/vfs.c
   branches/SAMBA_3_0_24/source/torture/cmd_vfs.c
   branches/SAMBA_3_0_24/source/torture/denytest.c
   branches/SAMBA_3_0_24/source/torture/locktest.c
   branches/SAMBA_3_0_24/source/torture/locktest2.c
   branches/SAMBA_3_0_24/source/torture/mangle_test.c
   branches/SAMBA_3_0_24/source/torture/masktest.c
   branches/SAMBA_3_0_24/source/torture/nbio.c
   branches/SAMBA_3_0_24/source/torture/nsstest.c
   branches/SAMBA_3_0_24/source/torture/rpctorture.c
   branches/SAMBA_3_0_24/source/torture/scanner.c
   branches/SAMBA_3_0_24/source/torture/torture.c
   branches/SAMBA_3_0_24/source/torture/utable.c
   branches/SAMBA_3_0_24/source/torture/vfstest.c
   branches/SAMBA_3_0_24/source/utils/net_sam.c
   branches/SAMBA_3_0_24/source/utils/net_time.c
   branches/SAMBA_3_0_24/source/utils/status.c
   branches/SAMBA_3_0_24/source/web/diagnose.c
   branches/SAMBA_3_0_24/source/web/neg_lang.c
   branches/SAMBA_3_0_24/source/web/statuspage.c


Changeset:
Sorry, the patch is too large (28564 lines) to include; please use WebSVN to see it!
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19810


More information about the samba-cvs mailing list