diff options
| author | Gerald Carter <jerry@samba.org> | 2002-10-10 02:39:03 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2002-10-10 02:39:03 +0000 |
| commit | c7f289afc70a716bec148d64bdfdcc46d29b3672 (patch) | |
| tree | f96e316f9d66d3495b489379c2aa6479efd1353e | |
| parent | 0864bca0b1c65be7e5edd951d3281a46aabc1409 (diff) | |
| download | samba-c7f289afc70a716bec148d64bdfdcc46d29b3672.tar.gz samba-c7f289afc70a716bec148d64bdfdcc46d29b3672.tar.xz samba-c7f289afc70a716bec148d64bdfdcc46d29b3672.zip | |
sync for rc2 :-( (forgot the LDAP fix)
| -rw-r--r-- | WHATSNEW.txt | 1 | ||||
| -rw-r--r-- | source/libsmb/smberr.c | 1 | ||||
| -rw-r--r-- | source/passdb/pdb_ldap.c | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 80e5a979c22..788c613f658 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -66,6 +66,7 @@ Changes since 2.2.6pre2 36) Add version strings to the usage message for smbcacls and smbpasswd 37) Fix bug in the write cache code 38) make the default printed values for boolean the same for all parameters +39) Default all LDAP connections to v3 with compiling with --with-ldapsam Changes since 2.2.6pre1 diff --git a/source/libsmb/smberr.c b/source/libsmb/smberr.c index fbe1d779472..3085211115b 100644 --- a/source/libsmb/smberr.c +++ b/source/libsmb/smberr.c @@ -78,6 +78,7 @@ err_code_struct dos_msgs[] = { {"ERRlogonfailure",ERRlogonfailure,"Logon failure"}, {"ERRdiskfull",ERRdiskfull,"Disk full"}, {"ERRgeneral",ERRgeneral, "General failure"}, + {"ERRunknownlevel",ERRunknownlevel, "Unknown info level"}, {NULL,-1,NULL}}; /* Server Error Messages */ diff --git a/source/passdb/pdb_ldap.c b/source/passdb/pdb_ldap.c index a4258347178..5795aa7b9bd 100644 --- a/source/passdb/pdb_ldap.c +++ b/source/passdb/pdb_ldap.c @@ -155,9 +155,9 @@ static BOOL ldap_open_connection (LDAP ** ldap_struct) /* Connect to older servers using SSL and V2 rather than Start TLS */ if (ldap_get_option(*ldap_struct, LDAP_OPT_PROTOCOL_VERSION, &version) == LDAP_OPT_SUCCESS) { - if (version != LDAP_VERSION2) + if (version != LDAP_VERSION3) { - version = LDAP_VERSION2; + version = LDAP_VERSION3; ldap_set_option (*ldap_struct, LDAP_OPT_PROTOCOL_VERSION, &version); } } |