|
 |
d33df7d |
--- cups-1.2.10/cups/adminutil.c.adminutil 2007-05-21 16:39:00.000000000 +0100
|
|
|
d33df7d |
+++ cups-1.2.10/cups/adminutil.c 2007-05-21 16:45:31.000000000 +0100
|
|
|
d33df7d |
@@ -1260,14 +1260,21 @@
|
|
|
d33df7d |
{
|
|
|
d33df7d |
if (!wrote_browsing)
|
|
|
d33df7d |
{
|
|
|
d33df7d |
+ int new_remote_printers = (remote_printers > 0 ||
|
|
|
d33df7d |
+ (remote_printers == -1 &&
|
|
|
d33df7d |
+ old_remote_printers > 0));
|
|
|
d33df7d |
+ int new_share_printers = (share_printers > 0 ||
|
|
|
d33df7d |
+ (share_printers == -1 &&
|
|
|
d33df7d |
+ old_share_printers > 0));
|
|
|
d33df7d |
+
|
|
|
d33df7d |
wrote_browsing = 1;
|
|
|
d33df7d |
|
|
|
d33df7d |
- if (remote_printers > 0 || share_printers > 0)
|
|
|
d33df7d |
+ if (new_remote_printers | new_share_printers)
|
|
|
d33df7d |
{
|
|
|
d33df7d |
- if (remote_printers > 0 && share_printers > 0)
|
|
|
d33df7d |
+ if (new_remote_printers && new_share_printers)
|
|
|
d33df7d |
cupsFilePuts(temp,
|
|
|
d33df7d |
"# Enable printer sharing and shared printers.\n");
|
|
|
d33df7d |
- else if (remote_printers > 0)
|
|
|
d33df7d |
+ else if (new_remote_printers)
|
|
|
d33df7d |
cupsFilePuts(temp,
|
|
|
d33df7d |
"# Show shared printers on the local network.\n");
|
|
|
d33df7d |
else
|
|
|
d33df7d |
@@ -1277,14 +1284,14 @@
|
|
|
d33df7d |
cupsFilePuts(temp, "Browsing On\n");
|
|
|
d33df7d |
cupsFilePuts(temp, "BrowseOrder allow,deny\n");
|
|
|
d33df7d |
|
|
|
d33df7d |
- if (remote_printers > 0)
|
|
|
d33df7d |
+ if (new_remote_printers)
|
|
|
d33df7d |
{
|
|
|
d33df7d |
cupsFilePuts(temp, "# (Change '@LOCAL' to 'ALL' if using "
|
|
|
d33df7d |
"directed broadcasts from another subnet.)\n");
|
|
|
d33df7d |
cupsFilePuts(temp, "BrowseAllow @LOCAL\n");
|
|
|
d33df7d |
}
|
|
|
d33df7d |
|
|
|
d33df7d |
- if (share_printers > 0)
|
|
|
d33df7d |
+ if (new_share_printers)
|
|
|
d33df7d |
cupsFilePuts(temp, "BrowseAddress @LOCAL\n");
|
|
|
d33df7d |
}
|
|
|
d33df7d |
else
|