summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2009-02-11 16:34:01 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2009-02-11 16:34:01 +0000
commitbf3816c7edd01247b850a12e52856819190b66fd (patch)
tree24dcfae7bdd3378ab3153f03f78da4507afad8c6 /conf
parent745129beebf8651dd9ce221cc7c046460b4ae8f6 (diff)
downloadcups-bf3816c7edd01247b850a12e52856819190b66fd.tar.gz
Merge changes from CUPS 1.4svn-r8346.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1212 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'conf')
-rw-r--r--conf/cupsd.conf.in1
1 files changed, 0 insertions, 1 deletions
diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index 2db713576..63ea89e76 100644
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -34,7 +34,6 @@ DefaultAuthType Basic
# Restrict access to the admin pages...
<Location /admin>
-@ENCRYPTION_REQUIRED@
Order allow,deny
</Location>