- adminutil.c: when writing 'BrowseAllow @LOCAL', add a comment about what

to change it to when using directed broadcasts from another subnet (bug
    #204373).
This commit is contained in:
Tim Waugh 2006-10-05 15:38:40 +00:00
parent c5c707372a
commit 8dd9edbd29
2 changed files with 32 additions and 1 deletions

View File

@ -0,0 +1,24 @@
--- cups-1.2.4/conf/cupsd.conf.in.directed-broadcast 2006-10-05 12:33:08.000000000 +0100
+++ cups-1.2.4/conf/cupsd.conf.in 2006-10-05 12:33:04.000000000 +0100
@@ -21,6 +21,7 @@
# Show shared printers on the local network.
Browsing On
BrowseOrder allow,deny
+# (Change '@LOCAL' to 'ALL' if using directed broadcasts from another subnet.)
BrowseAllow @LOCAL
# Default authentication type, when authentication is required...
--- cups-1.2.4/cups/adminutil.c.directed-broadcast 2006-10-05 12:16:48.000000000 +0100
+++ cups-1.2.4/cups/adminutil.c 2006-10-05 12:19:29.000000000 +0100
@@ -1155,7 +1155,11 @@
cupsFilePuts(temp, "BrowseOrder allow,deny\n");
if (remote_printers)
+ {
+ cupsFilePuts(temp, "# (Change '@LOCAL' to 'ALL' if using "
+ "directed broadcasts from another subnet.)\n");
cupsFilePuts(temp, "BrowseAllow @LOCAL\n");
+ }
if (share_printers)
cupsFilePuts(temp, "BrowseAddress @LOCAL\n");

View File

@ -6,7 +6,7 @@
Summary: Common Unix Printing System
Name: cups
Version: 1.2.4
Release: 8
Release: 9
License: GPL
Group: System Environment/Daemons
Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@ -39,6 +39,7 @@ Patch14: cups-lpr-help.patch
Patch15: cups-maxlogsize.patch
Patch16: cups-pid.patch
Patch17: cups-relro.patch
Patch18: cups-directed-broadcast.patch
Patch100: cups-lspp.patch
Epoch: 1
Url: http://www.cups.org/
@ -138,6 +139,7 @@ lpd emulation.
%patch15 -p1 -b .maxlogsize
%patch16 -p1 -b .pid
%patch17 -p1 -b .relro
%patch18 -p1 -b .directed-broadcast
%if %lspp
%patch100 -p1 -b .lspp
@ -413,6 +415,11 @@ rm -rf $RPM_BUILD_ROOT
%{cups_serverbin}/daemon/cups-lpd
%changelog
* Thu Oct 5 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.4-9
- adminutil.c: when writing 'BrowseAllow @LOCAL', add a comment about what
to change it to when using directed broadcasts from another subnet
(bug #204373).
* Wed Oct 4 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.4-8
- LSPP patch didn't get updated properly in 1:1.2.4-6. Use the right
patch this time (bug #208676). LSPP re-enabled.