emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

* lib/gshadow.c: nis_used and nis_bound are booleans.

Browse Source 
* lib/gshadow.c: Avoid implicit conversion of pointers / integers to booleans.
	* lib/gshadow.c: Avoid assignments in comparisons.
	* lib/gshadow.c: Add brackets.
This commit is contained in:
nekral-guest 2008-05-26 08:40:04 +00:00
parent ef5e803875
commit 383ea561f8
2 changed files with 76 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,11 @@
2008-05-26 Nicolas François <nicolas.francois@centraliens.net>
* lib/gshadow.c: nis_used and nis_bound are booleans.
* lib/gshadow.c: Avoid implicit conversion of pointers / integers
to booleans.
* lib/gshadow.c: Avoid assignments in comparisons.
* lib/gshadow.c: Add brackets.
2008-05-26 Nicolas François <nicolas.francois@centraliens.net> 2008-05-26 Nicolas François <nicolas.francois@centraliens.net>
* lib/groupio.c: The changed, isopen, locked, and readonly fields * lib/groupio.c: The changed, isopen, locked, and readonly fields
@ -6,8 +14,8 @@
2008-05-26 Nicolas François <nicolas.francois@centraliens.net> 2008-05-26 Nicolas François <nicolas.francois@centraliens.net>
* lib/sgetgrent.c: implicit conversion of pointers / chars to * lib/sgetgrent.c: Avoid implicit conversion of pointers / chars
booleans. to booleans.
* lib/sgetgrent.c: Avoid assignments in comparisons. * lib/sgetgrent.c: Avoid assignments in comparisons.
* lib/sgetgrent.c: Add brackets. * lib/sgetgrent.c: Add brackets.

107
lib/gshadow.c
View File

