case 'K':
dtypes[dcount] = "KERBEROS";
break;
+ case 'M':
+ dtypes[dcount] = "MACHINE";
+ break;
default:
error++;
break;
case 'K':
dtypes[dcount] = "KERBEROS";
break;
+ case 'M':
+ dtypes[dcount] = "MACHINE";
+ break;
default:
error++;
break;
/* get_lists_of_member - given a type and a name, return the name and flags
* of all of the lists of the given member. The member_type is one of
- * "LIST", "USER", "STRING", "RLIST", "RUSER", or "RSTRING" in argv[0],
- * and argv[1] will contain the ID of the entity in question. The R*
- * types mean to recursively look at every containing list, not just
- * when the object in question is a direct member.
+ * "LIST", "USER", "STRING", "KERBEROS", "MACHINE", "RLIST", "RUSER",
+ * "RSTRING", "RKERBEROS", or "RMACHINE" in argv[0], and argv[1] will contain
+ * the ID of the entity in question. The R* types mean to recursively look
+ * at every containing list, not just when the object in question is a direct
+ * member.
*/
int get_lists_of_member(struct query *q, char *argv[], client *cl,
atype = "KERBEROS";
direct = 0;
}
+ if (!strcmp(atype, "RMACHINE"))
+ {
+ atype = "MACHINE";
+ direct = 0;
+ }
rargv[0] = name;
rargv[1] = active;
if (dbms_errno)
return mr_errcode;
+ targv[0] = "MACHINE";
+ EXEC SQL DECLARE csr123 CURSOR FOR
+ SELECT m.name, s.string FROM machine m, imembers im, strings s
+ WHERE im.list_id = :list_id AND im.member_type = 'MACHINE'
+ AND im.member_id = m.mach_id AND im.direct > :direct
+ AND s.string_id = im.tag ORDER BY 1;
+ if (dbms_errno)
+ return mr_errcode;
+ EXEC SQL OPEN csr123;
+ if (dbms_errno)
+ return mr_errcode;
+ while (1)
+ {
+ EXEC SQL FETCH csr123 INTO :member_name, :tag;
+ if (sqlca.sqlcode)
+ break;
+ (*action)(targc, targv, actarg);
+ }
+ EXEC SQL CLOSE csr123;
+ if (dbms_errno)
+ return mr_errcode;
+
return MR_SUCCESS;
}
/* find user */
EXEC SQL SELECT users_id, status INTO :users_id, :ostatus
FROM users
- WHERE unix_uid = :uid AND (status = 0 OR status = 5 OR status = 6);
+ WHERE unix_uid = :uid AND
+ (status = 0 OR status = 5 OR status = 6 OR status = 9);
if (sqlca.sqlerrd[2] == 0)
return MR_NO_MATCH;
WHERE label = :login || '.po';
if (dbms_errno)
return mr_errcode;
- if ((ostatus == 0) || (tmp != users_id))
+ if ((ostatus == 0 || ostatus == 9) || (tmp != users_id))
return MR_IN_USE;
else
po_exists = 1;
sprintf(buffer, "u.users_id = %d", users_id);
incremental_before(USERS_TABLE, buffer, 0);
nstatus = 2;
- if (ostatus == 5 || ostatus == 6)
+ if (ostatus == 5 || ostatus == 6 || ostatus == 9)
nstatus = 1;
EXEC SQL UPDATE users SET login = :login, status = :nstatus,
modtime = SYSDATE, modby = :who, modwith = :entity,
- pmodtime = SYSDATE, pmodby = :who, pmodwith = :entity
+ pmodtime = SYSDATE, pmodby = :who, pmodwith = :entity,
+ created = SYSDATE, creator = :who
WHERE users_id = :users_id;
if (dbms_errno)
int update_container(struct query *q, char *argv[], client *cl)
{
EXEC SQL BEGIN DECLARE SECTION;
- int cnt_id, acl_id, memacl_id, who;
+ int cnt_id, acl_id, memacl_id, who, flag;
char name[CONTAINERS_NAME_SIZE], newchildname[CONTAINERS_NAME_SIZE];
char* newname, *entity, *description, *location, *contact, *acl_type, *memacl_type;
EXEC SQL END DECLARE SECTION;
int cnt, childid;
char childname[CONTAINERS_NAME_SIZE];
char *qual;
+ int index = 0;
- cnt_id = *(int *)argv[0];
- newname = argv[1];
- description = argv[2];
- location = argv[3];
- contact = argv[4];
- acl_type = argv[5];
- acl_id = *(int *)argv[6];
- memacl_type = argv[7];
- memacl_id = *(int *)argv[8];
+ cnt_id = *(int *)argv[index++];
+ newname = argv[index++];
+
+ if (q->version >= 9)
+ flag = atoi(argv[index++]);
+
+ description = argv[index++];
+ location = argv[index++];
+ contact = argv[index++];
+ acl_type = argv[index++];
+ acl_id = *(int *)argv[index++];
+ memacl_type = argv[index++];
+ memacl_id = *(int *)argv[index++];
entity = cl->entity;
who = cl->client_id;
/* trim off the trailing spaces */
strcpy(name, strtrim(name));
+ qual = xmalloc(MAX_FIELD_WIDTH);
+ sprintf(qual, "name = '%s'", name);
+ incremental_before(CONTAINERS_TABLE, qual, argv);
+
/* if we are renaming the container */
if (strcmp(name, newname))
{
return MR_NEW_CONTAINER_NAME;
}
- qual = xmalloc(CONTAINERS_NAME_SIZE + 10);
- sprintf(qual, "name = '%s'", name);
- incremental_before(CONTAINERS_TABLE, qual, argv);
-
/* update the name for this container */
EXEC SQL UPDATE containers
SET name = :newname
}
/* update the remaining fields */
- EXEC SQL UPDATE containers
- SET description = NVL(:description, CHR(0)), location = NVL(:location, CHR(0)),
- contact = NVL(:contact, CHR(0)), acl_type = :acl_type, acl_id = :acl_id,
- memacl_type = :memacl_type, memacl_id = :memacl_id,
- modtime = SYSDATE, modby = :who, modwith = :entity
- WHERE cnt_id = :cnt_id;
+ if (q->version >= 9)
+ {
+ EXEC SQL UPDATE containers
+ SET publicflg= :flag, description = NVL(:description, CHR(0)), location = NVL(:location, CHR(0)),
+ contact = NVL(:contact, CHR(0)), acl_type = :acl_type, acl_id = :acl_id,
+ memacl_type = :memacl_type, memacl_id = :memacl_id,
+ modtime = SYSDATE, modby = :who, modwith = :entity
+ WHERE cnt_id = :cnt_id;
+ }
+ else
+ {
+ EXEC SQL UPDATE containers
+ SET publicflg= :flag, description = NVL(:description, CHR(0)), location = NVL(:location, CHR(0)),
+ contact = NVL(:contact, CHR(0)), acl_type = :acl_type, acl_id = :acl_id,
+ memacl_type = :memacl_type, memacl_id = :memacl_id,
+ modtime = SYSDATE, modby = :who, modwith = :entity
+ WHERE cnt_id = :cnt_id;
+ }
if (dbms_errno)
return mr_errcode;
if (!isrecursive)
sprintf(tmp, "AND b.cnt_id = %d ", cnt_id);
else
- sprintf(tmp, "AND (b.cnt_id = %d OR b.name LIKE '%s/%%') ", cnt_id, containername);
+ sprintf(tmp, "AND (b.cnt_id = %d OR LOWER(b.name) LIKE LOWER('%s/%%')) ",
+ cnt_id, containername);
strcat(querystring, tmp);
strcat(querystring, "ORDER BY b.name, a.name");
char *qs;
EXEC SQL END DECLARE SECTION;
- char querystring[512], tmp [256];
+ char querystring[2048], tmp [1024];
char *rargv[1];
int found = 0;
strcpy(querystring, "SELECT name FROM containers ");
if (!isrecursive)
- sprintf(tmp, "WHERE name LIKE '%s/%%' and name NOT LIKE '%s/%%/%%' ", containername,
- containername);
+ sprintf(tmp, "WHERE LOWER(name) LIKE LOWER('%s/%%') and LOWER(name) NOT LIKE LOWER('%s/%%/%%') ",
+ containername, containername);
else
- sprintf(tmp, "WHERE name LIKE '%s/%%' ", containername);
+ sprintf(tmp, "WHERE LOWER(name) LIKE LOWER('%s/%%') ", containername);
strcat(querystring, tmp);
strcat(querystring, "ORDER BY name");
return MR_NO_MATCH;
return MR_SUCCESS;
}
+
+int set_container_list(struct query *q, char *argv[], client *cl)
+{
+ EXEC SQL BEGIN DECLARE SECTION;
+ int cnt_id, list_id;
+ EXEC SQL END DECLARE SECTION;
+
+ cnt_id = *(int *)argv[0];
+ list_id = *(int *)argv[1];
+
+ EXEC SQL UPDATE containers SET list_id = :list_id WHERE cnt_id = :cnt_id;
+ if (dbms_errno)
+ return mr_errcode;
+
+ return MR_SUCCESS;
+}
andersk / moira.git / blobdiff