From c6aa1fa8ad2eae5e47eb907400c64694c2e67e2f Mon Sep 17 00:00:00 2001
From: Arthur de Jong <arthur@arthurdejong.org>
Date: Sun, 1 Nov 2009 14:51:59 +0000
Subject: 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
---
 nslcd/service.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'nslcd/service.c')

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))",
-- 
cgit v1.2.3