static int badlistchars[] = {
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* ^@ - ^O */
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* ^P - ^_ */
- 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, /* SPACE - / */
+ 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, /* SPACE - / */
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, /* 0 - ? */
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* @ - O */
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, /* P - _ */
id = *(int *)argv[0];
dir = argv[1];
- EXEC SQL REPEATED SELECT label INTO :cnt FROM filesys fs, nfsphys np
+ EXEC SQL REPEATED SELECT fs.tid INTO :cnt FROM filesys fs, nfsphys np
WHERE fs.mach_id = :id AND fs.phys_id = np.nfsphys_id
AND np.mach_id = :id AND np.dir = :dir;
if (cnt > 0)
free(kname);
rsig.data_buf[rsig.data_size] = 0;
si.rawsig = (unsigned char *)strsave(rsig.data_buf);
-#ifdef DEBUG
- com_err(whoami, 0, "rawsig length = %d, sig=\"%s\"", strlen(si.rawsig), si.rawsig);
-#endif /* DEBUG */
+ if (log_flags & LOG_GDSS)
+ com_err(whoami, 0, "rawsig length = %d, sig=\"%s\"", strlen(si.rawsig), si.rawsig);
GDSS_Recompose(&si, sigbuf);
free(si.rawsig);
free(argv[U_SIGNATURE]);
argv[U_SIGNATURE] = strsave(sigbuf);
-#ifdef DEBUG
- com_err(whoami, 0, "generated signature length %d", strlen(sigbuf));
-#endif /* DEBUG */
+ if (log_flags & LOG_GDSS)
+ com_err(whoami, 0, "generated signature length %d", strlen(sigbuf));
}
#endif /* GDSS */
(*action)(q->vcnt, argv, actarg);
#ifdef GDSS
if (q->vcnt == U_END && *argv[U_SIGNATURE]) {
+ /* unquote ' chars in signature */
+ for (dst = src = argv[U_SIGNATURE]; *src; ) {
+ if (*src == '\'')
+ src++;
+ *dst++ = *src++;
+ }
+ *dst = 0;
sprintf(databuf, "%s:%s", argv[U_NAME], argv[U_MITID]);
/* skip bytes for timestamp & kname */
si.rawsig = (unsigned char *) rawsig;
} else if (status)
return(status);
timestamp = si.timestamp;
- } else
- return(gdss2et(status));
+ } else {
+ if (log_flags & LOG_GDSS)
+ hex_dump(argv[U_SIGNATURE]);
+ return(gdss2et(status));
+ }
} else {
rawsig[0] = 0;
sigwho = 0;
{
EXEC SQL BEGIN DECLARE SECTION;
int who, status, id;
- char *entity, *name;
+ char *entity, *name, *src, *dst;
EXEC SQL END DECLARE SECTION;
#ifdef GDSS
char databuf[32], *kname_unparse();
#ifdef GDSS
if (q->vcnt == U_MODTIME && *argv[U_SIGNATURE + 1]) {
+ /* unquote ' chars in signature */
+ for (dst = src = argv[U_SIGNATURE+1]; *src; ) {
+ if (*src == '\'')
+ src++;
+ *dst++ = *src++;
+ }
+ *dst = 0;
login = malloc(1);
status = id_to_name(id, "USER", &login);
sprintf(databuf, "%s:%s", login, argv[U_MITID+1]);
} else if (status)
return(status);
timestamp = si.timestamp;
- } else
- return(gdss2et(status));
+ } else {
+ if (log_flags & LOG_GDSS)
+ hex_dump(argv[U_SIGNATURE+1]);
+ return(gdss2et(status));
+ }
} else {
rawsig[0] = 0;
sigwho = 0;
/* check new login name */
EXEC SQL REPEATED SELECT COUNT(login) INTO :rowcount FROM users
- WHERE login = LEFT(:login,SIZE(login)) AND users_id != :users_id;
+ WHERE login = :login AND users_id != :users_id;
if (ingres_errno) return(mr_errcode);
if (rowcount > 0) return(MR_IN_USE);
EXEC SQL REPEATED SELECT COUNT(name) INTO :rowcount FROM list
- WHERE name = LEFT(:login,SIZE(name));
+ WHERE name = :login;
if (ingres_errno) return(mr_errcode);
if (rowcount > 0) return(MR_IN_USE);
EXEC SQL REPEATED SELECT COUNT(label) INTO :rowcount FROM filesys
- WHERE label = LEFT(:login,SIZE(label));
+ WHERE label = :login;
if (ingres_errno) return(mr_errcode);
if (rowcount > 0) return(MR_IN_USE);
com_err(whoami, 0, "login name OK");
int i;
i = atoi(argv[0]);
log_flags = i;
- if (i && LOG_SQL) {
+ if (i & LOG_SQL) {
EXEC SQL set printqry;
} else {
- EXEC SQL set no printqry;
+ EXEC SQL set noprintqry;
}
+ return(MR_SUCCESS);
}
*index(data_type, ' ') = 0;
if (!strcmp(data_type, "user")) {
/* USER */
+ if (index(name, '@'))
+ return(MR_USER);
status = name_to_id(name, data_type, &id);
if (status && (status == MR_NO_MATCH || status == MR_NOT_UNIQUE))
return(MR_USER);
}
+
+static hex_dump(p)
+unsigned char *p;
+{
+ char buf[BUFSIZ];
+ int i;
+
+ fprintf(stderr, "Size: %d\n", strlen(p));
+ while (strlen(p) >= 8) {
+ fprintf(stderr, "%02x %02x %02x %02x %02x %02x %02x %02x\n",
+ p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]);
+ p += 8;
+ }
+ switch (strlen(p)) {
+ case 7:
+ fprintf(stderr, "%02x %02x %02x %02x %02x %02x %02x\n",
+ p[0], p[1], p[2], p[3], p[4], p[5], p[6]);
+ break;
+ case 6:
+ fprintf(stderr, "%02x %02x %02x %02x %02x %02x\n",
+ p[0], p[1], p[2], p[3], p[4], p[5]);
+ break;
+ case 5:
+ fprintf(stderr, "%02x %02x %02x %02x %02x\n",
+ p[0], p[1], p[2], p[3], p[4]);
+ break;
+ case 4:
+ fprintf(stderr, "%02x %02x %02x %02x\n",
+ p[0], p[1], p[2], p[3]);
+ break;
+ case 3:
+ fprintf(stderr, "%02x %02x %02x\n",
+ p[0], p[1], p[2]);
+ break;
+ case 2:
+ fprintf(stderr, "%02x %02x\n",
+ p[0], p[1]);
+ break;
+ case 1:
+ fprintf(stderr, "%02x\n",
+ p[0]);
+ break;
+ default:
+ return;
+ }
+}
+
/* eof:qsupport.dc */