sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

Try to get meaningful errors out of ldap more often - get the error string

Browse Source 
from the server, not just the error code translation.

Andrew Bartlett
(This used to be commit 92415441fd)
This commit is contained in:
Andrew Bartlett
2003-03-28 09:59:11 +00:00
parent a50e82cac2
commit 8d751b02a5
1 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
source3/passdb/pdb_ldap.c
View File

@ -650,10 +650,14 @@ static int ldapsam_search_one_user (struct ldapsam_privates *ldap_state, const c
rc = ldapsam_search(ldap_state, lp_ldap_suffix (), scope, filter, attr, 0, result);
if (rc != LDAP_SUCCESS) {
DEBUG(0,("ldapsam_search_one_user: Problem during the LDAP search: %s\n",
ldap_err2string (rc)));
char *ld_error;
ldap_get_option(ldap_state->ldap_struct, LDAP_OPT_ERROR_STRING,
&ld_error);
DEBUG(0,("ldapsam_search_one_user: Problem during the LDAP search: %s (%s)\n",
ld_error, ldap_err2string (rc)));
DEBUG(3,("ldapsam_search_one_user: Query was: %s, %s\n", lp_ldap_suffix(),
filter));
SAFE_FREE(ld_error);
}
return rc;
@ -915,8 +919,13 @@ static NTSTATUS ldapsam_delete_entry(struct ldapsam_privates *ldap_state,
ldap_mods_free(mods, 1);
if (rc != LDAP_SUCCESS) {
DEBUG(0, ("could not delete attributes for %s, error: %s\n",
dn, ldap_err2string(rc)));
char *ld_error;
ldap_get_option(ldap_state->ldap_struct, LDAP_OPT_ERROR_STRING,
&ld_error);
DEBUG(0, ("could not delete attributes for %s, error: %s (%s)\n",
dn, ldap_err2string(rc), ld_error));
SAFE_FREE(ld_error);
ldap_memfree(dn);
return NT_STATUS_UNSUCCESSFUL;
}
@ -2000,9 +2009,13 @@ static NTSTATUS ldapsam_update_sam_account(struct pdb_methods *my_methods, SAM_A
ret = ldapsam_modify_entry(my_methods,newpwd,dn,mods,LDAP_MOD_REPLACE, False);
ldap_mods_free(mods,1);
if (NT_STATUS_IS_ERR(ret)) {
DEBUG(0,("failed to modify user with uid = %s\n",
pdb_get_username(newpwd)));
if (!NT_STATUS_IS_OK(ret)) {
char *ld_error;
ldap_get_option(ldap_state->ldap_struct, LDAP_OPT_ERROR_STRING,
&ld_error);
DEBUG(0,("failed to modify user with uid = %s, error: %s (%s)\n",
pdb_get_username(newpwd), ld_error, ldap_err2string(rc)));
SAFE_FREE(ld_error);
return ret;
}
@ -2160,11 +2173,15 @@ static int ldapsam_search_one_group (struct ldapsam_privates *ldap_state,
filter, group_attr, 0, result);
if (rc != LDAP_SUCCESS) {
char *ld_error;
ldap_get_option(ldap_state->ldap_struct, LDAP_OPT_ERROR_STRING,
&ld_error);
DEBUG(0, ("ldapsam_search_one_group: "
"Problem during the LDAP search: %s\n",
ldap_err2string(rc)));
"Problem during the LDAP search: LDAP error: %s (%s)",
ld_error, ldap_err2string(rc)));
DEBUG(3, ("ldapsam_search_one_group: Query was: %s, %s\n",
lp_ldap_suffix(), filter));
SAFE_FREE(ld_error);
}
return rc;
@ -2415,7 +2432,12 @@ static NTSTATUS ldapsam_add_group_mapping_entry(struct pdb_methods *methods,
ldap_mods_free(mods, 1);
if (rc != LDAP_SUCCESS) {
DEBUG(0, ("failed to modify group %i\n", map->gid));
char *ld_error;
ldap_get_option(ldap_state->ldap_struct, LDAP_OPT_ERROR_STRING,
&ld_error);
DEBUG(0, ("failed to add group %i error: %s (%s)\n", map->gid,
ld_error, ldap_err2string(rc)));
SAFE_FREE(ld_error);
return NT_STATUS_UNSUCCESSFUL;
}
@ -2467,7 +2489,12 @@ static NTSTATUS ldapsam_update_group_mapping_entry(struct pdb_methods *methods,
ldap_mods_free(mods, 1);
if (rc != LDAP_SUCCESS) {
DEBUG(0, ("failed to modify group %i\n", map->gid));
char *ld_error;
ldap_get_option(ldap_state->ldap_struct, LDAP_OPT_ERROR_STRING,
&ld_error);
DEBUG(0, ("failed to modify group %i error: %s (%s)\n", map->gid,
ld_error, ldap_err2string(rc)));
SAFE_FREE(ld_error);
}
DEBUG(2, ("successfully modified group %i in LDAP\n", map->gid));