diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-08-26 03:49:44 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-08-26 03:49:44 +0000 |
| commit | 06d4e77b9b98bf529378c3670de8916982d938f1 (patch) | |
| tree | 711f62838ab943426a5beab56da56366b9973740 /scheduler | |
| parent | 1ff0402e472496cf5165dbd796df1bdc131a360b (diff) | |
| download | cups-06d4e77b9b98bf529378c3670de8916982d938f1.tar.gz | |
Merge changes from CUPS 1.4svn-r7864.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@921 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'scheduler')
| -rw-r--r-- | scheduler/cupsfilter.c | 2 | ||||
| -rw-r--r-- | scheduler/main.c | 6 | ||||
| -rw-r--r-- | scheduler/network.c | 29 |
3 files changed, 21 insertions, 16 deletions
diff --git a/scheduler/cupsfilter.c b/scheduler/cupsfilter.c index f60c284fa..d387ecf7c 100644 --- a/scheduler/cupsfilter.c +++ b/scheduler/cupsfilter.c @@ -1053,7 +1053,7 @@ read_cupsd_conf(const char *filename) /* I - File to read */ } snprintf(line, sizeof(line), - "%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR ":/bin/usr/bin", + "%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR ":/bin:/usr/bin", ServerBin); set_string(&Path, line); diff --git a/scheduler/main.c b/scheduler/main.c index 571b3a7fc..417d98ef5 100644 --- a/scheduler/main.c +++ b/scheduler/main.c @@ -1390,9 +1390,9 @@ cupsdSetStringf(char **s, /* O - New string */ static void launchd_checkin(void) { - int i, /* Looping var */ - count, /* Numebr of listeners */ - portnum; /* Port number */ + size_t i, /* Looping var */ + count; /* Numebr of listeners */ + int portnum; /* Port number */ launch_data_t ld_msg, /* Launch data message */ ld_resp, /* Launch data response */ ld_array, /* Launch data array */ diff --git a/scheduler/network.c b/scheduler/network.c index a68297d33..f93330b55 100644 --- a/scheduler/network.c +++ b/scheduler/network.c @@ -245,24 +245,29 @@ cupsdNetIFUpdate(void) else if (addr->ifa_addr->sa_family == AF_INET && lis->address.addr.sa_family == AF_INET && (lis->address.ipv4.sin_addr.s_addr & - temp->mask.ipv4.sin_addr.s_addr) == - temp->address.ipv4.sin_addr.s_addr) + temp->mask.ipv4.sin_addr.s_addr) == + (temp->address.ipv4.sin_addr.s_addr & + temp->mask.ipv4.sin_addr.s_addr)) match = 1; #ifdef AF_INET6 else if (addr->ifa_addr->sa_family == AF_INET6 && lis->address.addr.sa_family == AF_INET6 && (lis->address.ipv6.sin6_addr.s6_addr[0] & - temp->mask.ipv6.sin6_addr.s6_addr[0]) == - temp->address.ipv6.sin6_addr.s6_addr[0] && + temp->mask.ipv6.sin6_addr.s6_addr[0]) == + (temp->address.ipv6.sin6_addr.s6_addr[0] & + temp->mask.ipv6.sin6_addr.s6_addr[0]) && (lis->address.ipv6.sin6_addr.s6_addr[1] & - temp->mask.ipv6.sin6_addr.s6_addr[1]) == - temp->address.ipv6.sin6_addr.s6_addr[1] && + temp->mask.ipv6.sin6_addr.s6_addr[1]) == + (temp->address.ipv6.sin6_addr.s6_addr[1] & + temp->mask.ipv6.sin6_addr.s6_addr[1]) && (lis->address.ipv6.sin6_addr.s6_addr[2] & - temp->mask.ipv6.sin6_addr.s6_addr[2]) == - temp->address.ipv6.sin6_addr.s6_addr[2] && + temp->mask.ipv6.sin6_addr.s6_addr[2]) == + (temp->address.ipv6.sin6_addr.s6_addr[2] & + temp->mask.ipv6.sin6_addr.s6_addr[2]) && (lis->address.ipv6.sin6_addr.s6_addr[3] & - temp->mask.ipv6.sin6_addr.s6_addr[3]) == - temp->address.ipv6.sin6_addr.s6_addr[3]) + temp->mask.ipv6.sin6_addr.s6_addr[3]) == + (temp->address.ipv6.sin6_addr.s6_addr[3] & + temp->mask.ipv6.sin6_addr.s6_addr[3])) match = 1; #endif /* AF_INET6 */ @@ -284,8 +289,8 @@ cupsdNetIFUpdate(void) cupsArrayAdd(NetIFList, temp); - cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdNetIFUpdate: \"%s\" = %s...", - temp->name, temp->hostname); + cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdNetIFUpdate: \"%s\" = %s:%d", + temp->name, temp->hostname, temp->port); } freeifaddrs(addrs); |