diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2007-09-21 21:44:35 +0200 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2007-09-21 21:44:35 +0200 |
| commit | a37deef71ccbdb246d40627822e43b33834d27aa (patch) | |
| tree | 974e68d74c38df77fcb41dd2a73757e8439172b7 | |
| parent | e1ab15bc3a4ba58504efb4a704f98cd222dd8297 (diff) | |
remove unneeded variables and slightly improve logging
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-ldapd@412 ef36b2f9-881f-0410-afb5-c4e39611909c
| -rw-r--r-- | nslcd/ldap-nss.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/nslcd/ldap-nss.c b/nslcd/ldap-nss.c index 13f7c37..b4ed0f9 100644 --- a/nslcd/ldap-nss.c +++ b/nslcd/ldap-nss.c @@ -191,9 +191,6 @@ static int do_sasl_interact(LDAP UNUSED(*ld),unsigned UNUSED(flags),void *defaul static int do_bind(MYLDAP_SESSION *session) { int rc; - int msgid; - struct timeval tv; - LDAPMessage *result; char *binddn,*bindarg; int usesasl; /* @@ -450,7 +447,7 @@ static int do_open(MYLDAP_SESSION *session) /* update last activity and finish off state */ time(&(session->ls_timestamp)); session->is_connected=1; - log_log(LOG_DEBUG,"do_open(): session connected to LDAP server"); + log_log(LOG_DEBUG,"do_open(): connected to %s",nslcd_cfg->ldc_uris[session->ls_current_uri]); return 0; } @@ -466,8 +463,6 @@ static enum nss_status do_result_async(struct ent_context *context) int parserc; LDAPControl **resultControls; - log_log(LOG_DEBUG,"==> do_result_async"); - if (nslcd_cfg->ldc_timelimit==LDAP_NO_LIMIT) tvp=NULL; else @@ -484,7 +479,6 @@ static enum nss_status do_result_async(struct ent_context *context) ldap_msgfree(context->ec_res); context->ec_res=NULL; } - rc=ldap_result(context->session->ls_conn,context->ec_msgid,LDAP_MSG_ONE,tvp,&(context->ec_res)); switch (rc) { @@ -536,8 +530,6 @@ static enum nss_status do_result_async(struct ent_context *context) if (stat==NSS_STATUS_SUCCESS) time(&(context->session->ls_timestamp)); - log_log(LOG_DEBUG,"<== do_result_async"); - return stat; } @@ -634,7 +626,7 @@ static int do_search_async( } else pServerCtrls=NULL; - rc=ldap_search_ext(session->ls_conn,base,scope,filter,(char **) attrs, + rc=ldap_search_ext(session->ls_conn,base,scope,filter,(char **)attrs, 0,pServerCtrls,NULL,LDAP_NO_LIMIT,sizelimit,msgid); if (pServerCtrls!=NULL) { |