diff options
| author | Didier Raboud <odyx@debian.org> | 2013-03-19 11:05:58 +0100 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2013-03-19 11:05:58 +0100 |
| commit | ea5667a811b20e235ce1975e763469edd1f7f0de (patch) | |
| tree | a02b8034aba8666f06fdbc971905ca760b1c3aa7 /backend/snmp.c | |
| parent | 6fd17d1b328ea9230585f7ad1e3c478343157220 (diff) | |
| download | cups-upstream/1.6.2.tar.gz | |
Imported Upstream version 1.6.2upstream/1.6.2
Diffstat (limited to 'backend/snmp.c')
| -rw-r--r-- | backend/snmp.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/backend/snmp.c b/backend/snmp.c index ca3a24fe..4a887989 100644 --- a/backend/snmp.c +++ b/backend/snmp.c @@ -1,5 +1,5 @@ /* - * "$Id: snmp.c 10535 2012-06-22 03:45:53Z mike $" + * "$Id: snmp.c 10643 2012-10-09 03:02:49Z mike $" * * SNMP discovery backend for CUPS. * @@ -1025,6 +1025,11 @@ read_snmp_response(int fd) /* I - SNMP socket file descriptor */ * Description is the IEEE-1284 device ID... */ + char *ptr; /* Pointer into device ID */ + + for (ptr = (char *)packet.object_value.string.bytes; *ptr; ptr ++) + if (*ptr == '\n') + *ptr = ';'; /* A lot of bad printers put a newline */ if (!device->id) device->id = strdup((char *)packet.object_value.string.bytes); @@ -1066,8 +1071,11 @@ read_snmp_response(int fd) /* I - SNMP socket file descriptor */ */ char make_model[256]; /* Make and model */ + char *ptr; /* Pointer into device ID */ - + for (ptr = (char *)packet.object_value.string.bytes; *ptr; ptr ++) + if (*ptr == '\n') + *ptr = ';'; /* A lot of bad printers put a newline */ if (device->id) free(device->id); @@ -1383,5 +1391,5 @@ update_cache(snmp_cache_t *device, /* I - Device */ /* - * End of "$Id: snmp.c 10535 2012-06-22 03:45:53Z mike $". + * End of "$Id: snmp.c 10643 2012-10-09 03:02:49Z mike $". */ |