From: Stefan Metzmacher Date: Sun, 14 Sep 2008 21:07:26 +0000 (+0200) Subject: Merge Samba3 and Samba4 together X-Git-Tag: samba-4.0.0alpha6~801 X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=9d3d3320928e43a972b88024a52986331d0dbee0 Merge Samba3 and Samba4 together --- 9d3d3320928e43a972b88024a52986331d0dbee0 diff --cc .gitignore index 00000000000,123e92531ac,35a30b45c02..b72ebe63a72 mode 000000,100644,100644..100644 --- a/.gitignore +++ b/.gitignore @@@@ -1,0 -1,90 -1,215 +1,301 @@@@ - *.o - *.po -source/pidl/Makefile -source/mkconfig.mk -source/test-results -source/lib/ldb/bin -*.pc + +*~ - *.swp - *.patch - semantic.cache - source/TAGS - source/include/build_env.h - source/include/config.h - source/include/config.h.in - source/include/stamp-h - source/include/version.h - source/Makefile - source/lib/netapi/examples/Makefile - source/lib/netapi/tests/Makefile - source/config.log - source/config.status - source/configure - source/smbadduser - source/bin/* - source/script/findsmb - source/script/gen-8bit-gap.sh - source/script/installbin.sh - source/script/uninstallbin.sh - source/smbd/build_options.c - source/tags - source/include/includes.h.gch - source/config.cache - source/library-versions - source/nsswitch/*.so - source/proto_exists - source/cscope.out - source/torture.tdb - source/pkgconfig/*.pc - source/st - source/exports/libsmbclient.syms - source/exports/libsmbsharemodes.syms - source/exports/libnetapi.syms - source/exports/libtalloc.syms - source/exports/libtdb.syms - source/exports/libwbclient.syms - examples/VFS/Makefile - examples/VFS/config.log - examples/VFS/config.status - examples/VFS/configure - examples/VFS/module_config.h - examples/VFS/module_config.h.in - examples/VFS/shadow_copy_test.so - examples/VFS/skel_opaque.so - examples/VFS/skel_transparent.so +++*.1 +++*.3 +++*.8 +++*_asn1_files +++*_asn1.h ++ autom4te.cache -*.d -*.o -*.x -*.hd -*.ho -*.pyc -configure -source/bin/* -config.log -source/config.mk -config.status ++ config.cache -source/extra_cflags.txt -source/version.h -source/heimdal/lib/des/hcrypto -source/build/smb_build/config.pm -source/auth/auth_proto.h -source/auth/auth_sam.h -source/auth/credentials/credentials_proto.h -source/auth/gensec/gensec_proto.h -source/auth/gensec/schannel_proto.h -source/auth/gensec/schannel_state.h -source/auth/gensec/spnego_proto.h -source/auth/kerberos/proto.h -source/auth/ntlmssp/msrpc_parse.h -source/auth/ntlmssp/proto.h -source/cldap_server/proto.h -source/dsdb/samdb/samdb_proto.h -source/heimdal/lib/asn1/asn1_* -source/heimdal/lib/asn1/krb5_asn1.h -source/heimdal/lib/asn1/krb5_asn1_files -source/heimdal/lib/gssapi/asn1_*.c -source/heimdal/lib/gssapi/spnego_asn1.h -source/heimdal/lib/gssapi/spnego_asn1_files -source/heimdal/lib/hdb/asn1_*.c -source/heimdal/lib/hdb/hdb_asn1.h -source/heimdal/lib/hdb/hdb_asn1_files -source/heimdal/lib/hdb/hdb_err.? -source/heimdal/lib/krb5/heim_err.? -source/heimdal/lib/krb5/k524_err.? -source/heimdal/lib/krb5/krb5_err.? -source/heimdal/lib/roken/vis.h -source/heimdal/lib/wind/*_table.? -source/heimdal/kdc/kdc-private.h -source/heimdal/kdc/kdc-protos.h -source/heimdal/lib/asn1/der-protos.h -source/heimdal/lib/gssapi/krb5/gsskrb5-private.h -source/heimdal/lib/gssapi/spnego/spnego-private.h -source/heimdal/lib/hdb/hdb-private.h -source/heimdal/lib/hdb/hdb-protos.h -source/heimdal/lib/hx509/hx509-private.h -source/heimdal/lib/hx509/hx509-protos.h -source/heimdal/lib/krb5/krb5-private.h -source/heimdal/lib/krb5/krb5-protos.h -source/heimdal/lib/ntlm/heimntlm-protos.h -source/include/build.h ++ config.h ++ config.h.in -source/include/config_tmp.h -source/include/config_tmp.h.in -source/ldap_server/proto.h -source/lib/db_wrap_proto.h -source/lib/charset/charset_proto.h -source/lib/cmdline/credentials.h -source/lib/ldb/samba/ldif_handlers_proto.h -source/lib/registry/regf.h -source/lib/registry/tdr_regf.c -source/lib/registry/tdr_regf.h -source/lib/samba3/samba3_proto.h -source/lib/socket/netif_proto.h -source/lib/tdr/tdr_proto.h -source/lib/util/pidfile.h -source/lib/util/unix_privs.h -source/lib/util/util_proto.h -source/lib/util/asn1_proto.h -source/libcli/finddcs.h -source/libcli/libcli_proto.h -source/libcli/auth/proto.h -source/libcli/composite/proto.h -source/libcli/ldap/ldap_proto.h -source/libcli/nbt/nbt_proto.h -source/libcli/nbt/nbtname.h -source/libcli/raw/raw_proto.h -source/libcli/resolve/proto.h -source/libcli/security/proto.h -source/libcli/smb2/smb2_proto.h -source/libcli/smb_composite/proto.h -source/libcli/util/clilsa.h -source/libcli/util/proto.h -source/libcli/wrepl/winsrepl_proto.h -source/libnet/libnet_proto.h -source/librpc/gen_ndr -source/librpc/ndr/libndr_proto.h -source/librpc/ndr/ndr_compression.h -source/librpc/ndr/ndr_spoolss_buf.h -source/librpc/rpc/dcerpc_proto.h -source/librpc/rpc/dcerpc_table.h -source/nbt_server/nbt_server_proto.h -source/nbt_server/dgram/proto.h -source/nbt_server/wins/winsdb_proto.h -source/nbt_server/wins/winsserver_proto.h -source/ntptr/ntptr_proto.h -source/ntvfs/ntvfs_proto.h -source/ntvfs/common/proto.h -source/ntvfs/ipc/proto.h -source/ntvfs/posix/vfs_posix_proto.h -source/ntvfs/simple/proto.h -source/param/proto.h -source/param/share_proto.h -source/passdb/proto.h -source/rpc_server/dcerpc_server_proto.h -source/rpc_server/common/proto.h -source/rpc_server/samr/proto.h -source/rpc_server/srvsvc/proto.h -source/scripting/ejs/proto.h -source/smb_server/service_smb_proto.h -source/smb_server/smb_server_proto.h -source/smb_server/smb/smb_proto.h -source/smb_server/smb2/smb2_proto.h -source/smbd/process_model_proto.h -source/smbd/service_proto.h -source/torture/proto.h -source/torture/auth/proto.h -source/torture/basic/proto.h -source/torture/ldap/proto.h -source/torture/libnet/proto.h -source/torture/local/proto.h -source/torture/nbench/proto.h -source/torture/nbt/proto.h -source/torture/raw/proto.h -source/torture/rpc/proto.h -source/torture/smb2/proto.h -source/utils/net/net_proto.h -source/web_server/proto.h -source/winbind/wb_helper.h -source/winbind/wb_proto.h -source/winbind/idmap_proto.h -source/wrepl_server/wrepl_server_proto.h -tags -source/auth/credentials/credentials_krb5_proto.h -source/kdc/pac_glue.h -source/lib/cmdline/popt_credentials.h -source/lib/samba3/samba3_smbpasswd_proto.h -source/lib/util/util_tdb.h -source/ntvfs/cifs_posix_cli/proto.h -source/param/secrets_proto.h -source/smbd/pidfile.h -source/torture/rap/proto.h -*_asn1.h -*_asn1_files +++config.log +++config.status +++configure +++*.d ++ *_err.c ++ *_err.h -source/heimdal/lib/roken/err.h -source/scripting/ejs/ejsnet/proto.h -source/heimdal/lib/hx509/asn1_*.c -*.gcno +++examples/libsmbclient/Makefile.internal + +examples/libsmbclient/smbwrapper/smbsh + +examples/libsmbclient/smbwrapper/smbwrapper.so + +examples/libsmbclient/testacl + +examples/libsmbclient/testacl2 + +examples/libsmbclient/testacl3 + +examples/libsmbclient/testbrowse + +examples/libsmbclient/testbrowse2 + +examples/libsmbclient/testchmod + +examples/libsmbclient/testread + +examples/libsmbclient/testsmbc + +examples/libsmbclient/teststat + +examples/libsmbclient/teststat2 + +examples/libsmbclient/teststat3 +++examples/libsmbclient/testtruncate + +examples/libsmbclient/testutime + +examples/libsmbclient/testwrite - examples/libsmbclient/testtruncate + +examples/libsmbclient/tree - examples/libsmbclient/Makefile.internal - source/librpc/gen_ndr/cli_krb5pac.* - source/librpc/gen_ndr/cli_messaging.* - source/librpc/gen_ndr/cli_misc.* - source/librpc/gen_ndr/cli_notify.* - source/librpc/gen_ndr/cli_security.* - source/librpc/gen_ndr/cli_xattr.* - source/librpc/gen_ndr/srv_krb5pac.* - source/librpc/gen_ndr/srv_messaging.* - source/librpc/gen_ndr/srv_misc.* - source/librpc/gen_ndr/srv_notify.* - source/librpc/gen_ndr/srv_security.* - source/librpc/gen_ndr/srv_xattr.* - source/librpc/gen_ndr/cli_libnetapi.c - source/librpc/gen_ndr/cli_libnetapi.h - source/librpc/gen_ndr/cli_nbt.c - source/librpc/gen_ndr/cli_nbt.h - source/librpc/gen_ndr/srv_drsuapi.c - source/librpc/gen_ndr/srv_drsuapi.h - source/librpc/gen_ndr/srv_libnetapi.c - source/librpc/gen_ndr/srv_libnetapi.h - source/librpc/gen_ndr/srv_nbt.c - source/librpc/gen_ndr/srv_nbt.h +++examples/VFS/config.log +++examples/VFS/config.status +++examples/VFS/configure +++examples/VFS/Makefile +++examples/VFS/module_config.h +++examples/VFS/module_config.h.in +++examples/VFS/shadow_copy_test.so +++examples/VFS/skel_opaque.so +++examples/VFS/skel_transparent.so ++ *.gcda -source/bin/shared/*.so* -*.1 -*.3 -*.8 -source/pidl/blib -source/pidl/pm_to_blib -source/coverage -source/st -source/samba.info -source/pidl/cover_db -source/dsdb/repl/drepl_service_proto.h -source/torture/ndr/proto.h -source/bin/modules/* -source/tests -source/torture/unix/proto.h -source/lib/tdb/bin/tdbtool -source/lib/tdb/bin/tdbtorture -source/lib/talloc/testsuite -source/lib/talloc/talloc.3.html -source/lib/ldb/tests/tmp -source/lib/ldb/man/*.html -source/lib/ldb/lib -source/lib/ldb/examples/ldbreader -source/lib/ldb/examples/ldifreader -source/lib/tdb/bin/tdbbackup -source/lib/tdb/bin/tdbdump -source/lib/ldb-samba/ldif_handlers.h -source/lib/registry/tools/common.h -source/librpc/ndr/ndr_table.h -source/rpc_server/lsa/proto.h -source/torture/winbind/proto.h -*~ -source/auth/auth_sam_reply.h -source/auth/session_proto.h -source/auth/system_session_proto.h -source/dsdb/common/proto.h -source/dsdb/schema/proto.h -source/lib/crypto/test_proto.h -source/lib/registry/tests/proto.h -source/lib/util/apidocs -source/libcli/resolve/lp_proto.h -source/apidocs +++*.gcno +++*.hd +++*.ho +++*.o +++*.patch +++*.pc +++*.po +++*.pyc +++semantic.cache +++source3/bin/* +++source3/config.cache +++source3/config.log +++source3/config.status +++source3/configure +++source3/cscope.out +++source3/exports/libnetapi.syms +++source3/exports/libsmbclient.syms +++source3/exports/libsmbsharemodes.syms +++source3/exports/libtalloc.syms +++source3/exports/libtdb.syms +++source3/exports/libwbclient.syms +++source3/include/build_env.h +++source3/include/config.h +++source3/include/config.h.in +++source3/include/includes.h.gch +++source3/include/stamp-h +++source3/include/version.h +++source3/lib/netapi/examples/Makefile +++source3/lib/netapi/tests/Makefile +++source3/library-versions +++source3/librpc/gen_ndr/cli_krb5pac.* +++source3/librpc/gen_ndr/cli_libnetapi.c +++source3/librpc/gen_ndr/cli_libnetapi.h +++source3/librpc/gen_ndr/cli_messaging.* +++source3/librpc/gen_ndr/cli_misc.* +++source3/librpc/gen_ndr/cli_nbt.c +++source3/librpc/gen_ndr/cli_nbt.h +++source3/librpc/gen_ndr/cli_notify.* +++source3/librpc/gen_ndr/cli_security.* +++source3/librpc/gen_ndr/cli_xattr.* +++source3/librpc/gen_ndr/srv_drsuapi.c +++source3/librpc/gen_ndr/srv_drsuapi.h +++source3/librpc/gen_ndr/srv_krb5pac.* +++source3/librpc/gen_ndr/srv_libnetapi.c +++source3/librpc/gen_ndr/srv_libnetapi.h +++source3/librpc/gen_ndr/srv_messaging.* +++source3/librpc/gen_ndr/srv_misc.* +++source3/librpc/gen_ndr/srv_nbt.c +++source3/librpc/gen_ndr/srv_nbt.h +++source3/librpc/gen_ndr/srv_notify.* +++source3/librpc/gen_ndr/srv_security.* +++source3/librpc/gen_ndr/srv_xattr.* +++source3/Makefile +++source3/nsswitch/*.so +++source3/pkgconfig/*.pc +++source3/proto_exists +++source3/script/findsmb +++source3/script/gen-8bit-gap.sh +++source3/script/installbin.sh +++source3/script/uninstallbin.sh +++source3/smbadduser +++source3/smbd/build_options.c +++source3/st +++source3/tags +++source3/TAGS +++source3/torture.tdb +++source4/apidocs +++source4/auth/auth_proto.h +++source4/auth/auth_sam.h +++source4/auth/auth_sam_reply.h +++source4/auth/credentials/credentials_krb5_proto.h +++source4/auth/credentials/credentials_proto.h +++source4/auth/gensec/gensec_proto.h +++source4/auth/gensec/schannel_proto.h +++source4/auth/gensec/schannel_state.h +++source4/auth/gensec/spnego_proto.h +++source4/auth/kerberos/proto.h +++source4/auth/ntlmssp/msrpc_parse.h +++source4/auth/ntlmssp/proto.h +++source4/auth/session_proto.h +++source4/auth/system_session_proto.h +++source4/bin/* +++source4/bin/modules/* +++source4/bin/shared/*.so* +++source4/build/smb_build/config.pm +++source4/cldap_server/proto.h +++source4/config.mk +++source4/coverage +++source4/data.mk +++source4/dsdb/common/proto.h +++source4/dsdb/repl/drepl_service_proto.h +++source4/dsdb/samdb/samdb_proto.h +++source4/dsdb/schema/proto.h +++source4/extra_cflags.txt +++source4/foo.tdb +++source4/gentest_seeds.dat +++source4/heimdal/kdc/kdc-private.h +++source4/heimdal/kdc/kdc-protos.h +++source4/heimdal/lib/asn1/asn1_* +++source4/heimdal/lib/asn1/der-protos.h +++source4/heimdal/lib/asn1/krb5_asn1_files +++source4/heimdal/lib/asn1/krb5_asn1.h +++source4/heimdal/lib/des/hcrypto +++source4/heimdal/lib/gssapi/asn1_*.c +++source4/heimdal/lib/gssapi/krb5/gsskrb5-private.h +++source4/heimdal/lib/gssapi/spnego_asn1_files +++source4/heimdal/lib/gssapi/spnego_asn1.h +++source4/heimdal/lib/gssapi/spnego/spnego-private.h +++source4/heimdal/lib/hdb/asn1_*.c +++source4/heimdal/lib/hdb/hdb_asn1_files +++source4/heimdal/lib/hdb/hdb_asn1.h +++source4/heimdal/lib/hdb/hdb_err.? +++source4/heimdal/lib/hdb/hdb-private.h +++source4/heimdal/lib/hdb/hdb-protos.h +++source4/heimdal/lib/hx509/asn1_*.c +++source4/heimdal/lib/hx509/hx509-private.h +++source4/heimdal/lib/hx509/hx509-protos.h +++source4/heimdal/lib/krb5/heim_err.? +++source4/heimdal/lib/krb5/k524_err.? +++source4/heimdal/lib/krb5/krb5_err.? +++source4/heimdal/lib/krb5/krb5-private.h +++source4/heimdal/lib/krb5/krb5-protos.h +++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/include/build.h +++source4/include/config_tmp.h +++source4/include/config_tmp.h.in +++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 +++source4/libcli/nbt/nbtname.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 +++source4/libcli/security/proto.h +++source4/libcli/smb2/smb2_proto.h +++source4/libcli/smb_composite/proto.h +++source4/libcli/util/clilsa.h +++source4/libcli/util/proto.h +++source4/libcli/wrepl/winsrepl_proto.h +++source4/lib/cmdline/credentials.h +++source4/lib/cmdline/popt_credentials.h +++source4/lib/crypto/test_proto.h +++source4/lib/db_wrap_proto.h +++source4/lib/ldb/bin +++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 +++source4/lib/registry/regf.h +++source4/lib/registry/tdr_regf.c +++source4/lib/registry/tdr_regf.h +++source4/lib/registry/tests/proto.h +++source4/lib/registry/tools/common.h +++source4/librpc/gen_ndr +++source4/librpc/idl-deps +++source4/librpc/ndr/libndr_proto.h +++source4/librpc/ndr/ndr_compression.h +++source4/librpc/ndr/ndr_spoolss_buf.h +++source4/librpc/ndr/ndr_table.h +++source4/librpc/rpc/dcerpc_proto.h +++source4/librpc/rpc/dcerpc_table.h +++source4/lib/samba3/samba3_proto.h +++source4/lib/samba3/samba3_smbpasswd_proto.h +++source4/lib/socket/netif_proto.h +++source4/lib/talloc/talloc.3.html +++source4/lib/talloc/testsuite +++source4/lib/tdb/bin/tdbbackup +++source4/lib/tdb/bin/tdbdump +++source4/lib/tdb/bin/tdbtool +++source4/lib/tdb/bin/tdbtorture +++source4/lib/tdr/tdr_proto.h +++source4/lib/util/apidocs +++source4/lib/util/asn1_proto.h +++source4/lib/util/pidfile.h +++source4/lib/util/unix_privs.h +++source4/lib/util/util_proto.h +++source4/lib/util/util_tdb.h +++source4/mkconfig.mk +++source4/nbt_server/dgram/proto.h +++source4/nbt_server/nbt_server_proto.h +++source4/nbt_server/wins/winsdb_proto.h +++source4/nbt_server/wins/winsserver_proto.h +++source4/ntptr/ntptr_proto.h +++source4/ntvfs/cifs_posix_cli/proto.h +++source4/ntvfs/common/proto.h +++source4/ntvfs/ipc/proto.h +++source4/ntvfs/ntvfs_proto.h +++source4/ntvfs/posix/vfs_posix_proto.h +++source4/ntvfs/simple/proto.h +++source4/param/proto.h +++source4/param/secrets_proto.h +++source4/param/share_proto.h +++source4/passdb/proto.h +++source4/pidl/blib +++source4/pidl/cover_db +++source4/pidl/Makefile +++source4/pidl/pm_to_blib +++source4/rpc_server/common/proto.h +++source4/rpc_server/dcerpc_server_proto.h +++source4/rpc_server/lsa/proto.h +++source4/rpc_server/samr/proto.h +++source4/rpc_server/srvsvc/proto.h +++source4/samba.info +++source4/scripting/ejs/ejsnet/proto.h +++source4/scripting/ejs/proto.h +++source4/smbd/pidfile.h +++source4/smbd/process_model_proto.h +++source4/smbd/service_proto.h +++source4/smb_server/service_smb_proto.h +++source4/smb_server/smb2/smb2_proto.h +++source4/smb_server/smb_server_proto.h +++source4/smb_server/smb/smb_proto.h +++source4/st +++source4/templates.ldb +++source4/test-results +++source4/tests +++source4/torture/auth/proto.h +++source4/torture/basic/proto.h +++source4/torture/ldap/proto.h +++source4/torture/libnet/proto.h +++source4/torture/local/proto.h +++source4/torture/nbench/proto.h +++source4/torture/nbt/proto.h +++source4/torture/ndr/proto.h +++source4/torture/proto.h +++source4/torture/rap/proto.h +++source4/torture/raw/proto.h +++source4/torture/rpc/proto.h +++source4/torture/smb2/proto.h +++source4/torture.tdb +++source4/torture/unix/proto.h +++source4/torture/winbind/proto.h +++source4/utils/net/net_proto.h +++source4/version.h +++source4/web_server/proto.h +++source4/winbind/idmap_proto.h +++source4/winbind/wb_helper.h +++source4/winbind/wb_proto.h +++source4/wrepl_server/wrepl_server_proto.h ++ *.swp -source/mkconfig.mk -source/data.mk -source/librpc/idl-deps -source/libcli/netlogon_proto.h -source/libcli/ndr_netlogon_proto.h -source/foo.tdb -source/gentest_seeds.dat -source/templates.ldb -source/torture.tdb +++tags +++*.x