Allow underscores in examine

Allow underscores in principal names by default in the examine
function.

diff --git a/NEWS b/NEWS
index edd8d2b7d615e2e5ebfa33b14a569a76cbc1d3b0..50d79b599e573e7bd64a8d37c2dc51880c6b44f7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,10 @@
                     User-Visible kadmin-remctl Changes
 
+kadmin-remctl 3.1 (unreleased)
+
+    Allow underscores in principal names by default in the examine
+    function.
+
 kadmin-remctl 3.0 (2010-02-17)
 
     Add kadmin-backend-heim, which duplicates the kadmin-backend

diff --git a/kadmin-backend b/kadmin-backend
index 25ecf589357f665b5d34c9ed0f4169158fcf06e1..9a43faa4aea6203221d85203979a44fa7125039d 100755 (executable)
--- a/kadmin-backend
+++ b/kadmin-backend
@@ -1006,9 +1006,9 @@ sub examine_principal {
     }
     my $regex;
     if ($CONFIG{$instance}) {
-        $regex = $CONFIG{$instance}{allowed} || '^[-a-zA-Z0-9]+\z';
+        $regex = $CONFIG{$instance}{allowed} || '^[a-zA-Z0-9_-]+\z';
     } else {
-        $regex = '^[-a-zA-Z0-9]+\z';
+        $regex = '^[a-zA-Z0-9_-]+\z';
     }
     unless ($principal =~ /$regex/ and $instance =~ m%^([a-zA-Z0-9._-]+)?\z%) {
         die "error: invalid character in principal name\n";

diff --git a/kadmin-backend-heim b/kadmin-backend-heim
index 8b612997b355d23041b59033ba7567441bc540aa..08bbeda11e541e5de688738f8de50172fd1a22b9 100755 (executable)
--- a/kadmin-backend-heim
+++ b/kadmin-backend-heim
@@ -1036,9 +1036,9 @@ sub examine_principal {
     }
     my $regex;
     if ($CONFIG{$instance}) {
-        $regex = $CONFIG{$instance}{allowed} || '^[-a-zA-Z0-9]+\z';
+        $regex = $CONFIG{$instance}{allowed} || '^[a-zA-Z0-9_-]+\z';
     } else {
-        $regex = '^[-a-zA-Z0-9]+\z';
+        $regex = '^[a-zA-Z0-9_-]+\z';
     }
     unless ($principal =~ /$regex/ and $instance =~ m%^([a-zA-Z0-9._-]+)?\z%) {
         die "error: invalid character in principal name\n";