diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2009-11-01 15:51:59 +0100 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2009-11-01 15:51:59 +0100 |
| commit | c6aa1fa8ad2eae5e47eb907400c64694c2e67e2f (patch) | |
| tree | 0a387a04a7f30c6b5901a357757e92a4b0bdf46f /nslcd/service.c | |
| parent | 37dfc03f1b54451bda18671bd9d569caa4f85c57 (diff) | |
give search filter escaping buffers more logical names
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1014 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'nslcd/service.c')
| -rw-r--r-- | nslcd/service.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/nslcd/service.c b/nslcd/service.c index f3980a7..8bc4a0a 100644 --- a/nslcd/service.c +++ b/nslcd/service.c @@ -66,43 +66,43 @@ static int mkfilter_service_byname(const char *name, const char *protocol, char *buffer,size_t buflen) { - char buf2[1024],buf3[1024]; + char safename[1024],safeprotocol[1024]; /* escape attributes */ - if (myldap_escape(name,buf2,sizeof(buf2))) + if (myldap_escape(name,safename,sizeof(safename))) return -1; - if (*protocol!='\0') - if (myldap_escape(protocol,buf3,sizeof(buf3))) - return -1; /* build filter */ if (*protocol!='\0') + { + if (myldap_escape(protocol,safeprotocol,sizeof(safeprotocol))) + return -1; return mysnprintf(buffer,buflen, "(&%s(%s=%s)(%s=%s))", service_filter, - attmap_service_cn,buf2, - attmap_service_ipServiceProtocol,buf3); + attmap_service_cn,safename, + attmap_service_ipServiceProtocol,safeprotocol); + } else return mysnprintf(buffer,buflen, "(&%s(%s=%s))", service_filter, - attmap_service_cn,buf2); + attmap_service_cn,safename); } static int mkfilter_service_bynumber(int number, const char *protocol, char *buffer,size_t buflen) { - char buf3[1024]; - /* escape attribute */ + char safeprotocol[1024]; if (*protocol!='\0') - if (myldap_escape(protocol,buf3,sizeof(buf3))) + { + if (myldap_escape(protocol,safeprotocol,sizeof(safeprotocol))) return -1; - /* build filter */ - if (*protocol!='\0') return mysnprintf(buffer,buflen, "(&%s(%s=%d)(%s=%s))", service_filter, attmap_service_ipServicePort,number, - attmap_service_ipServiceProtocol,buf3); + attmap_service_ipServiceProtocol,safeprotocol); + } else return mysnprintf(buffer,buflen, "(&%s(%s=%d))", |