Author: vlendec Date: 2006-07-17 16:58:39 +0000 (Mon, 17 Jul 2006) New Revision: 17093
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17093 Log: Merge 3_0 to vl-messaging up to r17090. This a manual merge, too much has changed in the transition from trunk to 3_0. I want it in now, don't kill me if something breaks. I'll fix that later today :-) Volker Modified: branches/tmp/vl-messaging/source/Makefile.in branches/tmp/vl-messaging/source/VERSION branches/tmp/vl-messaging/source/auth/auth_util.c branches/tmp/vl-messaging/source/client/client.c branches/tmp/vl-messaging/source/configure.in branches/tmp/vl-messaging/source/include/locking.h branches/tmp/vl-messaging/source/include/rpc_ds.h branches/tmp/vl-messaging/source/include/smb.h branches/tmp/vl-messaging/source/lib/dummysmbd.c branches/tmp/vl-messaging/source/lib/sharesec.c branches/tmp/vl-messaging/source/lib/substitute.c branches/tmp/vl-messaging/source/lib/util.c branches/tmp/vl-messaging/source/libads/cldap.c branches/tmp/vl-messaging/source/libads/kerberos.c branches/tmp/vl-messaging/source/libads/kerberos_keytab.c branches/tmp/vl-messaging/source/libads/kerberos_verify.c branches/tmp/vl-messaging/source/libads/ldap.c branches/tmp/vl-messaging/source/libads/util.c branches/tmp/vl-messaging/source/libndr/ndr_string.c branches/tmp/vl-messaging/source/libsmb/asn1.c branches/tmp/vl-messaging/source/libsmb/clifsinfo.c branches/tmp/vl-messaging/source/libsmb/clikrb5.c branches/tmp/vl-messaging/source/locking/brlock.c branches/tmp/vl-messaging/source/locking/locking.c branches/tmp/vl-messaging/source/locking/posix.c branches/tmp/vl-messaging/source/modules/vfs_recycle.c branches/tmp/vl-messaging/source/nsswitch/pam_winbind.c branches/tmp/vl-messaging/source/nsswitch/winbindd.c branches/tmp/vl-messaging/source/nsswitch/winbindd_async.c branches/tmp/vl-messaging/source/nsswitch/winbindd_cache.c branches/tmp/vl-messaging/source/nsswitch/winbindd_dual.c branches/tmp/vl-messaging/source/nsswitch/winbindd_group.c branches/tmp/vl-messaging/source/nsswitch/winbindd_nss.h branches/tmp/vl-messaging/source/nsswitch/winbindd_pam.c branches/tmp/vl-messaging/source/nsswitch/winbindd_util.c branches/tmp/vl-messaging/source/param/loadparm.c branches/tmp/vl-messaging/source/passdb/lookup_sid.c branches/tmp/vl-messaging/source/registry/reg_db.c branches/tmp/vl-messaging/source/rpc_client/cli_samr.c branches/tmp/vl-messaging/source/rpc_server/srv_lsa_nt.c branches/tmp/vl-messaging/source/rpc_server/srv_samr_nt.c branches/tmp/vl-messaging/source/rpc_server/srv_srvsvc_nt.c branches/tmp/vl-messaging/source/smbd/blocking.c branches/tmp/vl-messaging/source/smbd/msdfs.c branches/tmp/vl-messaging/source/smbd/process.c branches/tmp/vl-messaging/source/smbd/reply.c branches/tmp/vl-messaging/source/smbd/trans2.c branches/tmp/vl-messaging/source/tdb/tdb_private.h branches/tmp/vl-messaging/source/torture/msgtest.c branches/tmp/vl-messaging/source/torture/torture.c branches/tmp/vl-messaging/source/utils/net.c branches/tmp/vl-messaging/source/utils/net_ads.c branches/tmp/vl-messaging/source/utils/ntlm_auth.c branches/tmp/vl-messaging/source/utils/sharesec.c branches/tmp/vl-messaging/source/utils/status.c branches/tmp/vl-messaging/source/utils/status_profile.c Changeset: Sorry, the patch is too large (7408 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17093