Changeset 571
- Timestamp:
- 05/13/07 13:45:17 (2 years ago)
- Files:
-
- trunk/src/vcc/vce/vx_limit.c (modified) (5 diffs)
- trunk/src/vcd/auth.c (modified) (2 diffs)
- trunk/src/vcd/methods/vcd/vcd_user_remove.c (modified) (1 diff)
- trunk/src/vcd/methods/vxdb/vxdb_owner_remove.c (modified) (1 diff)
- trunk/src/vcd/vxdb.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/src/vcc/vce/vx_limit.c
r550 r571 26 26 void cmd_vx_limit_get(xmlrpc_env *env, int argc, char **argv) 27 27 { 28 char *type; 29 int soft, max; 28 char *type, *soft, *max; 30 29 xmlrpc_value *response, *result; 31 30 int len, i; … … 54 53 55 54 xmlrpc_decompose_value(env, result, 56 "{s:s,s: i,s:i,*}",55 "{s:s,s:s,s:s,*}", 57 56 "type", &type, 58 57 "soft", &soft, … … 62 61 xmlrpc_DECREF(result); 63 62 64 printf("%s: % d %d\n", type, soft, max);63 printf("%s: %s %s\n", type, soft, max); 65 64 } 66 65 … … 89 88 void cmd_vx_limit_set(xmlrpc_env *env, int argc, char **argv) 90 89 { 91 char *name, *type; 92 int soft, max; 90 char *name, *type, *soft, *max; 93 91 94 92 if (argc < 3) … … 97 95 name = argv[0]; 98 96 type = argv[1]; 99 s scanf(argv[2], "%d", &soft);97 soft = argv[2]; 100 98 101 99 if (argc > 3) 102 sscanf(argv[3], "%d", &max);100 max = argv[3]; 103 101 else 104 102 max = soft; 105 103 106 client_call("vxdb.vx.limit.set", "{s:s,s:s,s: i,s:i}",104 client_call("vxdb.vx.limit.set", "{s:s,s:s,s:s,s:s}", 107 105 "name", name, 108 106 "type", type, trunk/src/vcd/auth.c
r534 r571 129 129 xid_t xid; 130 130 131 if ( (uid = auth_getuid(user)) == 0)131 if (!(uid = auth_getuid(user))) 132 132 return 0; 133 133 … … 135 135 return 1; 136 136 137 if ( (xid = vxdb_getxid(name)) == 0)137 if (!(xid = vxdb_getxid(name))) 138 138 return 0; 139 139 trunk/src/vcd/methods/vcd/vcd_user_remove.c
r534 r571 39 39 method_return_if_fault(env); 40 40 41 if ( (uid = auth_getuid(user)) == 0)41 if (!(uid = auth_getuid(user))) 42 42 method_return_fault(env, MENOUSER); 43 43 trunk/src/vcd/methods/vxdb/vxdb_owner_remove.c
r534 r571 46 46 method_return_fault(env, MENOVPS); 47 47 48 if (user && (uid = auth_getuid(user)) == 0)48 if (user && !(uid = auth_getuid(user))) 49 49 method_return_faultf(env, MENOUSER, 50 50 "user does not exist: %s", user); trunk/src/vcd/vxdb.c
r551 r571 157 157 log_info("creating user '%s' with empty password", name); 158 158 159 int rc = VXDB_OK, uid = auth_getnextuid();159 int rc, uid = auth_getnextuid(); 160 160 161 161 if (str_equal(name, "admin")) { … … 188 188 "INSERT INTO user (uid, name, password, admin) " 189 189 "VALUES (%d, 'vshelper', '*', 0);" 190 "INSERT INTO user_caps VALUES(%d, 'HELPER');" 190 "INSERT INTO user_caps VALUES(%d, 'HELPER');" /* 2 */ 191 191 "COMMIT TRANSACTION", 192 192 uid, uid);
