Changeset 549
- Timestamp:
- 02/20/07 13:15:05 (2 years ago)
- Files:
-
- trunk/src/vcc/vcdadm/user.c (modified) (2 diffs)
- trunk/src/vcc/vcdadm/user_caps.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/src/vcc/vcdadm/user.c
r547 r549 26 26 void cmd_user_get(xmlrpc_env *env, int argc, char **argv) 27 27 { 28 char *username ;28 char *username = ""; 29 29 xmlrpc_value *response, *result; 30 30 int len, i, uid, admin; 31 31 32 response = client_call("vcd.user.get", 33 "{s:s}", 34 "username", name); 32 if (argc > 0) 33 username = argv[0]; 34 35 response = client_call("vcd.user.get", "{s:s}", 36 "username", username); 35 37 return_if_fault(env); 36 38 … … 59 61 void cmd_user_remove(xmlrpc_env *env, int argc, char **argv) 60 62 { 61 client_call("vcd.user.remove", 62 "{s:s}", 63 "username", name); 63 if (argc < 1) 64 usage(EXIT_FAILURE); 65 66 char *username = argv[0]; 67 68 client_call("vcd.user.remove", "{s:s}", 69 "username", username); 64 70 } 65 71 66 72 void cmd_user_set(xmlrpc_env *env, int argc, char **argv) 67 73 { 68 char * password;74 char *username, *password; 69 75 int admin; 70 76 71 if (argc < 1)77 if (argc < 2) 72 78 usage(EXIT_FAILURE); 73 79 74 sscanf(argv[0], "%d", &admin);80 username = argv[0]; 75 81 76 if (argc > 1) 77 password = argv[1]; 82 sscanf(argv[1], "%d", &admin); 83 84 if (argc > 2) 85 password = argv[2]; 78 86 else 79 87 password = ""; 80 88 81 client_call("vcd.user.set", 82 "{s:s,s:b,s:s}", 83 "username", name, 89 client_call("vcd.user.set", "{s:s,s:b,s:s}", 90 "username", username, 84 91 "admin", admin, 85 92 "password", password); trunk/src/vcc/vcdadm/user_caps.c
r547 r549 25 25 void cmd_user_caps_add(xmlrpc_env *env, int argc, char **argv) 26 26 { 27 char *cap; 27 char *username, *cap; 28 29 if (argc < 2) 30 usage(EXIT_FAILURE); 31 32 username = argv[0]; 33 cap = argv[1]; 34 35 client_call("vcd.user.caps.add", "{s:s,s:s}", 36 "username", username, 37 "cap", cap); 38 } 39 40 void cmd_user_caps_get(xmlrpc_env *env, int argc, char **argv) 41 { 42 char *username, *cap; 43 xmlrpc_value *response, *result; 44 int len, i; 28 45 29 46 if (argc < 1) 30 47 usage(EXIT_FAILURE); 31 48 32 cap= argv[0];49 username = argv[0]; 33 50 34 client_call("vcd.user.caps.add", 35 "{s:s,s:s}", 36 "username", name, 37 "cap", cap); 38 } 39 40 void cmd_user_caps_get(xmlrpc_env *env, int argc, char **argv) 41 { 42 char *cap; 43 xmlrpc_value *response, *result; 44 int len, i; 45 46 response = client_call("vcd.user.caps.get", 47 "{s:s}", 48 "username", name); 51 response = client_call("vcd.user.caps.get", "{s:s}", 52 "username", username); 49 53 return_if_fault(env); 50 54 … … 69 73 void cmd_user_caps_remove(xmlrpc_env *env, int argc, char **argv) 70 74 { 71 char * cap;75 char *username, *cap; 72 76 73 77 if (argc < 1) 78 usage(EXIT_FAILURE); 79 80 username = argv[0]; 81 82 if (argc < 2) 74 83 cap = ""; 75 84 else 76 85 cap = argv[0]; 77 86 78 client_call("vcd.user.caps.remove", 79 "{s:s,s:s}", 80 "username", name, 81 "cap", cap); 87 client_call("vcd.user.caps.remove", "{s:s,s:s}", 88 "username", username, 89 "cap", cap); 82 90 }
