1 files changed, 58 insertions, 62 deletions
diff --git a/nslcd/host.c b/nslcd/host.c
index bc896c5..85a54b6 100644
--- a/nslcd/host.c
+++ b/nslcd/host.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
@@ -56,137 +56,133 @@ int host_scope = LDAP_SCOPE_DEFAULT;
 const char *host_filter = "(objectClass=ipHost)";
 
 /* the attributes to request with searches */
-const char *attmap_host_cn            = "cn";
-const char *attmap_host_ipHostNumber  = "ipHostNumber";
+const char *attmap_host_cn           = "cn";
+const char *attmap_host_ipHostNumber = "ipHostNumber";
 
 /* the attribute list to request with searches */
 static const char *host_attrs[3];
 
 /* create a search filter for searching a host entry
    by name, return -1 on errors */
-static int mkfilter_host_byname(const char *name,
-                                char *buffer,size_t buflen)
+static int mkfilter_host_byname(const char *name, 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))",
-                    host_filter,
-                    attmap_host_cn,safename);
+  return mysnprintf(buffer, buflen, "(&%s(%s=%s))",
+                    host_filter, attmap_host_cn, safename);
 }
 
 static int mkfilter_host_byaddr(const char *addrstr,
-                                char *buffer,size_t buflen)
+                                char *buffer, size_t buflen)
 {
   char safeaddr[64];
   /* escape attribute */
-  if (myldap_escape(addrstr,safeaddr,sizeof(safeaddr)))
+  if (myldap_escape(addrstr, safeaddr, sizeof(safeaddr)))
     return -1;
   /* build filter */
-  return mysnprintf(buffer,buflen,
-                    "(&%s(%s=%s))",
-                    host_filter,
-                    attmap_host_ipHostNumber,safeaddr);
+  return mysnprintf(buffer, buflen, "(&%s(%s=%s))",
+                    host_filter, attmap_host_ipHostNumber, safeaddr);
 }
 
 void host_init(void)
 {
   int i;
   /* set up search bases */
-  if (host_bases[0]==NULL)
-    for (i=0;i<NSS_LDAP_CONFIG_MAX_BASES;i++)
-      host_bases[i]=nslcd_cfg->ldc_bases[i];
+  if (host_bases[0] == NULL)
+    for (i = 0; i < NSS_LDAP_CONFIG_MAX_BASES; i++)
+      host_bases[i] = nslcd_cfg->ldc_bases[i];
   /* set up scope */
-  if (host_scope==LDAP_SCOPE_DEFAULT)
-    host_scope=nslcd_cfg->ldc_scope;
+  if (host_scope == LDAP_SCOPE_DEFAULT)
+    host_scope = nslcd_cfg->ldc_scope;
   /* set up attribute list */
-  host_attrs[0]=attmap_host_cn;
-  host_attrs[1]=attmap_host_ipHostNumber;
-  host_attrs[2]=NULL;
+  host_attrs[0] = attmap_host_cn;
+  host_attrs[1] = attmap_host_ipHostNumber;
+  host_attrs[2] = NULL;
 }
 
 /* write a single host entry to the stream */
