svn commit: samba r1324 - in branches/tmp/SAMBA_3_2_MERGE/source: . client include libcli libcli/auth libcli/raw libcli/util librpc/idl librpc/ndr librpc/rpc utils

[jelmer at samba.org]

Author: jelmer
Date: 2004-07-01 22:48:24 +0000 (Thu, 01 Jul 2004)
New Revision: 1324

Added:
   branches/tmp/SAMBA_3_2_MERGE/source/libcli/auth/clikrb5.c
   branches/tmp/SAMBA_3_2_MERGE/source/libcli/auth/gensec.c
   branches/tmp/SAMBA_3_2_MERGE/source/libcli/auth/gensec.h
   branches/tmp/SAMBA_3_2_MERGE/source/libcli/auth/gensec_ntlmssp.c
   branches/tmp/SAMBA_3_2_MERGE/source/libcli/auth/kerberos.c
   branches/tmp/SAMBA_3_2_MERGE/source/libcli/auth/kerberos.h
   branches/tmp/SAMBA_3_2_MERGE/source/libcli/auth/kerberos_verify.c
   branches/tmp/SAMBA_3_2_MERGE/source/libcli/auth/spnego.c
   branches/tmp/SAMBA_3_2_MERGE/source/libcli/auth/spnego.h
   branches/tmp/SAMBA_3_2_MERGE/source/libcli/auth/spnego_parse.c
Removed:
   branches/tmp/SAMBA_3_2_MERGE/source/libcli/auth/ntlmssp_parse.c
   branches/tmp/SAMBA_3_2_MERGE/source/libcli/raw/clikrb5.c
   branches/tmp/SAMBA_3_2_MERGE/source/libcli/raw/clispnego.c
Modified:
   branches/tmp/SAMBA_3_2_MERGE/source/Makefile.in
   branches/tmp/SAMBA_3_2_MERGE/source/client/client.c
   branches/tmp/SAMBA_3_2_MERGE/source/client/clitar.c
   branches/tmp/SAMBA_3_2_MERGE/source/client/smbspool.c
   branches/tmp/SAMBA_3_2_MERGE/source/include/includes.h
   branches/tmp/SAMBA_3_2_MERGE/source/include/safe_string.h
   branches/tmp/SAMBA_3_2_MERGE/source/libcli/auth/credentials.c
   branches/tmp/SAMBA_3_2_MERGE/source/libcli/auth/ntlm_check.c
   branches/tmp/SAMBA_3_2_MERGE/source/libcli/auth/ntlmssp.c
   branches/tmp/SAMBA_3_2_MERGE/source/libcli/auth/ntlmssp.h
   branches/tmp/SAMBA_3_2_MERGE/source/libcli/auth/ntlmssp_sign.c
   branches/tmp/SAMBA_3_2_MERGE/source/libcli/config.m4
   branches/tmp/SAMBA_3_2_MERGE/source/libcli/raw/smb_signing.c
   branches/tmp/SAMBA_3_2_MERGE/source/libcli/unexpected.c
   branches/tmp/SAMBA_3_2_MERGE/source/libcli/util/asn1.c
   branches/tmp/SAMBA_3_2_MERGE/source/libcli/util/smbencrypt.c
   branches/tmp/SAMBA_3_2_MERGE/source/librpc/idl/netlogon.idl
   branches/tmp/SAMBA_3_2_MERGE/source/librpc/idl/spoolss.idl
   branches/tmp/SAMBA_3_2_MERGE/source/librpc/ndr/ndr.c
   branches/tmp/SAMBA_3_2_MERGE/source/librpc/ndr/ndr_basic.c
   branches/tmp/SAMBA_3_2_MERGE/source/librpc/rpc/dcerpc.c
   branches/tmp/SAMBA_3_2_MERGE/source/librpc/rpc/dcerpc.h
   branches/tmp/SAMBA_3_2_MERGE/source/librpc/rpc/dcerpc_auth.c
   branches/tmp/SAMBA_3_2_MERGE/source/librpc/rpc/dcerpc_ntlm.c
   branches/tmp/SAMBA_3_2_MERGE/source/librpc/rpc/dcerpc_schannel.c
   branches/tmp/SAMBA_3_2_MERGE/source/librpc/rpc/dcerpc_util.c
   branches/tmp/SAMBA_3_2_MERGE/source/utils/smbtree.c
Log:
Merge changes from 3.0 and 4.0 branches...


WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/tmp/SAMBA_3_2_MERGE/source&rev=1324&nolog=1