From 6c20b8223005e1c298c625e3dcc827f533df0b95 Mon Sep 17 00:00:00 2001
From: wessels <>
Date: Tue, 18 Aug 1998 05:27:58 +0000
Subject: [PATCH] make authenticate_program a wordlist so it includes the
 options

---
 src/cache_cf.cc |  6 +++---
 src/cf.data.pre | 33 +++++++++++++++------------------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 119cb28b11..eae709f8ed 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.cc,v 1.297 1998/08/17 22:04:55 wessels Exp $
+ * $Id: cache_cf.cc,v 1.298 1998/08/17 23:27:58 wessels Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -270,7 +270,7 @@ configDoConfigure(void)
     if (Config.Program.authenticate) {
 	if (Config.authenticateChildren < 1) {
 	    Config.authenticateChildren = 0;
-	    safe_free(Config.Program.authenticate);
+	    wordlistDestroy(&Config.Program.authenticate);
 	} else if (Config.authenticateChildren > DefaultAuthenticateChildrenMax) {
 	    debug(3, 0) ("WARNING: authenticate_children was set to a bad value: %d\n",
 		Config.authenticateChildren);
@@ -323,7 +323,7 @@ configDoConfigure(void)
     if (Config.Program.redirect)
 	requirePathnameExists("redirect_program", Config.Program.redirect);
     if (Config.Program.authenticate)
-	requirePathnameExists("authenticate_program", Config.Program.authenticate);
+	requirePathnameExists("authenticate_program", Config.Program.authenticate->key);
     requirePathnameExists("Icon Directory", Config.icons.directory);
     requirePathnameExists("Error Directory", Config.errorDirectory);
     for (R = Config.Refresh; R; R = R->next) {
diff --git a/src/cf.data.pre b/src/cf.data.pre
index f2170e4ae8..26fcb225c5 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.97 1998/08/17 22:04:56 wessels Exp $
+# $Id: cf.data.pre,v 1.98 1998/08/17 23:27:59 wessels Exp $
 #
 #
 # SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -922,32 +922,29 @@ redirect_children 5
 DOC_END
 
 NAME: authenticate_program
-TYPE: string
+TYPE: wordlist
 LOC: Config.Program.authenticate
 DEFAULT: none
 DOC_START
-	Specify the location of the executable for the authenticator.
-	Such a program reads a line containing "username password"
-	and replies "OK" or "ERR" in an endless loop.
-	If you use an authenticator, make sure you have 1 acl of type
-	proxy_auth.
-	By default, the authenticator_program is not used.
+	Specify the command for the external authenticator.  Such a
+	program reads a line containing "username password" and replies
+	"OK" or "ERR" in an endless loop.  If you use an authenticator,
+	make sure you have 1 acl of type proxy_auth.  By default, the
+	authenticator_program is not used.
 
-authenticate_program @DEFAULT_AUTH_PROGRAM@
-DOC_END
+	If you want to use the traditional proxy authentication,
+	jump over to the ../auth_modules/NCSA directory and
+	type:
+		% make
+		% make install
 
+	Then, set this line to something like
 
-NAME: authenticate_options
-TYPE: wordlist
-LOC: Config.Program.authenticate_options
-DEFAULT: none
-DOC_START
-	Command line options for the authenticate program.
+	authenticate_program @DEFAULT_PREFIX@/bin/ncsa_auth @DEFAULT_PREFIX@/etc/passwd
 
-authenticate_options @DEFAULT_PASSWD_FILE@
+authenticate_program none
 DOC_END
 
-
 NAME: authenticate_children
 TYPE: int
 DEFAULT: 5
-- 
2.47.3