mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'dell1600n_net_return_eaccess_if_local_only' into 'master' 

dell1600n_net: return ACCESS_DENIED when local devices are requested

See merge request sane-project/backends!506
merge-requests/540/head
Olaf Meeuwissen 2020-09-04 11:48:13 +00:00
rodzic 8894364c5b 0f9b481fee
commit c946aa5a84
1 zmienionych plików z 8 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

11
backend/dell1600n_net.c
Wyświetl plik

@ -233,6 +233,9 @@ static void JpegDecompTermSource (j_decompress_ptr cinfo);
/* Results of last call to sane_get_devices */
static struct DeviceRecord *gKnownDevices[MAX_SCANNERS];
/* Empty list for when network devices are not wanted */
static const SANE_Device *gEmptyDeviceList[1];
/* Array of open scanner device states.
:NOTE: (int)SANE_Handle is an offset into this array */
static struct ScannerState *gOpenScanners[MAX_SCANNERS];
@ -306,15 +309,17 @@ sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only)
const char *pVal;
int valLen;
if (local_only) {
*device_list = gEmptyDeviceList;
return SANE_STATUS_GOOD;
}
/* init variables */
ret = SANE_STATUS_GOOD;
sock = 0;
pDevice = NULL;
optYes = 1;
if (local_only)
return ret;
InitComBuf (&queryPacket);
/* clear previous results */