summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2012-08-29 00:26:48 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2012-08-29 00:26:48 +0000
commit37e7e6e0b27c7db3be8e160e87a63fec66e0fcca (patch)
tree08d7d4e2e80a04c648bc0137f9c8f3c26f0760fb /conf
parenta29fd7ddb5d63688a4d44d08e4ab16428921c321 (diff)
downloadcups-37e7e6e0b27c7db3be8e160e87a63fec66e0fcca.tar.gz
Merge changes from CUPS 1.7svn-r10578.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3891 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'conf')
-rw-r--r--conf/cupsd.conf.in2
1 files changed, 0 insertions, 2 deletions
diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index 790c02b49..8a1e86f25 100644
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -19,8 +19,6 @@ Listen localhost:@DEFAULT_IPP_PORT@
# Show shared printers on the local network.
Browsing On
-BrowseOrder allow,deny
-BrowseAllow all
BrowseLocalProtocols @CUPS_BROWSE_LOCAL_PROTOCOLS@
# Default authentication type, when authentication is required...