Arthur de Jong

Open Source / Free Software developer

summaryrefslogtreecommitdiffstats
path: root/nslcd/rpc.c
diff options
context:
space:
mode:
authorArthur de Jong <arthur@arthurdejong.org>2012-12-22 22:38:26 +0100
committerArthur de Jong <arthur@arthurdejong.org>2012-12-22 22:38:26 +0100
commitc7bb19c55c7a902e25bdd33b0d49a2ddcf62e07a (patch)
treeb3a75ef2719bc2f334041460fd21fbdf86a23a82 /nslcd/rpc.c
parentd336cd6b429f8ce40c58ea287f79bbc7c23d0966 (diff)
update C coding style to a more commonly used style
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1873 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'nslcd/rpc.c')
-rw-r--r--nslcd/rpc.c130
1 files changed, 62 insertions, 68 deletions
diff --git a/nslcd/rpc.c b/nslcd/rpc.c
index 8bb98be..55e9ada 100644
--- a/nslcd/rpc.c
+++ b/nslcd/rpc.c
@@ -58,55 +58,49 @@ int rpc_scope = LDAP_SCOPE_DEFAULT;
const char *rpc_filter = "(objectClass=oncRpc)";
/* the attributes to request with searches */
-const char *attmap_rpc_cn = "cn";
-const char *attmap_rpc_oncRpcNumber = "oncRpcNumber";
+const char *attmap_rpc_cn = "cn";
+const char *attmap_rpc_oncRpcNumber = "oncRpcNumber";
/* the attribute list to request with searches */
static const char *rpc_attrs[3];
-static int mkfilter_rpc_byname(const char *name,
- char *buffer,size_t buflen)
+static int mkfilter_rpc_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))",
- rpc_filter,
- attmap_rpc_cn,safename);
+ return mysnprintf(buffer, buflen, "(&%s(%s=%s))",
+ rpc_filter, attmap_rpc_cn, safename);
}
-static int mkfilter_rpc_bynumber(int number,
- char *buffer,size_t buflen)
+static int mkfilter_rpc_bynumber(int number, char *buffer, size_t buflen)
{
- return mysnprintf(buffer,buflen,
- "(&%s(%s=%d))",
- rpc_filter,
- attmap_rpc_oncRpcNumber,number);
+ return mysnprintf(buffer, buflen, "(&%s(%s=%d))",
+ rpc_filter, attmap_rpc_oncRpcNumber, number);
}
void rpc_init(void)
{
int i;
/* set up search bases */
- if (rpc_bases[0]==NULL)
- for (i=0;i<NSS_LDAP_CONFIG_MAX_BASES;i++)
- rpc_bases[i]=nslcd_cfg->ldc_bases[i];
+ if (rpc_bases[0] == NULL)
+ for (i = 0; i < NSS_LDAP_CONFIG_MAX_BASES; i++)
+ rpc_bases[i] = nslcd_cfg->ldc_bases[i];
/* set up scope */
- if (rpc_scope==LDAP_SCOPE_DEFAULT)
- rpc_scope=nslcd_cfg->ldc_scope;
+ if (rpc_scope == LDAP_SCOPE_DEFAULT)
+ rpc_scope = nslcd_cfg->ldc_scope;
/* set up attribute list */
- rpc_attrs[0]=attmap_rpc_cn;
- rpc_attrs[1]=attmap_rpc_oncRpcNumber;
- rpc_attrs[2]=NULL;
+ rpc_attrs[0] = attmap_rpc_cn;
+ rpc_attrs[1] = attmap_rpc_oncRpcNumber;
+ rpc_attrs[2] = NULL;
}
/* write a single rpc entry to the stream */
-static int write_rpc(TFILE *fp,MYLDAP_ENTRY *entry,const char *reqname)
+static int write_rpc(TFILE *fp, MYLDAP_ENTRY *entry, const char *reqname)
{
- int32_t tmpint32,tmp2int32,tmp3int32;
+ int32_t tmpint32, tmp2int32, tmp3int32;
const char *name;
const char **aliases;
const char **numbers;
@@ -114,88 +108,88 @@ static int write_rpc(TFILE *fp,MYLDAP_ENTRY *entry,const char *reqname)
long number;
int i;
/* get the most canonical name */
- name=myldap_get_rdn_value(entry,attmap_rpc_cn);
+ name = myldap_get_rdn_value(entry, attmap_rpc_cn);
/* get the other names for the rpc entries */
- aliases=myldap_get_values(entry,attmap_rpc_cn);
- if ((aliases==NULL)||(aliases[0]==NULL))
+ aliases = myldap_get_values(entry, attmap_rpc_cn);
+ if ((aliases == NULL) || (aliases[0] == NULL))
{
- log_log(LOG_WARNING,"%s: %s: missing",
- myldap_get_dn(entry),attmap_rpc_cn);
+ log_log(LOG_WARNING, "%s: %s: missing",
+ myldap_get_dn(entry), attmap_rpc_cn);
return 0;
}
/* if the rpc name is not yet found, get the first entry */
- if (name==NULL)
- name=aliases[0];
+ if (name == NULL)
+ name = aliases[0];
/* check case of returned rpc entry */
- if ((reqname!=NULL)&&(STR_CMP(reqname,name)!=0))
+ if ((reqname != NULL) && (STR_CMP(reqname, name) != 0))
{
- for (i=0;(aliases[i]!=NULL)&&(STR_CMP(reqname,aliases[i])!=0);i++)
- /* nothing here */ ;
- if (aliases[i]==NULL)
+ for (i = 0; (aliases[i] != NULL) && (STR_CMP(reqname, aliases[i]) != 0); i++)
+ /* nothing */ ;
+ if (aliases[i] == NULL)
return 0; /* neither the name nor any of the aliases matched */
}
/* get the rpc number */
- numbers=myldap_get_values(entry,attmap_rpc_oncRpcNumber);
- if ((numbers==NULL)||(numbers[0]==NULL))
+ numbers = myldap_get_values(entry, attmap_rpc_oncRpcNumber);
+ if ((numbers == NULL) || (numbers[0] == NULL))
{
- log_log(LOG_WARNING,"%s: %s: missing",
- myldap_get_dn(entry),attmap_rpc_oncRpcNumber);
+ log_log(LOG_WARNING, "%s: %s: missing",
+ myldap_get_dn(entry), attmap_rpc_oncRpcNumber);
return 0;
}
- else if (numbers[1]!=NULL)
+ else if (numbers[1] != NULL)
{
- log_log(LOG_WARNING,"%s: %s: multiple values",
- myldap_get_dn(entry),attmap_rpc_oncRpcNumber);
+ log_log(LOG_WARNING, "%s: %s: multiple values",
+ myldap_get_dn(entry), attmap_rpc_oncRpcNumber);
}
- errno=0;
- number=strtol(numbers[0],&tmp,10);
- if ((*(numbers[0])=='\0')||(*tmp!='\0'))
+ errno = 0;
+ number = strtol(numbers[0], &tmp, 10);
+ if ((*(numbers[0]) == '\0') || (*tmp != '\0'))
{
- log_log(LOG_WARNING,"%s: %s: non-numeric",
- myldap_get_dn(entry),attmap_rpc_oncRpcNumber);
+ log_log(LOG_WARNING, "%s: %s: non-numeric",
+ myldap_get_dn(entry), attmap_rpc_oncRpcNumber);
return 0;
}
- else if ((errno!=0)||(number>UINT32_MAX))
+ else if ((errno != 0) || (number > UINT32_MAX))
{
- log_log(LOG_WARNING,"%s: %s: out of range",
- myldap_get_dn(entry),attmap_rpc_oncRpcNumber);
+ log_log(LOG_WARNING, "%s: %s: out of range",
+ myldap_get_dn(entry), attmap_rpc_oncRpcNumber);
return 0;
}
/* write the entry */
- WRITE_INT32(fp,NSLCD_RESULT_BEGIN);
- WRITE_STRING(fp,name);
- WRITE_STRINGLIST_EXCEPT(fp,aliases,name);
- WRITE_INT32(fp,number);
+ WRITE_INT32(fp, NSLCD_RESULT_BEGIN);
+ WRITE_STRING(fp, name);
+ WRITE_STRINGLIST_EXCEPT(fp, aliases, name);
+ WRITE_INT32(fp, number);
return 0;
}
NSLCD_HANDLE(
- rpc,byname,
+ rpc, byname,
char name[256];
char filter[4096];
- READ_STRING(fp,name);
- log_setrequest("rpc=\"%s\"",name);,
+ READ_STRING(fp, name);
+ log_setrequest("rpc=\"%s\"", name);,
NSLCD_ACTION_RPC_BYNAME,
- mkfilter_rpc_byname(name,filter,sizeof(filter)),
- write_rpc(fp,entry,name)
+ mkfilter_rpc_byname(name, filter, sizeof(filter)),
+ write_rpc(fp, entry, name)
)
NSLCD_HANDLE(
- rpc,bynumber,
+ rpc, bynumber,
int number;
char filter[4096];
- READ_INT32(fp,number);
- log_setrequest("rpc=%lu",(unsigned long int)number);,
+ READ_INT32(fp, number);
+ log_setrequest("rpc=%lu", (unsigned long int)number);,
NSLCD_ACTION_RPC_BYNUMBER,
- mkfilter_rpc_bynumber(number,filter,sizeof(filter)),
- write_rpc(fp,entry,NULL)
+ mkfilter_rpc_bynumber(number, filter, sizeof(filter)),
+ write_rpc(fp, entry, NULL)
)
NSLCD_HANDLE(
- rpc,all,
+ rpc, all,
const char *filter;
log_setrequest("rpc(all)");,
NSLCD_ACTION_RPC_ALL,
- (filter=rpc_filter,0),
- write_rpc(fp,entry,NULL)
+ (filter = rpc_filter, 0),
+ write_rpc(fp, entry, NULL)
)