merge:
authorStefan Metzmacher <metze@samba.org>
Sun, 1 Feb 2004 11:26:25 +0000 (11:26 +0000)
committerStefan Metzmacher <metze@samba.org>
Sun, 1 Feb 2004 11:26:25 +0000 (11:26 +0000)
commit670ccc7d643b8e04743542b4336f6830ac065463
tree0b39213b540cc5b6165881bf5c8ef4fd06d5da94
parent0d90f4b47b463b2e68dd63ab30a2f022ddece14b
merge:
ldap and krb5 configure tests
libads/*.c and libcli/raw/clikrb5.c from 3.0

metze
(This used to be commit 64b5bfcd73d7626d6f687a641b11e64821144df7)
20 files changed:
source4/Makefile.in
source4/aclocal.m4
source4/configure.in
source4/include/ads.h
source4/include/includes.h
source4/libads/ads_ldap.c
source4/libads/ads_status.c
source4/libads/ads_struct.c
source4/libads/ads_utils.c
source4/libads/config.m4
source4/libads/kerberos_verify.c
source4/libads/krb5_setpw.c
source4/libads/ldap.c
source4/libads/ldap_printer.c
source4/libads/ldap_user.c
source4/libads/ldap_utils.c
source4/libads/sasl.c
source4/libads/util.c
source4/libcli/raw/clikrb5.c
source4/libcli/raw/clispnego.c