#endif
#include <afs/vice.h>
-#include <afs/auth.h>
+#include "auth.h"
#include <afs/venus.h>
#include <afs/afsutil.h>
#include "ktc.h"
#ifdef AFS_KERBEROS_ENV
-#include <afs/cellconfig.h>
+#include "cellconfig.h"
static char lcell[MAXCELLCHARS];
#define TKT_ROOT "/tmp/tkt"
#define BUFSIZ 4096
#endif
-#ifdef AFS_HPUX_ENV
-#include <unistd.h>
-#endif
#if defined(AFS_AIX_ENV) || defined(AFS_SUN5_ENV)
static struct flock fileWlock = { F_WRLCK, 0, 0, 0, 0, 0 };
static struct flock fileRlock = { F_RDLCK, 0, 0, 0, 0, 0 };
static void ktc_LocalCell(void);
#endif /* AFS_KERBEROS_ENV */
-#ifdef AFS_DUX40_ENV
-#define PIOCTL afs_pioctl
-#elif defined(UKERNEL)
-#define PIOCTL(A,B,C,D) call_syscall(AFSCALL_PIOCTL,A,B,C,D)
+#if defined(UKERNEL)
+#define PIOCTL(A,B,C,D) (errno = (call_syscall(AFSCALL_PIOCTL,A,B,C,D)), errno?-1:0)
#else
#define PIOCTL pioctl
#endif
struct ktc_principal server;
struct ktc_principal client;
struct ktc_token token;
-} local_tokens[MAXLOCALTOKENS] = { {
-0}, {
-0}, {
-0}, {
-0}};
+} local_tokens[MAXLOCALTOKENS];
static int
GetToken(struct ktc_principal *aserver, struct ktc_token *atoken,
0)) {
found = i; /* replace existing entry */
break;
- } else /* valid, but no match */
- ;
+ } else {
+ /* valid, but no match */
+ }
} else
found = i; /* remember this empty slot */
if (found == -1)
memset(&server, 0, sizeof(server));
strcpy(server.name, "afs");
- strcpy(server.cell, token->cell);
+ if (strlcpy(server.cell, token->cell, sizeof(server.cell))
+ >= sizeof(server.cell)) {
+ free(rxkadToken);
+ return KTC_INVAL;
+ }
code = ktc_SetToken(&server, rxkadToken, &client, flags);
free(rxkadToken);
return code;
memset(ktcToken, 0, sizeof(struct ktc_token));
strcpy(server.name, "afs");
- strcpy(server.cell, cellName);
+
+ if (cellName != NULL)
+ strcpy(server.cell, cellName);
+
code = GetToken(&server, ktcToken, sizeof(struct ktc_token),
NULL /*client*/, &viceid);
if (code == 0) {
/* got token for cell; check that it will fit */
maxLen =
atokenLen - sizeof(struct ktc_token) + MAXKTCTICKETLEN;
- if (maxLen < tktLen) {
+ if (tktLen < 0 || tktLen > maxLen) {
UNLOCK_GLOBAL_MUTEX;
return KTC_TOOBIG;
}
if (aclient || aviceid) {
if (aclient) {
- strcpy(aclient->cell, cellp);
+ strlcpy(aclient->cell, cellp, sizeof(aclient->cell));
aclient->instance[0] = 0;
}
tp += temp; /* skip clear token itself */
tp += sizeof(afs_int32); /* skip primary flag */
/* tp now points to the cell name */
- strcpy(aserver->cell, tp);
+ strlcpy(aserver->cell, tp, sizeof(aserver->cell));
aserver->instance[0] = 0;
strcpy(aserver->name, "afs");
#endif /* NO_AFS_CLIENT */
afs_uint32 g0, g1;
afs_uint32 h, l, ret;
int ngroups;
-#ifdef AFS_LINUX26_ENV
+#ifdef AFS_PAG_ONEGROUP_ENV
int i;
#endif
ngroups = getgroups(sizeof groups / sizeof groups[0], groups);
-#ifdef AFS_LINUX26_ENV
- /* check for AFS_LINUX26_ONEGROUP_ENV PAGs */
+#ifdef AFS_PAG_ONEGROUP_ENV
+ /* Check for one-group PAGs. */
for (i = 0; i < ngroups; i++) {
if (((groups[i] >> 24) & 0xff) == 'A') {
return groups[i];
*/
#if 0
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
#include <sys/file.h>
#include <krb.h>
#endif
for (senv = environ, numenv = 0; *senv; senv++)
numenv++;
- newenv = (char **)malloc((numenv + 2) * sizeof(char *));
+ newenv = malloc((numenv + 2) * sizeof(char *));
for (senv = environ, denv = newenv; *senv; senv++) {
if (strncmp(*senv, "KRBTKFILE=", 10) != 0 &&