@ -51,10 +51,10 @@ static struct sgrp sgroup;
#define FIELDS 4 #define FIELDS 4
#ifdef USE_NIS #ifdef USE_NIS
static int nis_used; static bool nis_used;
static int nis_ignore; static int nis_ignore;
static enum { native, start, middle, native2 } nis_state; static enum { native, start, middle, native2 } nis_state;
static int nis_bound; static bool nis_bound;
static char *nis_domain; static char *nis_domain;
static char *nis_key; static char *nis_key;
static int nis_keylen; static int nis_keylen;
@ -74,8 +74,9 @@ void __setsgNIS (int flag)
{ {
nis_ignore = !flag; nis_ignore = !flag;
if (nis_ignore) if (nis_ignore) {
nis_used = 0; nis_used = false;
}
} }
/* /*
@ -87,7 +88,7 @@ static int bind_nis (void)
if (yp_get_default_domain (&nis_domain)) if (yp_get_default_domain (&nis_domain))
return -1; return -1;
nis_bound = 1; nis_bound = true;
return 0; return 0;
} }
#endif #endif
@ -120,16 +121,18 @@ void setsgent (void)
#ifdef USE_NIS #ifdef USE_NIS
nis_state = native; nis_state = native;
#endif #endif
if (shadow) if (NULL != shadow) {
rewind (shadow); rewind (shadow);
else } else {
shadow = fopen (SGROUP_FILE, "r"); shadow = fopen (SGROUP_FILE, "r");
}
} }
void endsgent (void) void endsgent (void)
{ {
if (shadow) if (NULL != shadow) {
(void) fclose (shadow); (void) fclose (shadow);
}
shadow = (FILE *) 0; shadow = (FILE *) 0;
} }
@ -143,18 +146,22 @@ struct sgrp *sgetsgent (const char *string)
strncpy (sgrbuf, string, (int) sizeof sgrbuf - 1); strncpy (sgrbuf, string, (int) sizeof sgrbuf - 1);
sgrbuf[sizeof sgrbuf - 1] = '\0'; sgrbuf[sizeof sgrbuf - 1] = '\0';
if ((cp = strrchr (sgrbuf, '\n'))) cp = strrchr (sgrbuf, '\n');
if (NULL != cp) {
*cp = '\0'; *cp = '\0';
}
/* /*
* There should be exactly 4 colon separated fields. Find * There should be exactly 4 colon separated fields. Find
* all 4 of them and save the starting addresses in fields[]. * all 4 of them and save the starting addresses in fields[].
*/ */
for (cp = sgrbuf, i = 0; i < FIELDS && cp; i++) { for (cp = sgrbuf, i = 0; (i < FIELDS) && (NULL != cp); i++) {
fields[i] = cp; fields[i] = cp;
if ((cp = strchr (cp, ':'))) cp = strchr (cp, ':');
if (NULL != cp) {
*cp++ = '\0'; *cp++ = '\0';
}
} }
/* /*
@ -162,24 +169,25 @@ struct sgrp *sgetsgent (const char *string)
* the line is invalid. * the line is invalid.
*/ */
if (cp || i != FIELDS) if ((NULL != cp) || (i != FIELDS))
#ifdef USE_NIS #ifdef USE_NIS
if (!IS_NISCHAR (fields[0][0])) if (!IS_NISCHAR (fields[0][0])) {
return 0; return 0;
else } else {
nis_used = 1; nis_used = true;
}
#else #else
return 0; return 0;
#endif #endif
sgroup.sg_name = fields[0]; sgroup.sg_name = fields[0];
sgroup.sg_passwd = fields[1]; sgroup.sg_passwd = fields[1];
if (nadmins) { if (0 != nadmins) {
nadmins = 0; nadmins = 0;
free (admins); free (admins);
admins = NULL; admins = NULL;
} }
if (nmembers) { if (0 != nmembers) {
nmembers = 0; nmembers = 0;
free (members); free (members);
members = NULL; members = NULL;
@ -202,8 +210,9 @@ struct sgrp *fgetsgent (FILE * fp)
char buf[sizeof sgrbuf]; char buf[sizeof sgrbuf];
char *cp; char *cp;
if (!fp) if (NULL == fp) {
return (0); return (0);
}
#ifdef USE_NIS #ifdef USE_NIS
while (fgetsx (buf, sizeof buf, fp) != (char *) 0) while (fgetsx (buf, sizeof buf, fp) != (char *) 0)
@ -211,11 +220,14 @@ struct sgrp *fgetsgent (FILE * fp)
if (fgetsx (buf, sizeof buf, fp) != (char *) 0) if (fgetsx (buf, sizeof buf, fp) != (char *) 0)
#endif #endif
{ {
if ((cp = strchr (buf, '\n'))) cp = strchr (buf, '\n');
if (NULL != cp) {
*cp = '\0'; *cp = '\0';
}
#ifdef USE_NIS #ifdef USE_NIS
if (nis_ignore && IS_NISCHAR (buf[0])) if ((0 != nis_ignore) && IS_NISCHAR (buf[0])) {
continue; continue;
}
#endif #endif
return (sgetsgent (buf)); return (sgetsgent (buf));
} }
@ -233,8 +245,9 @@ struct sgrp *getsgent (void)
struct sgrp *val; struct sgrp *val;
char buf[BUFSIZ]; char buf[BUFSIZ];
#endif #endif
if (!shadow) if (NULL == shadow) {
setsgent (); setsgent ();
}
#ifdef USE_NIS #ifdef USE_NIS
again: again:
@ -249,8 +262,10 @@ struct sgrp *getsgent (void)
* NULL right away if there is none. * NULL right away if there is none.
*/ */
if (!(val = fgetsgent (shadow))) val = fgetsgent (shadow);
if (NULL == val) {
return 0; return 0;
}
/* /*
* If this entry began with a NIS escape character, we have * If this entry began with a NIS escape character, we have
@ -259,10 +274,11 @@ struct sgrp *getsgent (void)
*/ */
if (IS_NISCHAR (val->sg_name[0])) { if (IS_NISCHAR (val->sg_name[0])) {
if (val->sg_name[1]) if ('\0' != val->sg_name[1]) {
nis_1_group = 1; nis_1_group = 1;
else } else {
nis_state = start; nis_state = start;
}
} }
/* /*
@ -287,7 +303,7 @@ struct sgrp *getsgent (void)
return 0; return 0;
} else { } else {
if (nis_bound == 0) { if (!nis_bound) {
if (bind_nis ()) { if (bind_nis ()) {
nis_state = native2; nis_state = native2;
goto again; goto again;
@ -339,8 +355,9 @@ struct sgrp *getsgnam (const char *name)
* Search the gshadow.byname map for this group. * Search the gshadow.byname map for this group.
*/ */
if (!nis_bound) if (!nis_bound) {
bind_nis (); bind_nis ();
}
if (nis_bound) { if (nis_bound) {
char *cp; char *cp;
@ -348,11 +365,14 @@ struct sgrp *getsgnam (const char *name)
if (yp_match (nis_domain, "gshadow.byname", name, if (yp_match (nis_domain, "gshadow.byname", name,
strlen (name), &nis_val, strlen (name), &nis_val,
&nis_vallen) == 0) { &nis_vallen) == 0) {
if (cp = strchr (nis_val, '\n')) cp = strchr (nis_val, '\n');
if (NULL != cp) {
*cp = '\0'; *cp = '\0';
}
nis_state = middle; nis_state = middle;
if (sgrp = sgetsgent (nis_val)) { sgrp = sgetsgent (nis_val);
if (NULL != sgrp) {
strcpy (save_name, sgrp->sg_name); strcpy (save_name, sgrp->sg_name);
nis_key = save_name; nis_key = save_name;
nis_keylen = strlen (save_name); nis_keylen = strlen (save_name);
@ -366,19 +386,18 @@ struct sgrp *getsgnam (const char *name)
#ifdef USE_NIS #ifdef USE_NIS
if (nis_used) { if (nis_used) {
nis_ignore++; nis_ignore++;
nis_disabled++; nis_disabled = true;
} }
#endif #endif
while ((sgrp = getsgent ()) != (struct sgrp *) 0) { while ((sgrp = getsgent ()) != (struct sgrp *) 0) {
if (strcmp (name, sgrp->sg_name) == 0) if (strcmp (name, sgrp->sg_name) == 0) {
break; break;
}
} }
#ifdef USE_NIS #ifdef USE_NIS
nis_ignore--; nis_ignore--;
#endif #endif
if (sgrp) return sgrp;
return sgrp;
return (0);
} }
/* /*
@ -395,19 +414,23 @@ int putsgent (const struct sgrp *sgrp, FILE * fp)
int i; int i;
size_t size; size_t size;
if (!fp || !sgrp) if ((NULL == fp) || (NULL == sgrp)) {
return -1; return -1;
}
/* calculate the required buffer size */ /* calculate the required buffer size */
size = strlen (sgrp->sg_name) + strlen (sgrp->sg_passwd) + 10; size = strlen (sgrp->sg_name) + strlen (sgrp->sg_passwd) + 10;
for (i = 0; sgrp->sg_adm && sgrp->sg_adm[i]; i++) for (i = 0; (NULL != sgrp->sg_adm) && (NULL != sgrp->sg_adm[i]); i++) {
size += strlen (sgrp->sg_adm[i]) + 1; size += strlen (sgrp->sg_adm[i]) + 1;
for (i = 0; sgrp->sg_mem && sgrp->sg_mem[i]; i++) }
for (i = 0; (NULL != sgrp->sg_mem) && (NULL != sgrp->sg_mem[i]); i++) {
size += strlen (sgrp->sg_mem[i]) + 1; size += strlen (sgrp->sg_mem[i]) + 1;
}
buf = malloc (size); buf = malloc (size);
if (!buf) if (NULL == buf) {
return -1; return -1;
}
cp = buf; cp = buf;
/* /*
@ -427,9 +450,10 @@ int putsgent (const struct sgrp *sgrp, FILE * fp)
* with a ",". * with a ",".
*/ */
for (i = 0; sgrp->sg_adm[i]; i++) { for (i = 0; NULL != sgrp->sg_adm[i]; i++) {
if (i > 0) if (i > 0) {
*cp++ = ','; *cp++ = ',';
}
strcpy (cp, sgrp->sg_adm[i]); strcpy (cp, sgrp->sg_adm[i]);
cp += strlen (cp); cp += strlen (cp);
@ -440,9 +464,10 @@ int putsgent (const struct sgrp *sgrp, FILE * fp)
* Now do likewise with the group members. * Now do likewise with the group members.
*/ */
for (i = 0; sgrp->sg_mem[i]; i++) { for (i = 0; NULL != sgrp->sg_mem[i]; i++) {
if (i > 0) if (i > 0) {
*cp++ = ','; *cp++ = ',';
}
strcpy (cp, sgrp->sg_mem[i]); strcpy (cp, sgrp->sg_mem[i]);
cp += strlen (cp); cp += strlen (cp);