-const char loaders_rcs[] = "$Id: loaders.c,v 1.17 2001/06/29 13:31:51 oes Exp $";
+const char loaders_rcs[] = "$Id: loaders.c,v 1.18 2001/06/29 21:45:41 oes Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loaders.c,v $
*
* Revisions :
* $Log: loaders.c,v $
+ * Revision 1.18 2001/06/29 21:45:41 oes
+ * Indentation, CRLF->LF, Tab-> Space
+ *
* Revision 1.17 2001/06/29 13:31:51 oes
* Various adaptions
*
static struct file_list *current_trustfile = NULL;
#endif /* def TRUST_FILES */
-#ifdef PCRS
static struct file_list *current_re_filterfile = NULL;
-#endif /* def PCRS */
+
/*********************************************************************
ncsp->actions_list->active = 1;
}
-#ifdef PCRS
- if (ncsp->rlist) /* perl re files */
+ if (ncsp->rlist) /* pcrsjob files */
{
ncsp->rlist->active = 1;
}
-#endif /* def PCRS */
#ifdef TRUST_FILES
if (ncsp->tlist) /* trust files */
#endif /* def TRUST_FILES */
-#ifdef PCRS
/*********************************************************************
*
* Function : unload_re_filterfile
return(-1);
}
-#endif /* def PCRS */
/*********************************************************************
#ifndef _LOADERS_H
#define _LOADERS_H
-#define LOADERS_H_VERSION "$Id: loaders.h,v 1.5 2001/05/31 21:28:49 jongfoster Exp $"
+#define LOADERS_H_VERSION "$Id: loaders.h,v 1.6 2001/06/07 23:14:38 jongfoster Exp $"
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loaders.h,v $
*
* Revisions :
* $Log: loaders.h,v $
+ * Revision 1.6 2001/06/07 23:14:38 jongfoster
+ * Removing ACL and forward file loaders - these files have
+ * been merged into the config file.
+ *
* Revision 1.5 2001/05/31 21:28:49 jongfoster
* Removed all permissionsfile code - it's now called the actions
* file, and (almost) all the code is in actions.c
struct file_list ** newfl);
extern int load_actions_file(struct client_state *csp);
-
+extern int load_re_filterfile(struct client_state *csp);
+
#ifdef TRUST_FILES
extern int load_trustfile(struct client_state *csp);
#endif /* def TRUST_FILES */
-#ifdef PCRS
-extern int load_re_filterfile(struct client_state *csp);
-#endif /* def PCRS */
+
extern int create_url_spec(struct url_spec * url, char * buf);
extern void free_url(struct url_spec *url);
#ifndef _PARSERS_H
#define _PARSERS_H
-#define PARSERS_H_VERSION "$Id: parsers.h,v 1.6 2001/06/03 19:12:38 oes Exp $"
+#define PARSERS_H_VERSION "$Id: parsers.h,v 1.7 2001/06/29 13:32:14 oes Exp $"
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/parsers.h,v $
*
* Revisions :
* $Log: parsers.h,v $
+ * Revision 1.7 2001/06/29 13:32:14 oes
+ * Removed logentry from cancelled commit
+ *
* Revision 1.6 2001/06/03 19:12:38 oes
* deleted const struct interceptors
*
extern void client_x_forwarded_adder(struct client_state *csp);
extern char *server_set_cookie(const struct parsers *v, char *s, struct client_state *csp);
-#if defined(PCRS) || defined(KILLPOPUPS)
extern char *content_type(const struct parsers *v, char *s, struct client_state *csp);
-#endif /* defined(PCRS) || defined(KILLPOPUPS) */
-
-#ifdef PCRS
extern char *content_length(const struct parsers *v, char *s, struct client_state *csp);
-#endif /* def PCRS */
#ifdef FORCE_LOAD
char *client_host(const struct parsers *v, char *s, struct client_state *csp);
-const char w32log_rcs[] = "$Id: w32log.c,v 1.10 2001/05/31 21:37:11 jongfoster Exp $";
+const char w32log_rcs[] = "$Id: w32log.c,v 1.11 2001/06/07 23:08:12 jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/w32log.c,v $
*
* Revisions :
* $Log: w32log.c,v $
+ * Revision 1.11 2001/06/07 23:08:12 jongfoster
+ * Forward and ACL edit options removed.
+ *
* Revision 1.10 2001/05/31 21:37:11 jongfoster
* GUI changes to rename "permissions file" to "actions file".
*
/* FIXME: this is a kludge */
const char * g_actions_file = NULL;
-#ifdef PCRS
const char * g_re_filterfile = NULL;
-#endif
#ifdef TRUST_FILES
const char * g_trustfile = NULL;
#endif /* def TRUST_FILES */
EditFile(g_actions_file);
break;
-#ifdef PCRS
case ID_TOOLS_EDITPERLRE:
EditFile(g_re_filterfile);
break;
-#endif
#ifdef TRUST_FILES
case ID_TOOLS_EDITTRUST:
{
/* Only enable editors if there is a file to edit */
EnableMenuItem(hmenu, ID_TOOLS_EDITACTIONS, MF_BYCOMMAND | (g_actions_file ? MF_ENABLED : MF_GRAYED));
-#ifdef PCRS
EnableMenuItem(hmenu, ID_TOOLS_EDITPERLRE, MF_BYCOMMAND | (g_re_filterfile ? MF_ENABLED : MF_GRAYED));
-#endif
#ifdef TRUST_FILES
EnableMenuItem(hmenu, ID_TOOLS_EDITTRUST, MF_BYCOMMAND | (g_trustfile ? MF_ENABLED : MF_GRAYED));
#endif /* def TRUST_FILES */
#ifndef _W32LOG_H
#define _W32LOG_H
-#define W32LOG_H_VERSION "$Id: w32log.h,v 1.4 2001/05/31 21:37:11 jongfoster Exp $"
+#define W32LOG_H_VERSION "$Id: w32log.h,v 1.5 2001/06/07 23:08:12 jongfoster Exp $"
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/w32log.h,v $
*
* Revisions :
* $Log: w32log.h,v $
+ * Revision 1.5 2001/06/07 23:08:12 jongfoster
+ * Forward and ACL edit options removed.
+ *
* Revision 1.4 2001/05/31 21:37:11 jongfoster
* GUI changes to rename "permissions file" to "actions file".
*
/* FIXME: this is a kludge */
extern const char * g_actions_file;
-#ifdef PCRS
extern const char * g_re_filterfile;
-#endif
#ifdef TRUST_FILES
extern const char * g_trustfile;
#endif /* def TRUST_FILES */
/* FIXME: end kludge */
-
extern int LogPutString(const char *pszText);
extern BOOL InitLogWindow(void);
extern void TermLogWindow(void);
#ifndef _W32RES_H
#define _W32RES_H
-#define W32RES_H_VERSION "$Id: w32res.h,v 1.6 2001/05/31 21:37:11 jongfoster Exp $"
+#define W32RES_H_VERSION "$Id: w32res.h,v 1.7 2001/06/07 23:08:12 jongfoster Exp $"
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/w32res.h,v $
*
* Revisions :
* $Log: w32res.h,v $
+ * Revision 1.7 2001/06/07 23:08:12 jongfoster
+ * Forward and ACL edit options removed.
+ *
* Revision 1.6 2001/05/31 21:37:11 jongfoster
* GUI changes to rename "permissions file" to "actions file".
*
/* Break these out so they are easier to extend, but keep consecutive */
#define ID_TOOLS_EDITJUNKBUSTER 5000
#define ID_TOOLS_EDITACTIONS 5001
-
-#ifdef PCRS
#define ID_TOOLS_EDITPERLRE 5002
-#endif /* def PCRS */
#ifdef TRUST_FILES
#define ID_TOOLS_EDITTRUST 5003