From 846196071569bd1b2d3e1a12de948a99d385a608 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Mon, 20 Feb 2012 08:54:40 +0100 Subject: [PATCH] allow more characters with realm IDs --- Makefile | 2 +- PVE/AccessControl.pm | 3 ++- changelog.Debian | 6 ++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 783ee04..f9cebd6 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ RELEASE=2.0 VERSION=1.0 PACKAGE=libpve-access-control -PKGREL=11 +PKGREL=12 DESTDIR= PREFIX=/usr diff --git a/PVE/AccessControl.pm b/PVE/AccessControl.pm index 44813a7..0e625d5 100644 --- a/PVE/AccessControl.pm +++ b/PVE/AccessControl.pm @@ -705,6 +705,7 @@ sub normalize_path { my $realm_regex = qr/[A-Za-z][A-Za-z0-9\.\-_]+/; +PVE::JSONSchema::register_format('pve-realm', \&pve_verify_realm); sub pve_verify_realm { my ($realm, $noerr) = @_; @@ -748,7 +749,7 @@ PVE::JSONSchema::register_standard_option('userid', { PVE::JSONSchema::register_standard_option('realm', { description => "Authentication domain ID", - type => 'string', format => 'pve-configid', + type => 'string', format => 'pve-realm', maxLength => 32, }); diff --git a/changelog.Debian b/changelog.Debian index 3789bb3..3fcbce6 100644 --- a/changelog.Debian +++ b/changelog.Debian @@ -1,3 +1,9 @@ +libpve-access-control (1.0-12) unstable; urgency=low + + * allow more characters with realm IDs + + -- Proxmox Support Team Mon, 20 Feb 2012 08:50:33 +0100 + libpve-access-control (1.0-11) unstable; urgency=low * fix bug in exec_api2_perm_check -- 2.39.2