*** empty log message ***

diff --git a/changelog b/changelog
index b727696104bca4cee4df6e5595e8e45bed39cdcf..eaceec7350361fd917c20f254114a6f96393ac68 100644 (file)
--- a/changelog
+++ b/changelog
@@ -6,6 +6,8 @@ userv-utils (0.2.99.0.2) unstable; urgency=low
   * copyright notices updated
   * groupmanage: do not claim that root doesn't exist.
     (Thanks to report from Ben Harris.)
+  * groupmanage: configurable group name length limit.
+    (Thanks to small patch from Ben Harris.)
 
  --
 

diff --git a/debian/changelog b/debian/changelog
index b727696104bca4cee4df6e5595e8e45bed39cdcf..eaceec7350361fd917c20f254114a6f96393ac68 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ userv-utils (0.2.99.0.2) unstable; urgency=low
   * copyright notices updated
   * groupmanage: do not claim that root doesn't exist.
     (Thanks to report from Ben Harris.)
+  * groupmanage: configurable group name length limit.
+    (Thanks to small patch from Ben Harris.)
 
  --
 

diff --git a/groupmanage/groupmanage b/groupmanage/groupmanage
index ffb45c09ec01078a1d8ca4b05f377054dddab3ff..21a7327c76da7f544ab9daa3aec6cc476c1fd794 100755 (executable)
--- a/groupmanage/groupmanage
+++ b/groupmanage/groupmanage
@@ -72,6 +72,7 @@ $callinguser= exists $ENV{'USERV_UID'} ? $ENV{'USERV_UID'} : $<;
        'gtmp-file','gtmp',
        'grouplist-file','grouplist',
        'name-regexp','',
+       'name-maxlen','8',
        'admin-group','',
        'finish-command','');
 %ovalid=  ('user-create','boolean',
@@ -84,6 +85,7 @@ $callinguser= exists $ENV{'USERV_UID'} ? $ENV{'USERV_UID'} : $<;
            'gtmp-file','string',
            'grouplist-file','string',
            'name-regexp','string',
+           'name-maxlen','number',
            'admin-group','string',
            'finish-command','string');
 
@@ -148,7 +150,8 @@ END
 if ($ARGV[0] eq '--create') {
     $opt{'user-create'} || !$callinguser ||
         &quit("group creation by users disabled by administrator");
-    length($groupname) <= 8 || &quit("group names must be 8 chars or fewer");
+    length($groupname) <= $opt{'name-maxlen'} ||
+        &quit("group names must be $opt{'name-maxlen'} chars or fewer");
     $!=0; (@pw= getpwuid($callinguser))
        || &quit("cannot get your passwd entry: $!");
     $createby= $pw[0];