equal
deleted
inserted
replaced
19 #include <stdlib.h> |
19 #include <stdlib.h> |
20 #include "fdbuf/fdbuf.h" |
20 #include "fdbuf/fdbuf.h" |
21 #include "mystring/mystring.h" |
21 #include "mystring/mystring.h" |
22 #include "misc/pwcrypt.h" |
22 #include "misc/pwcrypt.h" |
23 #include "config/configrc.h" |
23 #include "config/configrc.h" |
24 #include "cli/cli.h" |
24 #include "cli++/cli++.h" |
25 #include "vcommand.h" |
25 #include "vcommand.h" |
26 |
26 |
27 const char* cli_program = "vaddusers"; |
27 const char* cli_program = "vaddusers"; |
28 const char* cli_help_prefix = "Add users to a virtual domain\n"; |
28 const char* cli_help_prefix = "Add users to a virtual domain\n"; |
29 const char* cli_help_suffix = ""; |
29 const char* cli_help_suffix = ""; |
98 << "' already exists, skipping.\n"; |
98 << "' already exists, skipping.\n"; |
99 return; |
99 return; |
100 } |
100 } |
101 { |
101 { |
102 mystring maildir = domain.userdir(user); |
102 mystring maildir = domain.userdir(user); |
103 vpwentry vpw(user, pwcrypt(pass), maildir, 0); |
103 vpwentry vpw(user, pwcrypt(pass), maildir, 0, true); |
104 vpw.set_defaults(true, true); |
104 response resp = domain.set(&vpw, true); |
105 response resp = domain.set(&vpw, true, maildir); |
|
106 if(!resp) { |
105 if(!resp) { |
107 errors++; |
106 errors++; |
108 if(!o_quiet) |
107 if(!o_quiet) |
109 ferr << "vaddusers: error adding the virtual user, skipping aliases:\n " |
108 ferr << "vaddusers: error adding the virtual user, skipping aliases:\n " |
110 << resp.msg << endl; |
109 << resp.msg << endl; |
124 if(!o_quiet) |
123 if(!o_quiet) |
125 ferr << "vaddusers: warning: alias '" << alias |
124 ferr << "vaddusers: warning: alias '" << alias |
126 << "' already exists, skipping." << endl; |
125 << "' already exists, skipping." << endl; |
127 continue; |
126 continue; |
128 } |
127 } |
129 vpwentry vpw(alias, "*", 0, user); |
128 vpwentry vpw(alias, "*", 0, user, false); |
130 vpw.set_defaults(true, true); |
|
131 response resp = domain.set(&vpw, true); |
129 response resp = domain.set(&vpw, true); |
132 if(!resp) { |
130 if(!resp) { |
133 fout << endl; |
131 fout << endl; |
134 errors++; |
132 errors++; |
135 if(!o_quiet) |
133 if(!o_quiet) |