summaryrefslogtreecommitdiff
path: root/nslcd/ether.c
diff options
context:
space:
mode:
Diffstat (limited to 'nslcd/ether.c')
-rw-r--r--nslcd/ether.c120
1 files changed, 58 insertions, 62 deletions
diff --git a/nslcd/ether.c b/nslcd/ether.c
index be243ba..bcefcda 100644
--- a/nslcd/ether.c
+++ b/nslcd/ether.c
@@ -5,7 +5,7 @@
Copyright (C) 1997-2005 Luke Howard
Copyright (C) 2006 West Consulting
- Copyright (C) 2006, 2007, 2009, 2010, 2011 Arthur de Jong
+ Copyright (C) 2006, 2007, 2009, 2010, 2011, 2012 Arthur de Jong
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -55,8 +55,8 @@ int ether_scope = LDAP_SCOPE_DEFAULT;
const char *ether_filter = "(objectClass=ieee802Device)";
/* the attributes to request with searches */
-const char *attmap_ether_cn = "cn";
-const char *attmap_ether_macAddress = "macAddress";
+const char *attmap_ether_cn = "cn";
+const char *attmap_ether_macAddress = "macAddress";
/* the attribute list to request with searches */
static const char *ether_attrs[3];
@@ -64,129 +64,125 @@ static const char *ether_attrs[3];
/* create a search filter for searching an ethernet address
by name, return -1 on errors */
static int mkfilter_ether_byname(const char *name,
- char *buffer,size_t buflen)
+ char *buffer, size_t buflen)
{
char safename[300];
/* escape attribute */
- if(myldap_escape(name,safename,sizeof(safename)))
+ if (myldap_escape(name, safename, sizeof(safename)))
return -1;
/* build filter */
- return mysnprintf(buffer,buflen,
- "(&%s(%s=%s))",
- ether_filter,
- attmap_ether_cn,safename);
+ return mysnprintf(buffer, buflen, "(&%s(%s=%s))",
+ ether_filter, attmap_ether_cn, safename);
}
static int mkfilter_ether_byether(const char *addrstr,
- char *buffer,size_t buflen)
+ char *buffer, size_t buflen)
{
/* FIXME: this has a bug when the directory has 01:00:0e:...
- and we're looking for 1:0:e:... (leading zeros) */
+ and we're looking for 1:0:e:... (leading zeros) */
/* there should be no characters that need escaping */
/* build filter */
- return mysnprintf(buffer,buflen,
- "(&%s(%s=%s))",
- ether_filter,
- attmap_ether_macAddress,addrstr);
+ return mysnprintf(buffer, buflen, "(&%s(%s=%s))",
+ ether_filter, attmap_ether_macAddress, addrstr);
}
void ether_init(void)
{
int i;
/* set up search bases */
- if (ether_bases[0]==NULL)
- for (i=0;i<NSS_LDAP_CONFIG_MAX_BASES;i++)
- ether_bases[i]=nslcd_cfg->ldc_bases[i];
+ if (ether_bases[0] == NULL)
+ for (i = 0; i < NSS_LDAP_CONFIG_MAX_BASES; i++)
+ ether_bases[i] = nslcd_cfg->ldc_bases[i];
/* set up scope */
- if (ether_scope==LDAP_SCOPE_DEFAULT)
- ether_scope=nslcd_cfg->ldc_scope;
+ if (ether_scope == LDAP_SCOPE_DEFAULT)
+ ether_scope = nslcd_cfg->ldc_scope;
/* set up attribute list */
- ether_attrs[0]=attmap_ether_cn;
- ether_attrs[1]=attmap_ether_macAddress;
- ether_attrs[2]=NULL;
+ ether_attrs[0] = attmap_ether_cn;
+ ether_attrs[1] = attmap_ether_macAddress;
+ ether_attrs[2] = NULL;
}
/* TODO: check for errors in aton() */
-#define WRITE_ETHER(fp,addr) \
- ether_aton_r(addr,&tmpaddr); \
- WRITE(fp,&tmpaddr,sizeof(uint8_t[6]));
+#define WRITE_ETHER(fp, addr) \
+ ether_aton_r(addr, &tmpaddr); \
+ WRITE(fp, &tmpaddr, sizeof(uint8_t[6]));
-static int write_ether(TFILE *fp,MYLDAP_ENTRY *entry,
- const char *reqname,const char *reqether)
+static int write_ether(TFILE *fp, MYLDAP_ENTRY *entry,
+ const char *reqname, const char *reqether)
{
int32_t tmpint32;
struct ether_addr tmpaddr;
const char *tmparr[2];
- const char **names,**ethers;
- int i,j;
+ const char **names, **ethers;
+ int i, j;
/* get the name of the ether entry */
- names=myldap_get_values(entry,attmap_ether_cn);
- if ((names==NULL)||(names[0]==NULL))
+ names = myldap_get_values(entry, attmap_ether_cn);
+ if ((names == NULL) || (names[0] == NULL))
{
- log_log(LOG_WARNING,"%s: %s: missing",
- myldap_get_dn(entry),attmap_ether_cn);
+ log_log(LOG_WARNING, "%s: %s: missing",
+ myldap_get_dn(entry), attmap_ether_cn);
return 0;
}
/* get the addresses */
- if (reqether!=NULL)
+ if (reqether != NULL)
{
- ethers=tmparr;
- ethers[0]=reqether;
- ethers[1]=NULL;
+ ethers = tmparr;
+ ethers[0] = reqether;
+ ethers[1] = NULL;
}
else
{
- ethers=myldap_get_values(entry,attmap_ether_macAddress);
- if ((ethers==NULL)||(ethers[0]==NULL))
+ ethers = myldap_get_values(entry, attmap_ether_macAddress);
+ if ((ethers == NULL) || (ethers[0] == NULL))
{
- log_log(LOG_WARNING,"%s: %s: missing",
- myldap_get_dn(entry),attmap_ether_macAddress);
+ log_log(LOG_WARNING, "%s: %s: missing",
+ myldap_get_dn(entry), attmap_ether_macAddress);
return 0;
}
/* TODO: move parsing of addresses up here */
}
/* write entries for all names and addresses */
- for (i=0;names[i]!=NULL;i++)
- if ((reqname==NULL)||(strcasecmp(reqname,names[i])==0))
- for (j=0;ethers[j]!=NULL;j++)
+ for (i = 0; names[i] != NULL; i++)
+ if ((reqname == NULL) || (strcasecmp(reqname, names[i]) == 0))
+ for (j = 0; ethers[j] != NULL; j++)
{
- WRITE_INT32(fp,NSLCD_RESULT_BEGIN);
- WRITE_STRING(fp,names[i]);
- WRITE_ETHER(fp,ethers[j]);
+ WRITE_INT32(fp, NSLCD_RESULT_BEGIN);
+ WRITE_STRING(fp, names[i]);
+ WRITE_ETHER(fp, ethers[j]);
}
return 0;
}
NSLCD_HANDLE(
- ether,byname,
+ ether, byname,
char name[256];
char filter[4096];
- READ_STRING(fp,name);
- log_setrequest("ether=\"%s\"",name);,
+ READ_STRING(fp, name);
+ log_setrequest("ether=\"%s\"", name);,
NSLCD_ACTION_ETHER_BYNAME,
- mkfilter_ether_byname(name,filter,sizeof(filter)),
- write_ether(fp,entry,name,NULL)
+ mkfilter_ether_byname(name, filter, sizeof(filter)),
+ write_ether(fp, entry, name, NULL)
)
NSLCD_HANDLE(
- ether,byether,
+ ether, byether,
struct ether_addr addr;
char addrstr[20];
char filter[4096];
- READ(fp,&addr,sizeof(uint8_t[6]));
- if (ether_ntoa_r(&addr,addrstr)==NULL)
+ READ(fp, &addr, sizeof(uint8_t[6]));
+ if (ether_ntoa_r(&addr, addrstr) == NULL)
return -1;
- log_setrequest("ether=%s",addrstr);,
+ log_setrequest("ether=%s", addrstr);,
NSLCD_ACTION_ETHER_BYETHER,
- mkfilter_ether_byether(addrstr,filter,sizeof(filter)),
- write_ether(fp,entry,NULL,addrstr)
+ mkfilter_ether_byether(addrstr, filter, sizeof(filter)),
+ write_ether(fp, entry, NULL, addrstr)
)
NSLCD_HANDLE(
- ether,all,
+ ether, all,
const char *filter;
log_setrequest("ether(all)");,
NSLCD_ACTION_ETHER_ALL,
- (filter=ether_filter,0),
- write_ether(fp,entry,NULL,NULL)
+ (filter = ether_filter, 0),
+ write_ether(fp, entry, NULL, NULL)
)
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2025-08-12 18:14:55 +0000