From: hno <>
Date: Thu, 27 Jun 2002 00:44:27 +0000 (+0000)
Subject: Automake integration for the msntauth config file
X-Git-Tag: SQUID_3_0_PRE1~939
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90528dba400c86b59c146b07e000e13988f678b9;p=thirdparty%2Fsquid.git

Automake integration for the msntauth config file
 - Look for it in our prefix
 - Install the default template
---

diff --git a/helpers/basic_auth/MSNT/Makefile.am b/helpers/basic_auth/MSNT/Makefile.am
index c2515a2b81..8d2034dd3a 100644
--- a/helpers/basic_auth/MSNT/Makefile.am
+++ b/helpers/basic_auth/MSNT/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.7 2002/06/26 11:00:37 hno Exp $
+#  $Id: Makefile.am,v 1.8 2002/06/26 18:44:27 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -20,11 +20,27 @@ msnt_auth_SOURCES = md4.c rfcnb-io.c rfcnb-util.c session.c msntauth.c \
 
 EXTRA_DIST = \
 	COPYING-2.0 \
-	msntauth.conf \
+	msntauth.conf.default \
 	msntauth-v2.0.lsm \
 	README.html
 
+sysconf_DATA = \
+	msntauth.conf.default
+
 LDADD	= @XTRA_LIBS@
 
 INCLUDES      = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \
 		-I$(top_srcdir)/src/
+
+confload.o: confload.c
+	$(COMPILE) -DSYSCONFDIR=\"$(sysconfdir)\" -c $(srcdir)/confload.c -o $@
+
+install-data-local:
+	@if test -f $(DESTDIR)$(sysconfdir)/msntauth.conf ; then \
+		echo "$@ will not overwrite existing $(DESTDIR)$(sysconfdir)/msntauth.conf" ; \
+	else \
+		echo "$(INSTALL_DATA) $(srcdir)/msntauth.conf.default $(DESTDIR)$(sysconfdir)/msntauth.conf" ; \
+		$(INSTALL_DATA) $(srcdir)/msntauth.conf.default $(DESTDIR)$(sysconfdir)/msntauth.conf ; \
+	fi
+
+	
diff --git a/helpers/basic_auth/MSNT/confload.c b/helpers/basic_auth/MSNT/confload.c
index 5e2e771bb7..a7f1552b4a 100644
--- a/helpers/basic_auth/MSNT/confload.c
+++ b/helpers/basic_auth/MSNT/confload.c
@@ -23,9 +23,12 @@
 #include "valid.h"
 
 /* Path to configuration file */
-#define CONFIGFILE   "/usr/local/squid/etc/msntauth.conf"
-#define DENYUSERSDEFAULT   "/usr/local/squid/etc/denyusers"
-#define ALLOWUSERSDEFAULT  "/usr/local/squid/etc/allowusers"
+#ifndef SYSCONFDIR
+#define SYSCONFDIR "/usr/local/squid/etc"
+#endif
+#define CONFIGFILE   SYSCONFDIR "/msntauth.conf"
+#define DENYUSERSDEFAULT   SYSCONFDIR "/denyusers"
+#define ALLOWUSERSDEFAULT  SYSCONFDIR "/allowusers"
 
 /* Maximum number of servers to query. This number can be increased. */
 #define MAXSERVERS 5
diff --git a/helpers/basic_auth/MSNT/msntauth.conf.default b/helpers/basic_auth/MSNT/msntauth.conf.default
new file mode 100644
index 0000000000..323bc1c039
--- /dev/null
+++ b/helpers/basic_auth/MSNT/msntauth.conf.default
@@ -0,0 +1,13 @@
+
+# Sample MSNT authenticator configuration file
+# Antonino Iannella, Stellar-X Pty Ltd
+# Sun Sep  2 15:52:31 CST 2001
+
+# NT hosts to use. Best to put their IP addresses in /etc/hosts.
+server my_PDC		my_BDC		my_NTdomain
+server other_PDC	other_BDC	otherdomain
+
+# Denied and allowed users. Comment these if not needed.
+#denyusers	/usr/local/squid/etc/msntauth.denyusers
+#allowusers	/usr/local/squid/etc/msntauth.allowusers
+