int followup_anfq();
int followup_gzcl();
int followup_gsha();
+int followup_gnfq();
int set_modtime();
int set_modtime_by_id();
static char *gsin_fields[] = {
SERVICE,
- SERVICE, "update_int", "target_file", "script", "dfgen",
+ SERVICE, "update_int", "target_file", "script", "dfgen", "dfcheck",
TYPE, "enable", "inprogress", "harderror", "errmsg",
ACE_TYPE, ACE_NAME, MOD1, MOD2, MOD3,
};
};
static char *ssif_fields[] = {
- SERVICE, "dfgen", "inprogress", "harderror", "errmsg",
+ SERVICE, "dfgen", "dfcheck", "inprogress", "harderror", "errmsg",
};
static struct validate ssif_validate = {
sshi_valobj,
2,
SERVICE,
- "sh.service = uppercase(\"%s\") and sh.mach_id = %d",
+ "s.service = uppercase(\"%s\") and s.mach_id = %d",
2,
0,
0,
static char *gpcp_fields[] = {
"printer",
- "printer", "printcap", MOD1, MOD2, MOD3,
+ "printer", "spooling_host", "spool_directory", "rprinter", "comments",
+ MOD1, MOD2, MOD3,
};
static char *apcp_fields[] = {
- "printer", "printcap", MOD1, MOD2, MOD3,
+ "printer", "spooling_host", "spool_directory", "rprinter", "comments",
+ MOD1, MOD2, MOD3,
+};
+
+static struct valobj apcp_valobj[] = {
+ {V_CHAR, 0},
+ {V_ID, 1, MACHINE, NAME, MACH_ID, SMS_MACHINE},
};
static struct validate apcp_validate = {
- VOchar0,
- 1,
+ apcp_valobj,
+ 2,
NAME,
"p.name = \"%s\"",
1,
set_modtime,
};
+static struct validate dpcp_validate = {
+ 0,
+ 0,
+ NAME,
+ "p.name = \"%s\"",
+ 1,
+ 0,
+ 0,
+ 0,
+ 0,
+};
+
static char *gali_fields[] = {
NAME, TYPE, "trans",
NAME, TYPE, "trans",
"%c = u.login, %c = text(u.uid), %c = u.shell, %c = u.last, %c = u.first, %c = u.middle",
galo_fields,
6,
- "u.status == 1",
+ "u.status = 1",
0,
0,
},
RETRIEVE,
"s",
"servers",
- "%c = s.name, %c = text(s.update_int), %c = s.target_file, %c = s.script, %c = text(s.dfgen), %c = s.type, %c = text(s.enable), %c = text(s.inprogress), %c = text(s.harderror), %c = s.errmsg, %c = s.acl_type, %c = text(s.acl_id), %c = s.modtime, %c = text(s.modby), %c = s.modwith",
+ "%c = s.name, %c = text(s.update_int), %c = s.target_file, %c = s.script, %c = text(s.dfgen), %c = text(s.dfcheck), %c = s.type, %c = text(s.enable), %c = text(s.inprogress), %c = text(s.harderror), %c = s.errmsg, %c = s.acl_type, %c = text(s.acl_id), %c = s.modtime, %c = text(s.modby), %c = s.modwith",
gsin_fields,
- 15,
+ 16,
"s.name = uppercase(\"%s\")",
1,
&gsin_validate,
UPDATE,
"s",
"servers",
- "harderror = 0",
+ "harderror = 0, dfcheck = s.dfgen",
dsin_fields,
0,
"s.name = uppercase(\"%s\")",
UPDATE,
"s",
"servers",
- "dfgen = int4(%c), inprogress = int1(%c), harderror = int1(%c), errmsg = %c",
+ "dfgen = int4(%c), dfcheck = int4(%c), inprogress = int1(%c), harderror = int1(%c), errmsg = %c",
ssif_fields,
- 4,
+ 5,
"s.name = uppercase(\"%s\")",
1,
&ssif_validate,
"set_server_host_internal",
"sshi",
UPDATE,
- "sh",
+ "s",
"serverhosts",
"override = int1(%c), success = int1(%c), inprogress = int1(%c), hosterror = int1(%c), hosterrmsg = %c, ltt = int4(%c), lts = int4(%c)",
sshi_fields,
7,
- "sh.service = uppercase(\"%s\") and sh.mach_id = %d",
+ "s.service = uppercase(\"%s\") and s.mach_id = %d",
2,
&sshi_validate,
},
"%c = filesys.label, %c = users.login, %c = text(nq.quota), %c = nfsphys.dir, %c = machine.name, %c = nq.modtime, %c = text(nq.modby), %c = nq.modwith",
gnfq_fields,
8,
- "filesys.label = \"%s\" and users.users_id = %d and filesys.phys_id = nfsphys.nfsphys_id and machine.mach_id = filesys.mach_id and users.users_id = nq.users_id and filesys.filsys_id = nq.filsys_id",
+ "filesys.label = \"%s\" and nq.users_id = %d and filesys.filsys_id = nq.filsys_id and nfsphys.nfsphys_id = nq.phys_id and machine.mach_id = filesys.mach_id and users.users_id = nq.users_id",
2,
&gnfq_validate,
},
"%c = filesys.label, %c = users.login, %c = text(nq.quota), %c = nfsphys.dir, %c = machine.name",
gnqp_fields,
5,
- "filesys.mach_id = %d and nfsphys.dir = \"%s\" and nq.filsys_id = filesys.filsys_id and nfsphys.nfsphys_id = filesys.phys_id and users.users_id = nq.users_id and machine.mach_id = filesys.mach_id",
+ "nfsphys.mach_id = %d and nfsphys.dir = \"%s\" and nq.phys_id = nfsphys.nfsphys_id and filesys.filsys_id = nq.filsys_id and users.users_id = nq.users_id and machine.mach_id = nfsphys.mach_id",
2,
&VDmach,
},
APPEND,
"nq",
"nfsquota",
- "filsys_id = %i4, users_id = %i4, quota = int4(%c)",
+ "filsys_id = filesys.filsys_id, users_id = %i4, quota = int4(%c), phys_id = filesys.phys_id",
anfq_fields,
- 3,
- (char *)0,
- 0,
+ 2,
+ "filesys.filsys_id = %d",
+ 1,
&anfq_validate,
},
1,
&cmol_validate,
},
-
+#ifdef notdef
{
/* Q_AUGR - ADD_USER_GROUP */
"add_user_group",
0,
&augr_validate,
},
-
+#endif
{
/* Q_GZCL - GET_ZEPHYR_CLASS */
"get_zephyr_class",
RETRIEVE,
"p",
"printcap",
- "%c = p.name, %c = p.pcap, %c = p.modtime, %c = text(p.modby), %c = p.modwith",
+ "%c = p.name, %c = machine.name, %c = p.dir, %c = p.rp, %c = p.comments, %c = p.modtime, %c = text(p.modby), %c = p.modwith",
gpcp_fields,
- 5,
- "p.name = \"%s\"",
+ 8,
+ "p.name = \"%s\" and machine.mach_id = p.mach_id",
1,
&VDsortf,
},
APPEND,
"p",
"printcap",
- "name = %c, pcap = %c",
+ "name = %c, mach_id = %i4, dir = %c, rp = %c, comments = %c",
apcp_fields,
- 2,
+ 5,
0,
0,
&apcp_validate,
0,
"p.name = \"%s\"",
1,
- &apcp_validate,
+ &dpcp_validate,
},
{