sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

r21263: getpeername() returning -1 is not a reliable indication if a TCP connection is

Browse Source 
dead. Might be my code, this rings a very distant bell...

Attempt to fix bug # 4372.

Volker
This commit is contained in:
Volker Lendecke 2007-02-09 20:58:17 +00:00 committed by Gerald (Jerry) Carter
parent e2681eb4be
commit 730cc3dc1e
1 changed files with 70 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
source/lib/smbldap.c
View File

@ -1232,12 +1232,23 @@ static int smbldap_search_ext(struct smbldap_state *ldap_state,
sizelimit, res);
if (rc != LDAP_SUCCESS) {
char *ld_error = NULL;
int ld_errno;
ldap_get_option(ldap_state->ldap_struct,
LDAP_OPT_RESULT_CODE, &ld_errno);
ldap_get_option(ldap_state->ldap_struct,
LDAP_OPT_ERROR_STRING, &ld_error);
DEBUG(10,("Failed search for base: %s, error: %s "
"(%s)\n", base, ldap_err2string(rc),
ld_error ? ld_error : "unknown"));
DEBUG(10, ("Failed search for base: %s, error: %d (%s) "
"(%s)\n", base, ld_errno,
ldap_err2string(rc),
ld_error ? ld_error : "unknown"));
SAFE_FREE(ld_error);
if (ld_errno == LDAP_SERVER_DOWN) {
ldap_unbind(ldap_state->ldap_struct);
ldap_state->ldap_struct = NULL;
}
}
}
@ -1372,12 +1383,23 @@ int smbldap_modify(struct smbldap_state *ldap_state, const char *dn, LDAPMod *at
rc = ldap_modify_s(ldap_state->ldap_struct, utf8_dn, attrs);
if (rc != LDAP_SUCCESS) {
char *ld_error = NULL;
int ld_errno;
ldap_get_option(ldap_state->ldap_struct,
LDAP_OPT_RESULT_CODE, &ld_errno);
ldap_get_option(ldap_state->ldap_struct,
LDAP_OPT_ERROR_STRING, &ld_error);
DEBUG(10,("Failed to modify dn: %s, error: %s "
"(%s)\n", dn, ldap_err2string(rc),
ld_error ? ld_error : "unknown"));
DEBUG(10, ("Failed to modify dn: %s, error: %d (%s) "
"(%s)\n", dn, ld_errno,
ldap_err2string(rc),
ld_error ? ld_error : "unknown"));
SAFE_FREE(ld_error);
if (ld_errno == LDAP_SERVER_DOWN) {
ldap_unbind(ldap_state->ldap_struct);
ldap_state->ldap_struct = NULL;
}
}
}
@ -1404,12 +1426,23 @@ int smbldap_add(struct smbldap_state *ldap_state, const char *dn, LDAPMod *attrs
rc = ldap_add_s(ldap_state->ldap_struct, utf8_dn, attrs);
if (rc != LDAP_SUCCESS) {
char *ld_error = NULL;
int ld_errno;
ldap_get_option(ldap_state->ldap_struct,
LDAP_OPT_RESULT_CODE, &ld_errno);
ldap_get_option(ldap_state->ldap_struct,
LDAP_OPT_ERROR_STRING, &ld_error);
DEBUG(10,("Failed to add dn: %s, error: %s "
"(%s)\n", dn, ldap_err2string(rc),
ld_error ? ld_error : "unknown"));
DEBUG(10, ("Failed to add dn: %s, error: %d (%s) "
"(%s)\n", dn, ld_errno,
ldap_err2string(rc),
ld_error ? ld_error : "unknown"));
SAFE_FREE(ld_error);
if (ld_errno == LDAP_SERVER_DOWN) {
ldap_unbind(ldap_state->ldap_struct);
ldap_state->ldap_struct = NULL;
}
}
}
@ -1436,12 +1469,23 @@ int smbldap_delete(struct smbldap_state *ldap_state, const char *dn)
rc = ldap_delete_s(ldap_state->ldap_struct, utf8_dn);
if (rc != LDAP_SUCCESS) {
char *ld_error = NULL;
int ld_errno;
ldap_get_option(ldap_state->ldap_struct,
LDAP_OPT_RESULT_CODE, &ld_errno);
ldap_get_option(ldap_state->ldap_struct,
LDAP_OPT_ERROR_STRING, &ld_error);
DEBUG(10,("Failed to delete dn: %s, error: %s "
"(%s)\n", dn, ldap_err2string(rc),
ld_error ? ld_error : "unknown"));
DEBUG(10, ("Failed to delete dn: %s, error: %d (%s) "
"(%s)\n", dn, ld_errno,
ldap_err2string(rc),
ld_error ? ld_error : "unknown"));
SAFE_FREE(ld_error);
if (ld_errno == LDAP_SERVER_DOWN) {
ldap_unbind(ldap_state->ldap_struct);
ldap_state->ldap_struct = NULL;
}
}
}
@ -1467,12 +1511,23 @@ int smbldap_extended_operation(struct smbldap_state *ldap_state,
clientctrls, retoidp, retdatap);
if (rc != LDAP_SUCCESS) {
char *ld_error = NULL;
int ld_errno;
ldap_get_option(ldap_state->ldap_struct,
LDAP_OPT_RESULT_CODE, &ld_errno);
ldap_get_option(ldap_state->ldap_struct,
LDAP_OPT_ERROR_STRING, &ld_error);
DEBUG(10,("Extended operation failed with error: %s "
"(%s)\n", ldap_err2string(rc),
ld_error ? ld_error : "unknown"));
DEBUG(10, ("Extended operation failed with error: "
"%d (%s) (%s)\n", ld_errno,
ldap_err2string(rc),
ld_error ? ld_error : "unknown"));
SAFE_FREE(ld_error);
if (ld_errno == LDAP_SERVER_DOWN) {
ldap_unbind(ldap_state->ldap_struct);
ldap_state->ldap_struct = NULL;
}
}
}