diff options
| author | ivan <ivan> | 2005-11-17 15:56:18 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2005-11-17 15:56:18 +0000 |
| commit | a9997b03e204c6b81967c566fe7d6b4d1f5f67e8 (patch) | |
| tree | cc10e19fcec08f9d5a14fb3193bdd63b4446d275 | |
| parent | 06d42092410eeb14e723d762237a1638133253a3 (diff) | |
make variable description more consistant wrt vars that are already shell-quoted
| -rw-r--r-- | FS/FS/part_export/shellcommands.pm | 9 | ||||
| -rw-r--r-- | FS/FS/part_export/shellcommands_withdomain.pm | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm index 2d5356f26..73f6ede6e 100644 --- a/FS/FS/part_export/shellcommands.pm +++ b/FS/FS/part_export/shellcommands.pm @@ -38,7 +38,7 @@ tie my %options, 'Tie::IxHash', type =>'textarea', default=>'', }, - 'usermod_pwonly' => { label=>'Disallow username changes', + 'usermod_pwonly' => { label=>'Disallow username, domain, uid, gid, dir and RADIUS group changes', type =>'checkbox', }, 'suspend' => { label=>'Suspension command', @@ -148,8 +148,8 @@ old_ for replace operations): <UL> <LI><code>$username</code> <LI><code>$_password</code> - <LI><code>$quoted_password</code> - unencrypted password quoted for the shell - <LI><code>$crypt_password</code> - encrypted password (quoted for the shell) + <LI><code>$quoted_password</code> - unencrypted password, already quoted for the shell (do not add additional quotes) + <LI><code>$crypt_password</code> - encrypted password, already quoted for the shell (do not add additional quotes) <LI><code>$uid</code> <LI><code>$gid</code> <LI><code>$finger</code> - GECOS, already quoted for the shell (do not add additional quotes) @@ -281,6 +281,9 @@ sub _export_replace { if ( $old_uid != $new_uid ) { $error ||= "can't change uid"; } + if ( $old_gid != $new_gid ) { + $error ||= "can't change gid"; + } if ( $old_dir ne $new_dir ) { $error ||= "can't change dir"; } diff --git a/FS/FS/part_export/shellcommands_withdomain.pm b/FS/FS/part_export/shellcommands_withdomain.pm index 61cea79ed..9bee75f65 100644 --- a/FS/FS/part_export/shellcommands_withdomain.pm +++ b/FS/FS/part_export/shellcommands_withdomain.pm @@ -29,7 +29,7 @@ tie my %options, 'Tie::IxHash', type =>'textarea', #default=>"$_password\n$_password\n", }, - 'usermod_pwonly' => { label=>'Disallow username changes', + 'usermod_pwonly' => { label=>'Disallow username, domain, uid, dir and RADIUS group changes', type =>'checkbox', }, 'suspend' => { label=>'Suspension command', @@ -89,8 +89,8 @@ The following variables are available for interpolation (prefixed with <LI><code>$username</code> <LI><code>$domain</code> <LI><code>$_password</code> - <LI><code>$quoted_password</code> - unencrypted password quoted for the shell - <LI><code>$crypt_password</code> - encrypted password (quoted for the shell) + <LI><code>$quoted_password</code> - unencrypted password, already quoted for the shell (do not add additional quotes) + <LI><code>$crypt_password</code> - encrypted password, already quoted for the shell (do not add additional quotes) <LI><code>$uid</code> <LI><code>$gid</code> <LI><code>$finger</code> - GECOS, already quoted for the shell (do not add additional quotes) |