diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2007-06-12 11:09:02 +0200 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2007-06-12 11:09:02 +0200 |
| commit | 22c1f37699777400d3692be67534d67651bef2fe (patch) | |
| tree | 8bb1066d88810677f4706d97ed68ed8f95bc5f89 /nslcd/ldap-nss.c | |
| parent | afc4d034fdfd798629572003bdb379d1c0e3345e (diff) | |
fix casts of types where needed
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-ldapd@285 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'nslcd/ldap-nss.c')
| -rw-r--r-- | nslcd/ldap-nss.c | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/nslcd/ldap-nss.c b/nslcd/ldap-nss.c index da1c721..9bcc930 100644 --- a/nslcd/ldap-nss.c +++ b/nslcd/ldap-nss.c @@ -43,12 +43,7 @@ #include <sys/un.h> #endif #include <netinet/in.h> -#ifdef HAVE_LBER_H -#include <lber.h> -#endif -#ifdef HAVE_LDAP_H #include <ldap.h> -#endif #ifdef HAVE_LDAP_SSL_H #include <ldap_ssl.h> #endif @@ -2060,16 +2055,14 @@ _nss_ldap_read (const char *dn, const char **attributes, LDAPMessage ** res) * Simple wrapper around ldap_get_values(). Requires that * session is already established. */ -char ** -_nss_ldap_get_values (LDAPMessage * e, const char *attr) +char **_nss_ldap_get_values(LDAPMessage *e,const char *attr) { - if (__session.ls_state != LS_CONNECTED_TO_DSA) - { - return NULL; - } - assert (__session.ls_conn != NULL); - - return ldap_get_values (__session.ls_conn, e, (char *) attr); + if (__session.ls_state!=LS_CONNECTED_TO_DSA) + { + return NULL; + } + assert(__session.ls_conn!=NULL); + return ldap_get_values(__session.ls_conn,e,attr); } /* @@ -2697,7 +2690,7 @@ _nss_ldap_assign_attrvals (LDAPMessage * e, return NSS_STATUS_UNAVAIL; } - vals = ldap_get_values (__session.ls_conn, e, (char *) attr); + vals=ldap_get_values(__session.ls_conn,e,attr); valcount = (vals == NULL) ? 0 : ldap_count_values (vals); if (bytesleft (buffer, buflen, char *) < (valcount + 1) * sizeof (char *)) @@ -2778,7 +2771,7 @@ int _nss_ldap_write_attrvals(TFILE *fp,LDAPMessage *e,const char *attr) if (__session.ls_conn==NULL) return NSLCD_RESULT_UNAVAIL; /* get the values and the number of values */ - vals=ldap_get_values(__session.ls_conn,e,(char *)attr); + vals=ldap_get_values(__session.ls_conn,e,attr); valcount=(vals==NULL)?0:ldap_count_values(vals); /* write number of entries */ WRITE_INT32(fp,valcount); @@ -2827,7 +2820,7 @@ _nss_ldap_assign_attrval (LDAPMessage * e, return NSS_STATUS_UNAVAIL; } - vals = ldap_get_values (__session.ls_conn, e, (char *) attr); + vals=ldap_get_values(__session.ls_conn,e,attr); if (vals == NULL) { def = _nss_ldap_map_df(attr); @@ -2941,7 +2934,7 @@ _nss_ldap_assign_userpassword (LDAPMessage * e, return NSS_STATUS_UNAVAIL; } - vals=ldap_get_values(__session.ls_conn,e,(char *)attr); + vals=ldap_get_values(__session.ls_conn,e,attr); pwd=_nss_ldap_locate_userpassword(vals); vallen=strlen(pwd); |