svn commit: rev 54701 - spamassassin/trunk

[pa...@apache.org]

Author: parker
Date: Tue Oct 12 14:42:38 2004
New Revision: 54701

Modified:
   spamassassin/trunk/sa-learn.raw
Log:
Bug 3766: Provide support for specifying the username for virtual environments

Modified: spamassassin/trunk/sa-learn.raw
==============================================================================
--- spamassassin/trunk/sa-learn.raw	(original)
+++ spamassassin/trunk/sa-learn.raw	Tue Oct 12 14:42:38 2004
@@ -97,6 +97,7 @@
   'sync'        => \$synconly,
   'rebuild'     => sub { $synconly = 1; warn "The --rebuild option has been deprecated.  Please use --sync instead.\n" },
 
+  'username|u=s'    => \$opt{'username'},
   'configpath|config-file|config-dir|c|C=s' => \$opt{'configpath'},
   'prefspath|prefs-file|p=s'                => \$opt{'prefspath'},
   'siteconfigpath=s'                        => \$opt{'siteconfigpath'},
@@ -200,6 +201,7 @@
     rules_filename      => $opt{'configpath'},
     site_rules_filename => $opt{'siteconfigpath'},
     userprefs_filename  => $opt{'prefspath'},
+    username            => $opt{'username'},
     debug               => \@debug,
     local_tests_only    => 1,
     dont_copy_prefs     => 1,
@@ -530,6 +532,7 @@
  --backup                          Backup, to STDOUT, existing database
  --restore <filename>              Restore a database from filename
 
+ -u username, --username=username  Override username taken from the runtime environment
  -C path, --configpath=path, --config-file=path   Path to standard configuration dir
  -p prefs, --prefspath=file, --prefs-file=file    Set user preferences file
  --siteconfigpath=path             Path for site configs (def: /etc/mail/spamassassin)
@@ -650,6 +653,12 @@
 =item B<-h>, B<--help>
 
 Print help message and exit.
+
+=item B<-u> I<username>, B<--username>=I<username>
+
+If specified this username will override the username taken from the runtime
+environment.  You can use this option to specify users in a virtual user
+configuration.
 
 =item B<-C> I<path>, B<--configpath>=I<path>, B<--config-file>=I<path>