Changeset 540
- Timestamp:
- 02/19/07 15:49:20 (2 years ago)
- Files:
-
- trunk/src/vcc/main.c (modified) (2 diffs)
- trunk/src/vcd/methods/vg/vg_remove.c (modified) (1 diff)
- trunk/src/vcd/methods/vg/vg_vx_list.c (modified) (1 diff)
- trunk/src/vcd/methods/vg/vg_vx_remove.c (modified) (1 diff)
- trunk/src/vcd/methods/vx/vx_create.c (modified) (1 diff)
- trunk/src/vce/main.c (modified) (2 diffs)
- trunk/src/vgc/main.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/src/vcc/main.c
r534 r540 195 195 xmlrpc_env_init(&env); 196 196 197 xmlrpc_client_init2(&env, XMLRPC_CLIENT_NO_FLAGS, argv[0], PACKAGE_VERSION, NULL, 0); 197 xmlrpc_client_init2(&env, XMLRPC_CLIENT_NO_FLAGS, argv[0], 198 PACKAGE_VERSION, NULL, 0); 198 199 199 200 if (env.fault_occurred) 200 log_error_and_die("failed to start xmlrpc client: %s", env.fault_string); 201 log_error_and_die("failed to start xmlrpc client: %s", 202 env.fault_string); 201 203 202 204 asprintf(&uri, "http://%s:%d/RPC2", host, port); … … 209 211 210 212 if (env.fault_occurred) 211 log_error_and_die("%s: %s (%d)", cmd, env.fault_string, env.fault_code); 213 log_error_and_die("%s: %s (%d)", cmd, env.fault_string, 214 env.fault_code); 212 215 213 216 xmlrpc_env_clean(&env); trunk/src/vcd/methods/vg/vg_remove.c
r536 r540 46 46 if (str_equal(group, "all")) 47 47 method_return_faultf(env, MEINVAL, 48 "cannot remove fromreserved group '%s'", group);48 "cannot remove reserved group '%s'", group); 49 49 50 50 if (!(gid = vxdb_getgid(group))) trunk/src/vcd/methods/vg/vg_vx_list.c
r536 r540 68 68 "s", vxdb_column_text(dbr, 0))); 69 69 70 if (rc != VXDB_DONE) 71 method_set_vxdb_fault(env); 72 73 vxdb_finalize(dbr); 74 70 75 return response; 71 76 } trunk/src/vcd/methods/vg/vg_vx_remove.c
r536 r540 53 53 "cannot remove from reserved group '%s'", group); 54 54 55 if (!(xid = vxdb_getxid(name))) 56 method_return_fault(env, MENOVPS); 57 55 58 if (!(gid = vxdb_getgid(group))) 56 59 method_return_fault(env, MENOVG); 57 58 if (!(xid = vxdb_getxid(name)))59 method_return_fault(env, MENOVPS);60 60 61 61 rc = vxdb_exec( trunk/src/vcd/methods/vx/vx_create.c
r535 r540 704 704 705 705 /* we don't return MEPERM here, since an attacker could 706 * find out existing vservers by tr ail&error */706 * find out existing vservers by trial&error */ 707 707 else 708 708 method_return_fault(env, MENOVPS); trunk/src/vce/main.c
r534 r540 228 228 xmlrpc_env_init(&env); 229 229 230 xmlrpc_client_init2(&env, XMLRPC_CLIENT_NO_FLAGS, argv[0], PACKAGE_VERSION, NULL, 0); 230 xmlrpc_client_init2(&env, XMLRPC_CLIENT_NO_FLAGS, argv[0], 231 PACKAGE_VERSION, NULL, 0); 231 232 232 233 if (env.fault_occurred) 233 log_error_and_die("failed to start xmlrpc client: %s", env.fault_string); 234 log_error_and_die("failed to start xmlrpc client: %s", 235 env.fault_string); 234 236 235 237 asprintf(&uri, "http://%s:%d/RPC2", host, port); … … 242 244 243 245 if (env.fault_occurred) 244 log_error_and_die("%s: %s (%d)", cmd, env.fault_string, env.fault_code); 246 log_error_and_die("%s: %s (%d)", cmd, env.fault_string, 247 env.fault_code); 245 248 246 249 xmlrpc_env_clean(&env); trunk/src/vgc/main.c
r534 r540 190 190 xmlrpc_env_init(&env); 191 191 192 xmlrpc_client_init2(&env, XMLRPC_CLIENT_NO_FLAGS, argv[0], PACKAGE_VERSION, NULL, 0); 192 xmlrpc_client_init2(&env, XMLRPC_CLIENT_NO_FLAGS, argv[0], 193 PACKAGE_VERSION, NULL, 0); 193 194 194 195 if (env.fault_occurred) 195 log_error_and_die("failed to start xmlrpc client: %s", env.fault_string); 196 log_error_and_die("failed to start xmlrpc client: %s", 197 env.fault_string); 196 198 197 199 asprintf(&uri, "http://%s:%d/RPC2", host, port); … … 204 206 205 207 if (env.fault_occurred) 206 log_error_and_die("%s: %s (%d)", cmd, env.fault_string, env.fault_code); 208 log_error_and_die("%s: %s (%d)", cmd, env.fault_string, 209 env.fault_code); 207 210 208 211 xmlrpc_env_clean(&env);
