Arthur de Jong

Open Source / Free Software developer

summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--nslcd/alias.c6
-rw-r--r--nslcd/ether.c12
-rw-r--r--nslcd/group.c6
-rw-r--r--nslcd/host.c6
-rw-r--r--nslcd/netgroup.c6
-rw-r--r--nslcd/network.c12
-rw-r--r--nslcd/passwd.c6
-rw-r--r--nslcd/protocol.c6
-rw-r--r--nslcd/rpc.c6
-rw-r--r--nslcd/service.c28
-rw-r--r--nslcd/shadow.c6
11 files changed, 50 insertions, 50 deletions
diff --git a/nslcd/alias.c b/nslcd/alias.c
index 993b520..9c8a5f2 100644
--- a/nslcd/alias.c
+++ b/nslcd/alias.c
@@ -64,15 +64,15 @@ static const char *alias_attrs[3];
static int mkfilter_alias_byname(const char *name,
char *buffer,size_t buflen)
{
- char buf2[1024];
+ char safename[1024];
/* escape attribute */
- if (myldap_escape(name,buf2,sizeof(buf2)))
+ if (myldap_escape(name,safename,sizeof(safename)))
return -1;
/* build filter */
return mysnprintf(buffer,buflen,
"(&%s(%s=%s))",
alias_filter,
- attmap_alias_cn,buf2);
+ attmap_alias_cn,safename);
}
void alias_init(void)
diff --git a/nslcd/ether.c b/nslcd/ether.c
index 3c9c86b..ba26a44 100644
--- a/nslcd/ether.c
+++ b/nslcd/ether.c
@@ -66,23 +66,23 @@ static const char *ether_attrs[3];
static int mkfilter_ether_byname(const char *name,
char *buffer,size_t buflen)
{
- char buf2[1024];
+ char safename[1024];
/* escape attribute */
- if(myldap_escape(name,buf2,sizeof(buf2)))
+ if(myldap_escape(name,safename,sizeof(safename)))
return -1;
/* build filter */
return mysnprintf(buffer,buflen,
"(&%s(%s=%s))",
ether_filter,
- attmap_ether_cn,buf2);
+ attmap_ether_cn,safename);
}
static int mkfilter_ether_byether(const struct ether_addr *addr,
char *buffer,size_t buflen)
{
- char buf2[20];
+ char ethername[20];
/* transform into string */
- if (ether_ntoa_r(addr,buf2)==NULL)
+ if (ether_ntoa_r(addr,ethername)==NULL)
return -1;
/* FIXME: this has a bug when the directory has 01:00:0e:...
and we're looking for 1:0:e:... (leading zeros) */
@@ -91,7 +91,7 @@ static int mkfilter_ether_byether(const struct ether_addr *addr,
return mysnprintf(buffer,buflen,
"(&%s(%s=%s))",
ether_filter,
- attmap_ether_macAddress,buf2);
+ attmap_ether_macAddress,ethername);
}
void ether_init(void)
diff --git a/nslcd/group.c b/nslcd/group.c
index e89efa8..12021b2 100644
--- a/nslcd/group.c
+++ b/nslcd/group.c
@@ -80,15 +80,15 @@ static const char *group_attrs[6];
static int mkfilter_group_byname(const char *name,
char *buffer,size_t buflen)
{
- char buf2[1024];
+ char safename[1024];
/* escape attribute */
- if(myldap_escape(name,buf2,sizeof(buf2)))
+ if(myldap_escape(name,safename,sizeof(safename)))
return -1;
/* build filter */
return mysnprintf(buffer,buflen,
"(&%s(%s=%s))",
group_filter,
- attmap_group_cn,buf2);
+ attmap_group_cn,safename);
}
/* create a search filter for searching a group entry
diff --git a/nslcd/host.c b/nslcd/host.c
index 5907c05..6a9ddcd 100644
--- a/nslcd/host.c
+++ b/nslcd/host.c
@@ -81,15 +81,15 @@ static int mkfilter_host_byname(const char *name,
static int mkfilter_host_byaddr(const char *name,
char *buffer,size_t buflen)
{
- char buf2[1024];
+ char safename[1024];
/* escape attribute */
- if (myldap_escape(name,buf2,sizeof(buf2)))
+ if (myldap_escape(name,safename,sizeof(safename)))
return -1;
/* build filter */
return mysnprintf(buffer,buflen,
"(&%s(%s=%s))",
host_filter,
- attmap_host_ipHostNumber,buf2);
+ attmap_host_ipHostNumber,safename);
}
void host_init(void)
diff --git a/nslcd/netgroup.c b/nslcd/netgroup.c
index 9acc79f..feaeadb 100644
--- a/nslcd/netgroup.c
+++ b/nslcd/netgroup.c
@@ -65,15 +65,15 @@ static const char *netgroup_attrs[4];
static int mkfilter_netgroup_byname(const char *name,
char *buffer,size_t buflen)
{
- char buf2[1024];
+ char safename[1024];
/* escape attribute */
- if (myldap_escape(name,buf2,sizeof(buf2)))
+ if (myldap_escape(name,safename,sizeof(safename)))
return -1;
/* build filter */
return mysnprintf(buffer,buflen,
"(&%s(%s=%s))",
netgroup_filter,
- attmap_netgroup_cn,buf2);
+ attmap_netgroup_cn,safename);
}
void netgroup_init(void)
diff --git a/nslcd/network.c b/nslcd/network.c
index 73e88d2..ac35b03 100644
--- a/nslcd/network.c
+++ b/nslcd/network.c
@@ -66,29 +66,29 @@ static const char *network_attrs[3];
static int mkfilter_network_byname(const char *name,
char *buffer,size_t buflen)
{
- char buf2[1024];
+ char safename[1024];
/* escape attribute */
- if (myldap_escape(name,buf2,sizeof(buf2)))
+ if (myldap_escape(name,safename,sizeof(safename)))
return -1;
/* build filter */
return mysnprintf(buffer,buflen,
"(&%s(%s=%s))",
network_filter,
- attmap_network_cn,buf2);
+ attmap_network_cn,safename);
}
static int mkfilter_network_byaddr(const char *name,
char *buffer,size_t buflen)
{
- char buf2[1024];
+ char safename[1024];
/* escape attribute */
- if (myldap_escape(name,buf2,sizeof(buf2)))
+ if (myldap_escape(name,safename,sizeof(safename)))
return -1;
/* build filter */
return mysnprintf(buffer,buflen,
"(&%s(%s=%s))",
network_filter,
- attmap_network_ipNetworkNumber,buf2);
+ attmap_network_ipNetworkNumber,safename);
}
void network_init(void)
diff --git a/nslcd/passwd.c b/nslcd/passwd.c
index 911df52..63bfce8 100644
--- a/nslcd/passwd.c
+++ b/nslcd/passwd.c
@@ -84,15 +84,15 @@ static const char *passwd_attrs[10];
static int mkfilter_passwd_byname(const char *name,
char *buffer,size_t buflen)
{
- char buf2[1024];
+ char safename[1024];
/* escape attribute */
- if(myldap_escape(name,buf2,sizeof(buf2)))
+ if(myldap_escape(name,safename,sizeof(safename)))
return -1;
/* build filter */
return mysnprintf(buffer,buflen,
"(&%s(%s=%s))",
passwd_filter,
- attmap_passwd_uid,buf2);
+ attmap_passwd_uid,safename);
}
/* create a search filter for searching a passwd entry
diff --git a/nslcd/protocol.c b/nslcd/protocol.c
index a47b7b2..3223f2c 100644
--- a/nslcd/protocol.c
+++ b/nslcd/protocol.c
@@ -62,15 +62,15 @@ static const char *protocol_attrs[3];
static int mkfilter_protocol_byname(const char *name,
char *buffer,size_t buflen)
{
- char buf2[1024];
+ char safename[1024];
/* escape attribute */
- if (myldap_escape(name,buf2,sizeof(buf2)))
+ if (myldap_escape(name,safename,sizeof(safename)))
return -1;
/* build filter */
return mysnprintf(buffer,buflen,
"(&%s(%s=%s))",
protocol_filter,
- attmap_protocol_cn,buf2);
+ attmap_protocol_cn,safename);
}
/* create a search filter for searching a protocol entry
diff --git a/nslcd/rpc.c b/nslcd/rpc.c
index 7783994..8e39729 100644
--- a/nslcd/rpc.c
+++ b/nslcd/rpc.c
@@ -64,15 +64,15 @@ static const char *rpc_attrs[3];
static int mkfilter_rpc_byname(const char *name,
char *buffer,size_t buflen)
{
- char buf2[1024];
+ char safename[1024];
/* escape attribute */
- if (myldap_escape(name,buf2,sizeof(buf2)))
+ if (myldap_escape(name,safename,sizeof(safename)))
return -1;
/* build filter */
return mysnprintf(buffer,buflen,
"(&%s(%s=%s))",
rpc_filter,
- attmap_rpc_cn,buf2);
+ attmap_rpc_cn,safename);
}
static int mkfilter_rpc_bynumber(int number,
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))",
diff --git a/nslcd/shadow.c b/nslcd/shadow.c
index 0966356..fd58d52 100644
--- a/nslcd/shadow.c
+++ b/nslcd/shadow.c
@@ -79,15 +79,15 @@ static const char *shadow_attrs[10];
static int mkfilter_shadow_byname(const char *name,
char *buffer,size_t buflen)
{
- char buf2[1024];
+ char safename[1024];
/* escape attribute */
- if(myldap_escape(name,buf2,sizeof(buf2)))
+ if(myldap_escape(name,safename,sizeof(safename)))
return -1;
/* build filter */
return mysnprintf(buffer,buflen,
"(&%s(%s=%s))",
shadow_filter,
- attmap_shadow_uid,buf2);
+ attmap_shadow_uid,safename);
}
void shadow_init(void)