summaryrefslogtreecommitdiffstats
path: root/gnu/usr.bin/lynx/WWW/Library/Implementation/HTGroup.c
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/usr.bin/lynx/WWW/Library/Implementation/HTGroup.c')
-rw-r--r--gnu/usr.bin/lynx/WWW/Library/Implementation/HTGroup.c570
1 files changed, 274 insertions, 296 deletions
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTGroup.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTGroup.c
index 8f9e4d1d463..81de673e574 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTGroup.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTGroup.c
@@ -1,95 +1,90 @@
-
/* MODULE HTGroup.c
-** GROUP FILE ROUTINES
-**
-** Contains group file parser and routines to match IP
-** address templates and to find out group membership.
-**
-**
-** AUTHORS:
-** AL Ari Luotonen luotonen@dxcern.cern.ch
-**
-** HISTORY:
-**
-**
-** BUGS:
-**
-**
-**
-** GROUP DEFINITION GRAMMAR:
-**
-** string = "sequence of alphanumeric characters"
-** user_name ::= string
-** group_name ::= string
-** group_ref ::= group_name
-** user_def ::= user_name | group_ref
-** user_def_list ::= user_def { ',' user_def }
-** user_part = user_def | '(' user_def_list ')'
-**
-** templ = "sequence of alphanumeric characters and '*'s"
-** ip_number_mask ::= templ '.' templ '.' templ '.' templ
-** domain_name_mask ::= templ { '.' templ }
-** address ::= ip_number_mask | domain_name_mask
-** address_def ::= address
-** address_def_list ::= address_def { ',' address_def }
-** address_part = address_def | '(' address_def_list ')'
-**
-** item ::= [user_part] ['@' address_part]
-** item_list ::= item { ',' item }
-** group_def ::= item_list
-** group_decl ::= group_name ':' group_def
-**
-*/
-
+ * GROUP FILE ROUTINES
+ *
+ * Contains group file parser and routines to match IP
+ * address templates and to find out group membership.
+ *
+ *
+ * AUTHORS:
+ * AL Ari Luotonen luotonen@dxcern.cern.ch
+ *
+ * HISTORY:
+ *
+ *
+ * BUGS:
+ *
+ *
+ *
+ * GROUP DEFINITION GRAMMAR:
+ *
+ * string = "sequence of alphanumeric characters"
+ * user_name ::= string
+ * group_name ::= string
+ * group_ref ::= group_name
+ * user_def ::= user_name | group_ref
+ * user_def_list ::= user_def { ',' user_def }
+ * user_part = user_def | '(' user_def_list ')'
+ *
+ * templ = "sequence of alphanumeric characters and '*'s"
+ * ip_number_mask ::= templ '.' templ '.' templ '.' templ
+ * domain_name_mask ::= templ { '.' templ }
+ * address ::= ip_number_mask | domain_name_mask
+ * address_def ::= address
+ * address_def_list ::= address_def { ',' address_def }
+ * address_part = address_def | '(' address_def_list ')'
+ *
+ * item ::= [user_part] ['@' address_part]
+ * item_list ::= item { ',' item }
+ * group_def ::= item_list
+ * group_decl ::= group_name ':' group_def
+ *
+ */
#include <HTUtils.h>
#include <HTAAUtil.h>
-#include <HTLex.h> /* Lexical analysor */
-#include <HTGroup.h> /* Implemented here */
+#include <HTLex.h> /* Lexical analysor */
+#include <HTGroup.h> /* Implemented here */
#include <LYUtils.h>
#include <LYLeaks.h>
/*
-** Group file parser
-*/
+ * Group file parser
+ */
typedef HTList UserDefList;
typedef HTList AddressDefList;
typedef struct {
- UserDefList * user_def_list;
- AddressDefList * address_def_list;
+ UserDefList *user_def_list;
+ AddressDefList *address_def_list;
} Item;
typedef struct {
- char * name;
- GroupDef * translation;
+ char *name;
+ GroupDef *translation;
} Ref;
-
-
-PRIVATE void syntax_error ARGS3(FILE *, fp,
- char *, msg,
- LexItem, lex_item)
+static void syntax_error(FILE *fp, const char *msg,
+ LexItem lex_item)
{
char buffer[41];
int cnt = 0;
int ch;
- while ((ch = getc(fp)) != EOF && ch != '\n')
- if (cnt < 40) buffer[cnt++] = (char) ch;
- buffer[cnt] = (char)0;
+ while ((ch = getc(fp)) != EOF && ch != '\n')
+ if (cnt < 40)
+ buffer[cnt++] = (char) ch;
+ buffer[cnt] = (char) 0;
CTRACE((tfp, "%s %d before: '%s'\nHTGroup.c: %s (got %s)\n",
- "HTGroup.c: Syntax error in rule file at line",
- HTlex_line, buffer, msg, lex_verbose(lex_item)));
+ "HTGroup.c: Syntax error in rule file at line",
+ HTlex_line, buffer, msg, lex_verbose(lex_item)));
HTlex_line++;
}
-
-PRIVATE AddressDefList *parse_address_part ARGS1(FILE *, fp)
+static AddressDefList *parse_address_part(FILE *fp)
{
AddressDefList *address_def_list = NULL;
LexItem lex_item;
@@ -98,7 +93,7 @@ PRIVATE AddressDefList *parse_address_part ARGS1(FILE *, fp)
lex_item = lex(fp);
if (lex_item == LEX_ALPH_STR || lex_item == LEX_TMPL_STR)
only_one = YES;
- else if (lex_item != LEX_OPEN_PAREN ||
+ else if (lex_item != LEX_OPEN_PAREN ||
((lex_item = lex(fp)) != LEX_ALPH_STR &&
lex_item != LEX_TMPL_STR)) {
syntax_error(fp, "Expecting a single address or '(' beginning list",
@@ -107,23 +102,24 @@ PRIVATE AddressDefList *parse_address_part ARGS1(FILE *, fp)
}
address_def_list = HTList_new();
- for(;;) {
+ for (;;) {
Ref *ref = typecalloc(Ref);
+
if (ref == NULL)
outofmem(__FILE__, "parse_address_part");
ref->name = NULL;
ref->translation = NULL;
StrAllocCopy(ref->name, HTlex_buffer);
- HTList_addObject(address_def_list, (void*)ref);
+ HTList_addObject(address_def_list, (void *) ref);
if (only_one || (lex_item = lex(fp)) != LEX_ITEM_SEP)
break;
/*
- ** Here lex_item == LEX_ITEM_SEP; after item separator it
- ** is ok to have one or more newlines (LEX_REC_SEP) and
- ** they are ignored (continuation line).
- */
+ * Here lex_item == LEX_ITEM_SEP; after item separator it
+ * is ok to have one or more newlines (LEX_REC_SEP) and
+ * they are ignored (continuation line).
+ */
do {
lex_item = lex(fp);
} while (lex_item == LEX_REC_SEP);
@@ -145,8 +141,7 @@ PRIVATE AddressDefList *parse_address_part ARGS1(FILE *, fp)
return address_def_list;
}
-
-PRIVATE UserDefList *parse_user_part ARGS1(FILE *, fp)
+static UserDefList *parse_user_part(FILE *fp)
{
UserDefList *user_def_list = NULL;
LexItem lex_item;
@@ -155,7 +150,7 @@ PRIVATE UserDefList *parse_user_part ARGS1(FILE *, fp)
lex_item = lex(fp);
if (lex_item == LEX_ALPH_STR)
only_one = YES;
- else if (lex_item != LEX_OPEN_PAREN ||
+ else if (lex_item != LEX_OPEN_PAREN ||
(lex_item = lex(fp)) != LEX_ALPH_STR) {
syntax_error(fp, "Expecting a single name or '(' beginning list",
lex_item);
@@ -165,21 +160,22 @@ PRIVATE UserDefList *parse_user_part ARGS1(FILE *, fp)
for (;;) {
Ref *ref = typecalloc(Ref);
+
if (ref == NULL)
outofmem(__FILE__, "parse_user_part");
ref->name = NULL;
ref->translation = NULL;
StrAllocCopy(ref->name, HTlex_buffer);
- HTList_addObject(user_def_list, (void*)ref);
+ HTList_addObject(user_def_list, (void *) ref);
if (only_one || (lex_item = lex(fp)) != LEX_ITEM_SEP)
break;
/*
- ** Here lex_item == LEX_ITEM_SEP; after item separator it
- ** is ok to have one or more newlines (LEX_REC_SEP) and
- ** they are ignored (continuation line).
- */
+ * Here lex_item == LEX_ITEM_SEP; after item separator it
+ * is ok to have one or more newlines (LEX_REC_SEP) and
+ * they are ignored (continuation line).
+ */
do {
lex_item = lex(fp);
} while (lex_item == LEX_REC_SEP);
@@ -201,8 +197,7 @@ PRIVATE UserDefList *parse_user_part ARGS1(FILE *, fp)
return user_def_list;
}
-
-PRIVATE Item *parse_item ARGS1(FILE *, fp)
+static Item *parse_item(FILE *fp)
{
Item *item = NULL;
UserDefList *user_def_list = NULL;
@@ -222,8 +217,7 @@ PRIVATE Item *parse_item ARGS1(FILE *, fp)
lex_item == LEX_OPEN_PAREN) {
unlex(lex_item);
address_def_list = parse_address_part(fp);
- }
- else {
+ } else {
if (user_def_list) {
HTList_delete(user_def_list); /* @@@@ */
user_def_list = NULL;
@@ -232,8 +226,8 @@ PRIVATE Item *parse_item ARGS1(FILE *, fp)
lex_item);
return NULL;
}
- }
- else unlex(lex_item);
+ } else
+ unlex(lex_item);
if (!user_def_list && !address_def_list) {
syntax_error(fp, "Empty item not allowed", lex_item);
@@ -247,30 +241,29 @@ PRIVATE Item *parse_item ARGS1(FILE *, fp)
return item;
}
-
-PRIVATE ItemList *parse_item_list ARGS1(FILE *, fp)
+static ItemList *parse_item_list(FILE *fp)
{
ItemList *item_list = HTList_new();
Item *item;
LexItem lex_item;
- for(;;) {
+ for (;;) {
if (!(item = parse_item(fp))) {
HTList_delete(item_list); /* @@@@ */
item_list = NULL;
return NULL;
}
- HTList_addObject(item_list, (void*)item);
+ HTList_addObject(item_list, (void *) item);
lex_item = lex(fp);
if (lex_item != LEX_ITEM_SEP) {
unlex(lex_item);
return item_list;
}
/*
- ** Here lex_item == LEX_ITEM_SEP; after item separator it
- ** is ok to have one or more newlines (LEX_REC_SEP) and
- ** they are ignored (continuation line).
- */
+ * Here lex_item == LEX_ITEM_SEP; after item separator it
+ * is ok to have one or more newlines (LEX_REC_SEP) and
+ * they are ignored (continuation line).
+ */
do {
lex_item = lex(fp);
} while (lex_item == LEX_REC_SEP);
@@ -278,8 +271,7 @@ PRIVATE ItemList *parse_item_list ARGS1(FILE *, fp)
}
}
-
-PUBLIC GroupDef *HTAA_parseGroupDef ARGS1(FILE *, fp)
+GroupDef *HTAA_parseGroupDef(FILE *fp)
{
ItemList *item_list = NULL;
GroupDef *group_def = NULL;
@@ -301,8 +293,8 @@ PUBLIC GroupDef *HTAA_parseGroupDef ARGS1(FILE *, fp)
return group_def;
}
-
-PRIVATE GroupDef *parse_group_decl ARGS1(FILE *, fp)
+#if 0
+static GroupDef *parse_group_decl(FILE *fp)
{
char *group_name = NULL;
GroupDef *group_def = NULL;
@@ -334,20 +326,18 @@ PRIVATE GroupDef *parse_group_decl ARGS1(FILE *, fp)
return group_def;
}
-
-
/*
-** Group manipulation routines
-*/
+ * Group manipulation routines
+ */
-PRIVATE GroupDef *find_group_def ARGS2(GroupDefList *, group_list,
- CONST char *, group_name)
+static GroupDef *find_group_def(GroupDefList *group_list,
+ const char *group_name)
{
if (group_list && group_name) {
GroupDefList *cur = group_list;
GroupDef *group_def;
- while (NULL != (group_def = (GroupDef*)HTList_nextObject(cur))) {
+ while (NULL != (group_def = (GroupDef *) HTList_nextObject(cur))) {
if (!strcmp(group_name, group_def->group_name)) {
return group_def;
}
@@ -356,19 +346,18 @@ PRIVATE GroupDef *find_group_def ARGS2(GroupDefList *, group_list,
return NULL;
}
-
-PUBLIC void HTAA_resolveGroupReferences ARGS2(GroupDef *, group_def,
- GroupDefList *, group_def_list)
+void HTAA_resolveGroupReferences(GroupDef *group_def,
+ GroupDefList *group_def_list)
{
if (group_def && group_def->item_list && group_def_list) {
ItemList *cur1 = group_def->item_list;
Item *item;
- while (NULL != (item = (Item*)HTList_nextObject(cur1))) {
+ while (NULL != (item = (Item *) HTList_nextObject(cur1))) {
UserDefList *cur2 = item->user_def_list;
Ref *ref;
- while (NULL != (ref = (Ref*)HTList_nextObject(cur2)))
+ while (NULL != (ref = (Ref *) HTList_nextObject(cur2)))
ref->translation = find_group_def(group_def_list, ref->name);
/* Does NOT translate address_def_list */
@@ -376,16 +365,14 @@ PUBLIC void HTAA_resolveGroupReferences ARGS2(GroupDef *, group_def,
}
}
-
-PRIVATE void add_group_def ARGS2(GroupDefList *, group_def_list,
- GroupDef *, group_def)
+static void add_group_def(GroupDefList *group_def_list,
+ GroupDef *group_def)
{
HTAA_resolveGroupReferences(group_def, group_def_list);
- HTList_addObject(group_def_list, (void*)group_def);
+ HTList_addObject(group_def_list, (void *) group_def);
}
-
-PRIVATE GroupDefList *parse_group_file ARGS1(FILE *, fp)
+static GroupDefList *parse_group_file(FILE *fp)
{
GroupDefList *group_def_list = HTList_new();
GroupDef *group_def;
@@ -395,54 +382,55 @@ PRIVATE GroupDefList *parse_group_file ARGS1(FILE *, fp)
return group_def_list;
}
-
+#endif
/*
-** Trace functions
-*/
+ * Trace functions
+ */
-PRIVATE void print_item ARGS1(Item *, item)
+static void print_item(Item *item)
{
if (!item)
fprintf(tfp, "\tNULL-ITEM\n");
else {
UserDefList *cur1 = item->user_def_list;
AddressDefList *cur2 = item->address_def_list;
- Ref *user_ref = (Ref*)HTList_nextObject(cur1);
- Ref *addr_ref = (Ref*)HTList_nextObject(cur2);
+ Ref *user_ref = (Ref *) HTList_nextObject(cur1);
+ Ref *addr_ref = (Ref *) HTList_nextObject(cur2);
if (user_ref) {
fprintf(tfp, "\t[%s%s", user_ref->name,
(user_ref->translation ? "*REF*" : ""));
- while (NULL != (user_ref = (Ref*)HTList_nextObject(cur1)))
+ while (NULL != (user_ref = (Ref *) HTList_nextObject(cur1)))
fprintf(tfp, "; %s%s", user_ref->name,
(user_ref->translation ? "*REF*" : ""));
fprintf(tfp, "] ");
- } else fprintf(tfp, "\tANYBODY ");
+ } else
+ fprintf(tfp, "\tANYBODY ");
if (addr_ref) {
fprintf(tfp, "@ [%s", addr_ref->name);
- while (NULL != (addr_ref = (Ref*)HTList_nextObject(cur2)))
+ while (NULL != (addr_ref = (Ref *) HTList_nextObject(cur2)))
fprintf(tfp, "; %s", addr_ref->name);
fprintf(tfp, "]\n");
- } else fprintf(tfp, "@ ANYADDRESS\n");
+ } else
+ fprintf(tfp, "@ ANYADDRESS\n");
}
}
-
-PRIVATE void print_item_list ARGS1(ItemList *, item_list)
+static void print_item_list(ItemList *item_list)
{
ItemList *cur = item_list;
Item *item;
if (!item_list)
fprintf(tfp, "EMPTY");
- else while (NULL != (item = (Item*)HTList_nextObject(cur)))
- print_item(item);
+ else
+ while (NULL != (item = (Item *) HTList_nextObject(cur)))
+ print_item(item);
}
-
-PUBLIC void HTAA_printGroupDef ARGS1(GroupDef *, group_def)
+void HTAA_printGroupDef(GroupDef *group_def)
{
if (!group_def) {
fprintf(tfp, "\nNULL RECORD\n");
@@ -456,154 +444,149 @@ PUBLIC void HTAA_printGroupDef ARGS1(GroupDef *, group_def)
fprintf(tfp, "\n");
}
-
-PRIVATE void print_group_def_list ARGS1(GroupDefList *, group_list)
+#if 0
+static void print_group_def_list(GroupDefList *group_list)
{
GroupDefList *cur = group_list;
GroupDef *group_def;
- while (NULL != (group_def = (GroupDef*)HTList_nextObject(cur)))
+ while (NULL != (group_def = (GroupDef *) HTList_nextObject(cur)))
HTAA_printGroupDef(group_def);
}
-
-
/*
-** IP address template matching
-*/
-
-/* PRIVATE part_match()
-** MATCH ONE PART OF INET ADDRESS AGAIST
-** A PART OF MASK (inet address has 4 parts)
-** ON ENTRY:
-** tcur pointer to the beginning of template part.
-** icur pointer to the beginning of actual inet
-** number part.
-**
-** ON EXIT:
-** returns YES, if match.
-*/
-PRIVATE BOOL part_match ARGS2(CONST char *, tcur,
- CONST char *, icur)
+ * IP address template matching
+ */
+
+/* static part_match()
+ * MATCH ONE PART OF INET ADDRESS AGAIST
+ * A PART OF MASK (inet address has 4 parts)
+ * ON ENTRY:
+ * tcur pointer to the beginning of template part.
+ * icur pointer to the beginning of actual inet
+ * number part.
+ *
+ * ON EXIT:
+ * returns YES, if match.
+ */
+static BOOL part_match(const char *tcur,
+ const char *icur)
{
char required[4];
char actual[4];
- CONST char *cur;
+ const char *cur;
int cnt;
BOOL status;
- if (!tcur || !icur) return NO;
+ if (!tcur || !icur)
+ return NO;
- cur=tcur;
- cnt=0;
- while (cnt < 3 && *cur && *cur != '.')
+ cur = tcur;
+ cnt = 0;
+ while (cnt < 3 && *cur && *cur != '.')
required[cnt++] = *(cur++);
- required[cnt] = (char)0;
+ required[cnt] = (char) 0;
- cur=icur;
- cnt=0;
- while (cnt < 3 && *cur && *cur != '.')
+ cur = icur;
+ cnt = 0;
+ while (cnt < 3 && *cur && *cur != '.')
actual[cnt++] = *(cur++);
- actual[cnt] = (char)0;
+ actual[cnt] = (char) 0;
status = HTAA_templateMatch(required, actual);
CTRACE((tfp, "part_match: req: '%s' act: '%s' match: %s\n",
- required, actual, (status ? "yes" : "no")));
+ required, actual, (status ? "yes" : "no")));
return status;
}
-
-
-/* PRIVATE ip_number_match()
-** MATCH INET NUMBER AGAINST AN INET NUMBER MASK
-** ON ENTRY:
-** template mask to match agaist, e.g., 128.141.*.*
-** the_inet_addr actual inet address, e.g., 128.141.201.74
-**
-** ON EXIT:
-** returns YES, if match; NO, if not.
-*/
-PRIVATE BOOL ip_number_match ARGS2(CONST char *, template,
- CONST char *, the_inet_addr)
+/* static ip_number_match()
+ * MATCH INET NUMBER AGAINST AN INET NUMBER MASK
+ * ON ENTRY:
+ * template mask to match agaist, e.g., 128.141.*.*
+ * the_inet_addr actual inet address, e.g., 128.141.201.74
+ *
+ * ON EXIT:
+ * returns YES, if match; NO, if not.
+ */
+static BOOL ip_number_match(const char *ctemplate,
+ const char *the_inet_addr)
{
- CONST char *tcur = template;
- CONST char *icur = the_inet_addr;
+ const char *tcur = ctemplate;
+ const char *icur = the_inet_addr;
int cnt;
- for (cnt=0; cnt<4; cnt++) {
+ for (cnt = 0; cnt < 4; cnt++) {
if (!tcur || !icur || !part_match(tcur, icur))
return NO;
- if (NULL != (tcur = strchr(tcur, '.'))) tcur++;
- if (NULL != (icur = strchr(icur, '.'))) icur++;
+ if (NULL != (tcur = strchr(tcur, '.')))
+ tcur++;
+ if (NULL != (icur = strchr(icur, '.')))
+ icur++;
}
return YES;
}
-
-
-/* PRIVATE is_domain_mask()
-** DETERMINE IF A GIVEN MASK IS A
-** DOMAIN NAME MASK OR AN INET NUMBER MASK
-** ON ENTRY:
-** mask either a domain name mask,
-** e.g.
-** *.cern.ch
-**
-** or an inet number mask,
-** e.g.
-** 128.141.*.*
-**
-** ON EXIT:
-** returns YES, if mask is a domain name mask.
-** NO, if it is an inet number mask.
-*/
-PRIVATE BOOL is_domain_mask ARGS1(CONST char *, mask)
+/* static is_domain_mask()
+ * DETERMINE IF A GIVEN MASK IS A
+ * DOMAIN NAME MASK OR AN INET NUMBER MASK
+ * ON ENTRY:
+ * mask either a domain name mask,
+ * e.g.
+ * *.cern.ch
+ *
+ * or an inet number mask,
+ * e.g.
+ * 128.141.*.*
+ *
+ * ON EXIT:
+ * returns YES, if mask is a domain name mask.
+ * NO, if it is an inet number mask.
+ */
+static BOOL is_domain_mask(const char *mask)
{
- CONST char *cur = mask;
+ const char *cur = mask;
- if (!mask) return NO;
+ if (!mask)
+ return NO;
while (*cur) {
- if (*cur != '.' && *cur != '*' && (*cur < '0' || *cur > '9'))
- return YES; /* Even one non-digit makes it a domain name mask */
+ if (*cur != '.' && *cur != '*' && (*cur < '0' || *cur > '9'))
+ return YES; /* Even one non-digit makes it a domain name mask */
cur++;
}
- return NO; /* All digits and dots, so it is an inet number mask */
+ return NO; /* All digits and dots, so it is an inet number mask */
}
-
-
-/* PRIVATE ip_mask_match()
-** MATCH AN IP NUMBER MASK OR IP NAME MASK
-** AGAINST ACTUAL IP NUMBER OR IP NAME
-**
-** ON ENTRY:
-** mask mask. Mask may be either an inet number
-** mask or a domain name mask,
-** e.g.
-** 128.141.*.*
-** or
-** *.cern.ch
-**
-** ip_number IP number of connecting host.
-** ip_name IP name of the connecting host.
-**
-** ON EXIT:
-** returns YES, if hostname/internet number
-** matches the mask.
-** NO, if no match (no fire).
-*/
-PRIVATE BOOL ip_mask_match ARGS3(CONST char *, mask,
- CONST char *, ip_number,
- CONST char *, ip_name)
+/* static ip_mask_match()
+ * MATCH AN IP NUMBER MASK OR IP NAME MASK
+ * AGAINST ACTUAL IP NUMBER OR IP NAME
+ *
+ * ON ENTRY:
+ * mask mask. Mask may be either an inet number
+ * mask or a domain name mask,
+ * e.g.
+ * 128.141.*.*
+ * or
+ * *.cern.ch
+ *
+ * ip_number IP number of connecting host.
+ * ip_name IP name of the connecting host.
+ *
+ * ON EXIT:
+ * returns YES, if hostname/internet number
+ * matches the mask.
+ * NO, if no match (no fire).
+ */
+static BOOL ip_mask_match(const char *mask,
+ const char *ip_number,
+ const char *ip_name)
{
if (mask && (ip_number || ip_name)) {
if (is_domain_mask(mask)) {
if (HTAA_templateMatch(mask, ip_name))
return YES;
- }
- else {
+ } else {
if (ip_number_match(mask, ip_number))
return YES;
}
@@ -611,20 +594,17 @@ PRIVATE BOOL ip_mask_match ARGS3(CONST char *, mask,
return NO;
}
-
-
-
-PRIVATE BOOL ip_in_def_list ARGS3(AddressDefList *, address_def_list,
- char *, ip_number,
- char *, ip_name)
+static BOOL ip_in_def_list(AddressDefList *address_def_list,
+ char *ip_number,
+ char *ip_name)
{
if (address_def_list && (ip_number || ip_name)) {
AddressDefList *cur = address_def_list;
Ref *ref;
- while (NULL != (ref = (Ref*)HTList_nextObject(cur))) {
+ while (NULL != (ref = (Ref *) HTList_nextObject(cur))) {
/* Value of ref->translation is ignored, i.e., */
- /* no recursion for ip address tamplates. */
+ /* no recursion for ip address tamplates. */
if (ip_mask_match(ref->name, ip_number, ip_name))
return YES;
}
@@ -632,50 +612,49 @@ PRIVATE BOOL ip_in_def_list ARGS3(AddressDefList *, address_def_list,
return NO;
}
-
/*
-** Group file cached reading
-*/
+ * Group file cached reading
+ */
typedef struct {
- char * group_filename;
- GroupDefList * group_list;
+ char *group_filename;
+ GroupDefList *group_list;
} GroupCache;
typedef HTList GroupCacheList;
-PRIVATE GroupCacheList *group_cache_list = NULL;
-
+static GroupCacheList *group_cache_list = NULL;
-PUBLIC GroupDefList *HTAA_readGroupFile ARGS1(CONST char *, filename)
+GroupDefList *HTAA_readGroupFile(const char *filename)
{
FILE *fp;
GroupCache *group_cache;
- if (isEmpty(filename)) return NULL;
+ if (isEmpty(filename))
+ return NULL;
if (!group_cache_list)
group_cache_list = HTList_new();
else {
GroupCacheList *cur = group_cache_list;
- while (NULL != (group_cache = (GroupCache*)HTList_nextObject(cur))) {
+ while (NULL != (group_cache = (GroupCache *) HTList_nextObject(cur))) {
if (!strcmp(filename, group_cache->group_filename)) {
CTRACE((tfp, "%s '%s' %s\n",
- "HTAA_readGroupFile: group file",
- filename, "already found in cache"));
+ "HTAA_readGroupFile: group file",
+ filename, "already found in cache"));
return group_cache->group_list;
- } /* if cache match */
- } /* while cached files remain */
- } /* cache exists */
+ } /* if cache match */
+ } /* while cached files remain */
+ } /* cache exists */
CTRACE((tfp, "HTAA_readGroupFile: reading group file `%s'\n",
- filename));
+ filename));
if (!(fp = fopen(filename, TXT_R))) {
CTRACE((tfp, "%s '%s'\n",
- "HTAA_readGroupFile: unable to open group file",
- filename));
+ "HTAA_readGroupFile: unable to open group file",
+ filename));
return NULL;
}
@@ -685,7 +664,7 @@ PUBLIC GroupDefList *HTAA_readGroupFile ARGS1(CONST char *, filename)
group_cache->group_filename = NULL;
StrAllocCopy(group_cache->group_filename, filename);
group_cache->group_list = parse_group_file(fp);
- HTList_addObject(group_cache_list, (void*)group_cache);
+ HTList_addObject(group_cache_list, (void *) group_cache);
fclose(fp);
CTRACE((tfp, "Read group file '%s', results follow:\n", filename));
@@ -695,29 +674,28 @@ PUBLIC GroupDefList *HTAA_readGroupFile ARGS1(CONST char *, filename)
return group_cache->group_list;
}
-
/* PUBLIC HTAA_userAndInetInGroup()
-** CHECK IF USER BELONGS TO TO A GIVEN GROUP
-** AND THAT THE CONNECTION COMES FROM AN
-** ADDRESS THAT IS ALLOWED BY THAT GROUP
-** ON ENTRY:
-** group the group definition structure.
-** username connecting user.
-** ip_number browser host IP number, optional.
-** ip_name browser host IP name, optional.
-** However, one of ip_number or ip_name
-** must be given.
-** ON EXIT:
-** returns HTAA_IP_MASK, if IP address mask was
-** reason for failing.
-** HTAA_NOT_MEMBER, if user does not belong
-** to the group.
-** HTAA_OK if both IP address and user are ok.
-*/
-PUBLIC HTAAFailReasonType HTAA_userAndInetInGroup ARGS4(GroupDef *, group,
- char *, username,
- char *, ip_number,
- char *, ip_name)
+ * CHECK IF USER BELONGS TO TO A GIVEN GROUP
+ * AND THAT THE CONNECTION COMES FROM AN
+ * ADDRESS THAT IS ALLOWED BY THAT GROUP
+ * ON ENTRY:
+ * group the group definition structure.
+ * username connecting user.
+ * ip_number browser host IP number, optional.
+ * ip_name browser host IP name, optional.
+ * However, one of ip_number or ip_name
+ * must be given.
+ * ON EXIT:
+ * returns HTAA_IP_MASK, if IP address mask was
+ * reason for failing.
+ * HTAA_NOT_MEMBER, if user does not belong
+ * to the group.
+ * HTAA_OK if both IP address and user are ok.
+ */
+HTAAFailReasonType HTAA_userAndInetInGroup(GroupDef *group,
+ char *username,
+ char *ip_number,
+ char *ip_name)
{
HTAAFailReasonType reason = HTAA_NOT_MEMBER;
@@ -725,7 +703,7 @@ PUBLIC HTAAFailReasonType HTAA_userAndInetInGroup ARGS4(GroupDef *, group,
ItemList *cur1 = group->item_list;
Item *item;
- while (NULL != (item = (Item*)HTList_nextObject(cur1))) {
+ while (NULL != (item = (Item *) HTList_nextObject(cur1))) {
if (!item->address_def_list || /* Any address allowed */
ip_in_def_list(item->address_def_list, ip_number, ip_name)) {
@@ -735,34 +713,34 @@ PUBLIC HTAAFailReasonType HTAA_userAndInetInGroup ARGS4(GroupDef *, group,
UserDefList *cur2 = item->user_def_list;
Ref *ref;
- while (NULL != (ref = (Ref*)HTList_nextObject(cur2))) {
+ while (NULL != (ref = (Ref *) HTList_nextObject(cur2))) {
- if (ref->translation) { /* Group, check recursively */
+ if (ref->translation) { /* Group, check recursively */
reason = HTAA_userAndInetInGroup(ref->translation,
username,
- ip_number,ip_name);
+ ip_number, ip_name);
if (reason == HTAA_OK)
return HTAA_OK;
- }
- else { /* Username, check directly */
+ } else { /* Username, check directly */
if (username && *username &&
- 0==strcmp(ref->name, username))
+ 0 == strcmp(ref->name, username))
return HTAA_OK;
}
- } /* Every user/group name in this group */
- } /* search for username */
- } /* IP address ok */
- else {
+ /* Every user/group name in this group */
+ }
+ /* search for username */
+ }
+ /* IP address ok */
+ } else {
reason = HTAA_IP_MASK;
}
- } /* while items in group */
- } /* valid parameters */
-
+ } /* while items in group */
+ }
+ /* valid parameters */
return reason; /* No match, or invalid parameters */
}
-
-PUBLIC void GroupDef_delete ARGS1(GroupDef *, group_def)
+void GroupDef_delete(GroupDef *group_def)
{
if (group_def) {
FREE(group_def->group_name);
@@ -773,4 +751,4 @@ PUBLIC void GroupDef_delete ARGS1(GroupDef *, group_def)
FREE(group_def);
}
}
-
+#endif
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.