Revert to 3.4.7...for now?

git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@3416 fc4039ab-9d04-0410-8cac-899223bdd6b0

1 files changed, 6 insertions, 50 deletions

diff --git a/.gitignore b/.gitignore
index 4b88d4b29e..f1440ca316 100644
--- a/.gitignore
+++ b/.gitignore
@@ -138,7 +138,6 @@ source4/config.mk
 source4/coverage
 source4/data.mk
 source4/dsdb/common/proto.h
-source4/dsdb/kcc/kcc_service_proto.h
 source4/dsdb/repl/drepl_service_proto.h
 source4/dsdb/samdb/samdb_proto.h
 source4/dsdb/schema/proto.h
@@ -175,23 +174,21 @@ source4/heimdal/lib/ntlm/heimntlm-protos.h
 source4/heimdal/lib/roken/err.h
 source4/heimdal/lib/roken/vis.h
 source4/heimdal/lib/wind/*_table.?
-source4/heimdal/lib/asn1/*.hx
-source4/heimdal/lib/gssapi/*.hx
-source4/heimdal/lib/hdb/*.hx
-source4/heimdal/lib/hx509/*.hx
 source4/include/build.h
 source4/include/config_tmp.h
 source4/include/config_tmp.h.in
-source4/kdc/pac-glue_proto.h
+source4/kdc/pac_glue.h
 source4/ldap_server/proto.h
 source4/lib/charset/charset_proto.h
+source4/libcli/auth/proto.h
 source4/libcli/composite/proto.h
 source4/libcli/finddcs.h
 source4/libcli/ldap/ldap_proto.h
 source4/libcli/libcli_proto.h
 libcli/nbt/nbtname.h
-libcli/smb/smb_common_proto.h
 source4/libcli/nbt/nbt_proto.h
+source4/libcli/ndr_netlogon_proto.h
+source4/libcli/netlogon_proto.h
 source4/libcli/raw/raw_proto.h
 source4/libcli/resolve/lp_proto.h
 source4/libcli/resolve/proto.h
@@ -210,6 +207,7 @@ source4/lib/ldb/examples/ldbreader
 source4/lib/ldb/examples/ldifreader
 source4/lib/ldb/lib
 source4/lib/ldb/man/*.html
+source4/lib/ldb-samba/ldif_handlers.h
 source4/lib/ldb/samba/ldif_handlers_proto.h
 source4/lib/ldb/tests/tmp
 source4/libnet/libnet_proto.h
@@ -234,7 +232,7 @@ source4/lib/tdb/bin/tdbbackup
 source4/lib/tdb/bin/tdbdump
 source4/lib/tdb/bin/tdbtool
 source4/lib/tdb/bin/tdbtorture
-lib/tdr/tdr_proto.h
+source4/lib/tdr/tdr_proto.h
 lib/util/apidocs
 lib/util/asn1_proto.h
 lib/util/pidfile.h
@@ -282,14 +280,11 @@ source4/tests
 source4/torture/auth/proto.h
 source4/torture/basic/proto.h
 source4/torture/ldap/proto.h
-source4/torture/ldb/proto.h
 source4/torture/libnet/proto.h
-source4/torture/libnetapi/proto.h
 source4/torture/local/proto.h
 source4/torture/nbench/proto.h
 source4/torture/nbt/proto.h
 source4/torture/ndr/proto.h
-source4/torture/ntp/proto.h
 source4/torture/proto.h
 source4/torture/rap/proto.h
 source4/torture/raw/proto.h
@@ -320,8 +315,6 @@ librpc/gen_ndr/cli_drsblobs.h
 librpc/gen_ndr/srv_drsblobs.c
 librpc/gen_ndr/srv_drsblobs.h
 source3/setup
-librpc/gen_ndr/cli_dcerpc.[ch]
-librpc/gen_ndr/srv_dcerpc.[ch]
 librpc/gen_ndr/*wzcsvc*
 librpc/gen_ndr/*w32time*
 librpc/gen_ndr/*wmi*
@@ -343,7 +336,6 @@ librpc/gen_ndr/*dsbackup*
 librpc/gen_ndr/*frsrpc*
 librpc/gen_ndr/*dcom*
 librpc/gen_ndr/*frsapi*
-librpc/gen_ndr/*frstrans*
 librpc/gen_ndr/*dbgidl*
 librpc/gen_ndr/*browser*
 librpc/gen_ndr/*atsvc*
@@ -355,10 +347,6 @@ librpc/gen_ndr/*_c.h
 librpc/gen_ndr/*_s.c
 librpc/gen_ndr/cli_named_pipe_auth.[ch]
 librpc/gen_ndr/srv_named_pipe_auth.[ch]
-librpc/gen_ndr/cli_ntlmssp.[ch]
-librpc/gen_ndr/cli_schannel.[ch]
-librpc/gen_ndr/srv_ntlmssp.[ch]
-librpc/gen_ndr/srv_schannel.[ch]
 lib/tevent/Makefile
 lib/tevent/tevent.so
 lib/tevent/libtevent.so*
@@ -368,35 +356,3 @@ lib/tdb/tdb.so
 lib/tdb/libtdb.a
 lib/tdb/Makefile
 lib/tdb/bin
-docs-xml/build/catalog.xml
-docs-xml/*/images/*.eps
-docs-xml/*/images/*.pdf
-docs-xml/output
-docs-xml/Samba3-ByExample/images/AccountingNetwork.png
-docs-xml/Samba3-ByExample/images/Charity-Network.png
-docs-xml/Samba3-ByExample/images/UNIX-Samba-and-LDAP.png
-docs-xml/Samba3-ByExample/images/acct2net.png
-docs-xml/Samba3-ByExample/images/ch7-dual-additive-LDAP-Ok.png
-docs-xml/Samba3-ByExample/images/ch7-dual-additive-LDAP.png
-docs-xml/Samba3-ByExample/images/ch7-fail-overLDAP.png
-docs-xml/Samba3-ByExample/images/ch7-singleLDAP.png
-docs-xml/Samba3-ByExample/images/ch8-migration.png
-docs-xml/Samba3-ByExample/images/chap4-net.png
-docs-xml/Samba3-ByExample/images/chap5-net.png
-docs-xml/Samba3-ByExample/images/chap6-net.png
-docs-xml/Samba3-ByExample/images/chap7-idresol.png
-docs-xml/Samba3-ByExample/images/chap9-ADSDC.png
-docs-xml/Samba3-ByExample/images/chap9-SambaDC.png
-docs-xml/Samba3-HOWTO/images/access1.png
-docs-xml/Samba3-HOWTO/images/browsing1.png
-docs-xml/Samba3-HOWTO/images/cups1.png
-docs-xml/Samba3-HOWTO/images/cups2.png
-docs-xml/Samba3-HOWTO/images/domain.png
-docs-xml/Samba3-HOWTO/images/idmap-gid2sid.png
-docs-xml/Samba3-HOWTO/images/idmap-sid2gid.png
-docs-xml/Samba3-HOWTO/images/idmap-sid2uid.png
-docs-xml/Samba3-HOWTO/images/idmap-store-gid2sid.png
-docs-xml/Samba3-HOWTO/images/idmap-uid2sid.png
-docs-xml/Samba3-HOWTO/images/pdftoepsonusb.png
-docs-xml/Samba3-HOWTO/images/pdftosocket.png
-docs-xml/Samba3-HOWTO/images/trusts1.png