aboutsummaryrefslogtreecommitdiff
path: root/nis
diff options
context:
space:
mode:
Diffstat (limited to 'nis')
-rw-r--r--nis/nis_call.c4
-rw-r--r--nis/nis_callback.c4
-rw-r--r--nis/nis_defaults.c16
-rw-r--r--nis/nis_findserv.c6
-rw-r--r--nis/nis_ismember.c4
-rw-r--r--nis/nis_local_names.c4
-rw-r--r--nis/nss_nis/nis-rpc.c6
-rw-r--r--nis/nss_nisplus/nisplus-netgrp.c18
-rw-r--r--nis/ypclnt.c24
9 files changed, 43 insertions, 43 deletions
diff --git a/nis/nis_call.c b/nis/nis_call.c
index 58e3a4d..c1cfd8d 100644
--- a/nis/nis_call.c
+++ b/nis/nis_call.c
@@ -317,8 +317,8 @@ __do_niscall3 (dir_binding *dbp, u_long prog, xdrproc_t xargs, caddr_t req,
switch (prog)
{
case NIS_IBLIST:
- if ((((nis_result *)resp)->status == NIS_CBRESULTS) &&
- (cb != NULL))
+ if ((((nis_result *)resp)->status == NIS_CBRESULTS)
+ && (cb != NULL))
{
__nis_do_callback (dbp, &((nis_result *) resp)->cookie, cb);
break;
diff --git a/nis/nis_callback.c b/nis/nis_callback.c
index 1668e29..0a78b1c 100644
--- a/nis/nis_callback.c
+++ b/nis/nis_callback.c
@@ -130,8 +130,8 @@ cb_prog_1 (struct svc_req *rqstp, SVCXPRT *transp)
for (i = 0; i < argument.cbproc_receive_1_arg.entries.entries_len; ++i)
{
#define cbproc_entry(a) argument.cbproc_receive_1_arg.entries.entries_val[a]
- char name[strlen (cbproc_entry(i)->zo_name) +
- strlen (cbproc_entry(i)->zo_domain) + 3];
+ char name[strlen (cbproc_entry(i)->zo_name)
+ + strlen (cbproc_entry(i)->zo_domain) + 3];
char *cp;
cp = stpcpy (name, cbproc_entry(i)->zo_name);
diff --git a/nis/nis_defaults.c b/nis/nis_defaults.c
index 5d591cf..9313bb0 100644
--- a/nis/nis_defaults.c
+++ b/nis/nis_defaults.c
@@ -278,18 +278,18 @@ searchaccess (char *str, unsigned int access)
cptr++; /* Remove "=" from beginning */
/* Clear */
if (n)
- result = result & ~((NIS_READ_ACC + NIS_MODIFY_ACC +
- NIS_CREATE_ACC + NIS_DESTROY_ACC) << 24);
+ result = result & ~((NIS_READ_ACC + NIS_MODIFY_ACC
+ + NIS_CREATE_ACC + NIS_DESTROY_ACC) << 24);
if (o)
- result = result & ~((NIS_READ_ACC + NIS_MODIFY_ACC +
- NIS_CREATE_ACC + NIS_DESTROY_ACC) << 16);
+ result = result & ~((NIS_READ_ACC + NIS_MODIFY_ACC
+ + NIS_CREATE_ACC + NIS_DESTROY_ACC) << 16);
if (g)
- result = result & ~((NIS_READ_ACC + NIS_MODIFY_ACC +
- NIS_CREATE_ACC + NIS_DESTROY_ACC) << 8);
+ result = result & ~((NIS_READ_ACC + NIS_MODIFY_ACC
+ + NIS_CREATE_ACC + NIS_DESTROY_ACC) << 8);
if (w)
- result = result & ~(NIS_READ_ACC + NIS_MODIFY_ACC +
- NIS_CREATE_ACC + NIS_DESTROY_ACC);
+ result = result & ~(NIS_READ_ACC + NIS_MODIFY_ACC
+ + NIS_CREATE_ACC + NIS_DESTROY_ACC);
while (*cptr != '\0' && *cptr != ',')
{
switch (*cptr)
diff --git a/nis/nis_findserv.c b/nis/nis_findserv.c
index 043b303..5a76a13 100644
--- a/nis/nis_findserv.c
+++ b/nis/nis_findserv.c
@@ -97,9 +97,9 @@ __nis_findfastest_with_timeout (dir_binding *bind,
for (i = 0; i < bind->server_len; i++)
for (j = 0; j < bind->server_val[i].ep.ep_len; ++j)
if (strcmp (bind->server_val[i].ep.ep_val[j].family, "inet") == 0)
- if ((bind->server_val[i].ep.ep_val[j].proto == NULL) ||
- (bind->server_val[i].ep.ep_val[j].proto[0] == '-') ||
- (bind->server_val[i].ep.ep_val[j].proto[0] == '\0'))
+ if ((bind->server_val[i].ep.ep_val[j].proto == NULL)
+ || (bind->server_val[i].ep.ep_val[j].proto[0] == '-')
+ || (bind->server_val[i].ep.ep_val[j].proto[0] == '\0'))
{
sin.sin_addr.s_addr =
inetstr2int (bind->server_val[i].ep.ep_val[j].uaddr);
diff --git a/nis/nis_ismember.c b/nis/nis_ismember.c
index 8f05c33..4ed27a4 100644
--- a/nis/nis_ismember.c
+++ b/nis/nis_ismember.c
@@ -51,8 +51,8 @@ internal_ismember (const_nis_name principal, const_nis_name group)
return 0;
}
- if ((NIS_RES_NUMOBJ (res) != 1) ||
- (__type_of (NIS_RES_OBJECT (res)) != NIS_GROUP_OBJ))
+ if ((NIS_RES_NUMOBJ (res) != 1)
+ || (__type_of (NIS_RES_OBJECT (res)) != NIS_GROUP_OBJ))
{
nis_freeresult (res);
return 0;
diff --git a/nis/nis_local_names.c b/nis/nis_local_names.c
index bfba625..49c3361 100644
--- a/nis/nis_local_names.c
+++ b/nis/nis_local_names.c
@@ -106,8 +106,8 @@ nis_local_principal (void)
buf[len] = '\0';
}
- res = nis_list (buf, USE_DGRAM + NO_AUTHINFO + FOLLOW_LINKS +
- FOLLOW_PATH, NULL, NULL);
+ res = nis_list (buf, USE_DGRAM + NO_AUTHINFO + FOLLOW_LINKS
+ + FOLLOW_PATH, NULL, NULL);
if (res == NULL)
goto nobody;
diff --git a/nis/nss_nis/nis-rpc.c b/nis/nss_nis/nis-rpc.c
index f0aac2e..25144a5 100644
--- a/nis/nss_nis/nis-rpc.c
+++ b/nis/nss_nis/nis-rpc.c
@@ -197,9 +197,9 @@ _nss_nis_getrpcbyname_r (const char *name, struct rpcent *rpc,
return status;
int found = 0;
- while (!found &&
- ((status = internal_nis_getrpcent_r (rpc, buffer, buflen, errnop,
- &data)) == NSS_STATUS_SUCCESS))
+ while (!found
+ && ((status = internal_nis_getrpcent_r (rpc, buffer, buflen, errnop,
+ &data)) == NSS_STATUS_SUCCESS))
{
if (strcmp (rpc->r_name, name) == 0)
found = 1;
diff --git a/nis/nss_nisplus/nisplus-netgrp.c b/nis/nss_nisplus/nisplus-netgrp.c
index 99c0932..3ca8643 100644
--- a/nis/nss_nisplus/nisplus-netgrp.c
+++ b/nis/nss_nisplus/nisplus-netgrp.c
@@ -87,9 +87,9 @@ _nss_nisplus_getnetgrent_r (struct __netgrent *result, char *buffer,
result->type = triple_val;
- if (hostlen == 0 ||
- NISENTRYVAL (result->position, 2,
- (nis_result *) result->data)[0] == '\0')
+ if (hostlen == 0
+ || NISENTRYVAL (result->position, 2,
+ (nis_result *) result->data)[0] == '\0')
result->val.triple.host = NULL;
else
{
@@ -100,9 +100,9 @@ _nss_nisplus_getnetgrent_r (struct __netgrent *result, char *buffer,
*cp++ = '\0';
}
- if (userlen == 0 ||
- NISENTRYVAL (result->position, 3,
- (nis_result *) result->data)[0] == '\0')
+ if (userlen == 0
+ || NISENTRYVAL (result->position, 3,
+ (nis_result *) result->data)[0] == '\0')
result->val.triple.user = NULL;
else
{
@@ -113,9 +113,9 @@ _nss_nisplus_getnetgrent_r (struct __netgrent *result, char *buffer,
*cp++ = '\0';
}
- if (domainlen == 0 ||
- NISENTRYVAL (result->position, 4,
- (nis_result *) result->data)[0] == '\0')
+ if (domainlen == 0
+ || NISENTRYVAL (result->position, 4,
+ (nis_result *) result->data)[0] == '\0')
result->val.triple.domain = NULL;
else
{
diff --git a/nis/ypclnt.c b/nis/ypclnt.c
index 210daeb..3201e37 100644
--- a/nis/ypclnt.c
+++ b/nis/ypclnt.c
@@ -436,9 +436,9 @@ yp_match (const char *indomain, const char *inmap, const char *inkey,
ypresp_val resp;
enum clnt_stat result;
- if (indomain == NULL || indomain[0] == '\0' ||
- inmap == NULL || inmap[0] == '\0' ||
- inkey == NULL || inkey[0] == '\0' || inkeylen <= 0)
+ if (indomain == NULL || indomain[0] == '\0'
+ || inmap == NULL || inmap[0] == '\0'
+ || inkey == NULL || inkey[0] == '\0' || inkeylen <= 0)
return YPERR_BADARGS;
req.domain = (char *) indomain;
@@ -481,8 +481,8 @@ yp_first (const char *indomain, const char *inmap, char **outkey,
ypresp_key_val resp;
enum clnt_stat result;
- if (indomain == NULL || indomain[0] == '\0' ||
- inmap == NULL || inmap[0] == '\0')
+ if (indomain == NULL || indomain[0] == '\0'
+ || inmap == NULL || inmap[0] == '\0')
return YPERR_BADARGS;
req.domain = (char *) indomain;
@@ -537,9 +537,9 @@ yp_next (const char *indomain, const char *inmap, const char *inkey,
ypresp_key_val resp;
enum clnt_stat result;
- if (indomain == NULL || indomain[0] == '\0' ||
- inmap == NULL || inmap[0] == '\0' ||
- inkeylen <= 0 || inkey == NULL || inkey[0] == '\0')
+ if (indomain == NULL || indomain[0] == '\0'
+ || inmap == NULL || inmap[0] == '\0'
+ || inkeylen <= 0 || inkey == NULL || inkey[0] == '\0')
return YPERR_BADARGS;
req.domain = (char *) indomain;
@@ -592,8 +592,8 @@ yp_master (const char *indomain, const char *inmap, char **outname)
ypresp_master resp;
enum clnt_stat result;
- if (indomain == NULL || indomain[0] == '\0' ||
- inmap == NULL || inmap[0] == '\0')
+ if (indomain == NULL || indomain[0] == '\0'
+ || inmap == NULL || inmap[0] == '\0')
return YPERR_BADARGS;
req.domain = (char *) indomain;
@@ -622,8 +622,8 @@ yp_order (const char *indomain, const char *inmap, unsigned int *outorder)
struct ypresp_order resp;
enum clnt_stat result;
- if (indomain == NULL || indomain[0] == '\0' ||
- inmap == NULL || inmap[0] == '\0')
+ if (indomain == NULL || indomain[0] == '\0'
+ || inmap == NULL || inmap[0] == '\0')
return YPERR_BADARGS;
req.domain = (char *) indomain;