rooty/yubikey-val
1
0
Fork 0
mirror of https://github.com/Yubico/yubikey-val.git synced 2025-03-03 18:29:18 +01:00
Code Issues Projects Releases Wiki Activity

Refactor include paths.

Browse Source 
- use PATH_SEPARATOR everywhere,
	instead of a mix of PATH_SEPARATOR and hard coded colons.

- always include /usr/share/yubikey-val first,
	then /etc/yubico/val.

- should not have any visible affects,
	since no file names are common between the two directories.

- use array+implode to make it easier to add/remove paths,
	and to avoid hardcoded the path separator.
This commit is contained in:
Jean Paul Galea 2015-09-08 10:57:26 +02:00
parent 9aa740d299
commit 2272f33659
13 changed files with 65 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ykval-checksum-clients
View File

@ -44,8 +44,11 @@ if (isset($argv[1])) {
$verbose = $argv[1] == "-v";
}
set_include_path(get_include_path() . PATH_SEPARATOR .
"/usr/share/yubikey-val:/etc/yubico/val");
set_include_path(implode(PATH_SEPARATOR, array(
get_include_path(),
'/usr/share/yubikey-val',
'/etc/yubico/val',
)));
require_once 'ykval-config.php';
require_once 'ykval-db.php';

7
ykval-checksum-deactivated
View File

@ -44,8 +44,11 @@ if (isset($argv[1])) {
$verbose = $argv[1] == "-v";
}
set_include_path(get_include_path() . PATH_SEPARATOR .
"/usr/share/yubikey-val:/etc/yubico/val");
set_include_path(implode(PATH_SEPARATOR, array(
get_include_path(),
'/usr/share/yubikey-val',
'/etc/yubico/val',
)));
require_once 'ykval-config.php';
require_once 'ykval-db.php';

6
ykval-export
View File

@ -28,7 +28,11 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
set_include_path(get_include_path() . PATH_SEPARATOR . "/usr/share/yubikey-val:/etc/yubico/val");
set_include_path(implode(PATH_SEPARATOR, array(
get_include_path(),
'/usr/share/yubikey-val',
'/etc/yubico/val',
)));
require_once 'ykval-config.php';
require_once 'ykval-db.php';

6
ykval-export-clients
View File

@ -28,7 +28,11 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
set_include_path(get_include_path() . PATH_SEPARATOR . "/usr/share/yubikey-val:/etc/yubico/val");
set_include_path(implode(PATH_SEPARATOR, array(
get_include_path(),
'/usr/share/yubikey-val',
'/etc/yubico/val',
)));
require_once 'ykval-config.php';
require_once 'ykval-db.php';

6
ykval-gen-clients
View File

@ -28,7 +28,11 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
set_include_path(get_include_path() . PATH_SEPARATOR . "/usr/share/yubikey-val:/etc/yubico/val");
set_include_path(implode(PATH_SEPARATOR, array(
get_include_path(),
'/usr/share/yubikey-val',
'/etc/yubico/val',
)));
$options = getopt("h", array("help", "email::", "notes::", "otp::", "urandom"));

6
ykval-import
View File

@ -28,7 +28,11 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
set_include_path(get_include_path() . PATH_SEPARATOR . "/usr/share/yubikey-val:/etc/yubico/val");
set_include_path(implode(PATH_SEPARATOR, array(
get_include_path(),
'/usr/share/yubikey-val',
'/etc/yubico/val',
)));
require_once 'ykval-config.php';
require_once 'ykval-db.php';

6
ykval-import-clients
View File

@ -28,7 +28,11 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
set_include_path(get_include_path() . PATH_SEPARATOR . "/usr/share/yubikey-val:/etc/yubico/val");
set_include_path(implode(PATH_SEPARATOR, array(
get_include_path(),
'/usr/share/yubikey-val',
'/etc/yubico/val',
)));
require_once 'ykval-config.php';
require_once 'ykval-db.php';

6
ykval-munin-ksmlatency.php
View File

@ -28,7 +28,11 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
set_include_path(get_include_path() . PATH_SEPARATOR . "/etc/yubico/val:/usr/share/yubikey-val");
set_include_path(implode(PATH_SEPARATOR, array(
get_include_path(),
'/usr/share/yubikey-val',
'/etc/yubico/val',
)));
require_once 'ykval-config.php';
require_once 'ykval-common.php';

6
ykval-munin-queuelength.php
View File

@ -28,7 +28,11 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
set_include_path(get_include_path() . PATH_SEPARATOR . "/etc/yubico/val:/usr/share/yubikey-val");
set_include_path(implode(PATH_SEPARATOR, array(
get_include_path(),
'/usr/share/yubikey-val',
'/etc/yubico/val',
)));
require_once 'ykval-config.php';
require_once 'ykval-db.php';

6
ykval-munin-vallatency.php
View File

@ -28,7 +28,11 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
set_include_path(get_include_path() . PATH_SEPARATOR . "/etc/yubico/val:/usr/share/yubikey-val");
set_include_path(implode(PATH_SEPARATOR, array(
get_include_path(),
'/usr/share/yubikey-val',
'/etc/yubico/val',
)));
require_once 'ykval-config.php';
require_once 'ykval-common.php';

6
ykval-munin-yubikeystats.php
View File

@ -28,7 +28,11 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
set_include_path(get_include_path() . PATH_SEPARATOR . "/etc/yubico/val:/usr/share/yubikey-val");
set_include_path(implode(PATH_SEPARATOR, array(
get_include_path(),
'/usr/share/yubikey-val',
'/etc/yubico/val',
)));
require_once 'ykval-config.php';
require_once 'ykval-db.php';

7
ykval-nagios-queuelength.php
View File

@ -28,8 +28,11 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
set_include_path(get_include_path() . PATH_SEPARATOR .
"/etc/yubico/val:/usr/share/yubikey-val");
set_include_path(implode(PATH_SEPARATOR, array(
get_include_path(),
'/usr/share/yubikey-val',
'/etc/yubico/val',
)));
require_once 'ykval-synclib.php';
require_once 'ykval-config.php';

6
ykval-queue
View File

@ -28,7 +28,11 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
set_include_path(get_include_path() . PATH_SEPARATOR . "/usr/share/yubikey-val:/etc/yubico/val");
set_include_path(implode(PATH_SEPARATOR, array(
get_include_path(),
'/usr/share/yubikey-val',
'/etc/yubico/val',
)));
require_once 'ykval-synclib.php';
require_once 'ykval-config.php';