1
0
mirror of https://github.com/Yubico/yubikey-ksm.git synced 2024-11-29 00:24:14 +01:00

Merge branch 'master' into devel/travis

This commit is contained in:
Klas Lindfors 2013-11-07 09:45:00 +01:00
commit fe0a253ed1

View File

@ -72,7 +72,7 @@ else {
}
$sql = "SELECT aeskey, internalname FROM yubikeys " .
"WHERE publicname = '$id' AND active = 1";
"WHERE publicname = '$id' AND active";
if (!$use_oci) {
$result = $dbh->query($sql);
@ -87,6 +87,7 @@ if (!$use_oci) {
$internalname = $row['internalname'];
}
else {
$sql .= " = 1";
$result = oci_parse($dbh, $sql);
$execute = oci_execute($result);
if (!$execute) {