-static int write_host(TFILE *fp,MYLDAP_ENTRY *entry)
+static int write_host(TFILE *fp, MYLDAP_ENTRY *entry)
 {
-  int32_t tmpint32,tmp2int32,tmp3int32;
-  int numaddr,i;
+  int32_t tmpint32, tmp2int32, tmp3int32;
+  int numaddr, i;
   const char *hostname;
   const char **hostnames;
   const char **addresses;
   /* get the most canonical name */
-  hostname=myldap_get_rdn_value(entry,attmap_host_cn);
+  hostname = myldap_get_rdn_value(entry, attmap_host_cn);
   /* get the other names for the host */
-  hostnames=myldap_get_values(entry,attmap_host_cn);
-  if ((hostnames==NULL)||(hostnames[0]==NULL))
+  hostnames = myldap_get_values(entry, attmap_host_cn);
+  if ((hostnames == NULL) || (hostnames[0] == NULL))
   {
-    log_log(LOG_WARNING,"%s: %s: missing",
-                        myldap_get_dn(entry),attmap_host_cn);
+    log_log(LOG_WARNING, "%s: %s: missing",
+            myldap_get_dn(entry), attmap_host_cn);
     return 0;
   }
   /* if the hostname is not yet found, get the first entry from hostnames */
-  if (hostname==NULL)
-    hostname=hostnames[0];
+  if (hostname == NULL)
+    hostname = hostnames[0];
   /* get the addresses */
-  addresses=myldap_get_values(entry,attmap_host_ipHostNumber);
-  if ((addresses==NULL)||(addresses[0]==NULL))
+  addresses = myldap_get_values(entry, attmap_host_ipHostNumber);
+  if ((addresses == NULL) || (addresses[0] == NULL))
   {
-    log_log(LOG_WARNING,"%s: %s: missing",
-                        myldap_get_dn(entry),attmap_host_ipHostNumber);
+    log_log(LOG_WARNING, "%s: %s: missing",
+            myldap_get_dn(entry), attmap_host_ipHostNumber);
     return 0;
   }
   /* write the entry */
-  WRITE_INT32(fp,NSLCD_RESULT_BEGIN);
-  WRITE_STRING(fp,hostname);
-  WRITE_STRINGLIST_EXCEPT(fp,hostnames,hostname);
-  for (numaddr=0;addresses[numaddr]!=NULL;numaddr++)
-    /*noting*/ ;
-  WRITE_INT32(fp,numaddr);
-  for (i=0;i<numaddr;i++)
+  WRITE_INT32(fp, NSLCD_RESULT_BEGIN);
+  WRITE_STRING(fp, hostname);
+  WRITE_STRINGLIST_EXCEPT(fp, hostnames, hostname);
+  for (numaddr = 0; addresses[numaddr] != NULL; numaddr++)
+    /* noting */ ;
+  WRITE_INT32(fp, numaddr);
+  for (i = 0; i < numaddr; i++)
   {
-    WRITE_ADDRESS(fp,entry,attmap_host_ipHostNumber,addresses[i]);
+    WRITE_ADDRESS(fp, entry, attmap_host_ipHostNumber, addresses[i]);
   }
   return 0;
 }
 
 NSLCD_HANDLE(
-  host,byname,
+  host, byname,
   char name[256];
   char filter[4096];
-  READ_STRING(fp,name);
-  log_setrequest("host=\"%s\"",name);,
+  READ_STRING(fp, name);
+  log_setrequest("host=\"%s\"", name);,
   NSLCD_ACTION_HOST_BYNAME,
-  mkfilter_host_byname(name,filter,sizeof(filter)),
-  write_host(fp,entry)
+  mkfilter_host_byname(name, filter, sizeof(filter)),
+  write_host(fp, entry)
 )
 
 NSLCD_HANDLE(
-  host,byaddr,
+  host, byaddr,
   int af;
   char addr[64];
-  int len=sizeof(addr);
+  int len = sizeof(addr);
   char addrstr[64];
   char filter[4096];
-  READ_ADDRESS(fp,addr,len,af);
+  READ_ADDRESS(fp, addr, len, af);
   /* translate the address to a string */
-  if (inet_ntop(af,addr,addrstr,sizeof(addrstr))==NULL)
+  if (inet_ntop(af, addr, addrstr, sizeof(addrstr)) == NULL)
   {
-    log_log(LOG_WARNING,"unable to convert address to string");
+    log_log(LOG_WARNING, "unable to convert address to string");
     return -1;
   }
-  log_setrequest("host=%s",addrstr);,
+  log_setrequest("host=%s", addrstr);,
   NSLCD_ACTION_HOST_BYADDR,
-  mkfilter_host_byaddr(addrstr,filter,sizeof(filter)),
-  write_host(fp,entry)
+  mkfilter_host_byaddr(addrstr, filter, sizeof(filter)),
+  write_host(fp, entry)
 )
 
+
 NSLCD_HANDLE(
-  host,all,
+  host, all,
   const char *filter;
   log_setrequest("host(all)");,
   NSLCD_ACTION_HOST_ALL,
-  (filter=host_filter,0),
-  write_host(fp,entry)
+  (filter = host_filter, 0),
+  write_host(fp, entry)
 )