/*
* Copyright 2000, International Business Machines Corporation and others.
* All Rights Reserved.
- *
+ *
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
#include <netinet/in.h>
#endif
#endif
+#include <rx/rx_opaque.h>
+#include <opr/queue.h>
#define MAXCELLCHARS 64
#define MAXHOSTCHARS 64
struct afsconf_cellalias aliasInfo;
};
+/*!
+ * A set of bit flags to control the selection of a security object
+ */
+#define AFSCONF_SECOPTS_NOAUTH 0x1
+#define AFSCONF_SECOPTS_LOCALAUTH 0x2
+#define AFSCONF_SECOPTS_ALWAYSENCRYPT 0x4
+#define AFSCONF_SECOPTS_FALLBACK_NULL 0x8
+typedef afs_uint32 afsconf_secflags;
+
struct afsconf_dir {
char *name; /* pointer to dir prefix */
char *cellName; /* cell name, if any, we're in */
struct afsconf_entry *entries; /* list of cell entries */
- struct afsconf_keys *keystr; /* structure containing keys */
+ struct opr_queue keyList; /* list of keys */
afs_int32 timeRead; /* time stamp of file last read */
+ afs_int32 timeCheck; /* time of last check for update */
struct afsconf_aliasentry *alias_entries; /* cell aliases */
+ afsconf_secflags securityFlags;
};
extern afs_int32 afsconf_FindService(const char *aname);
extern int afsconf_GetLocalCell(struct afsconf_dir *adir,
char *aname, afs_int32 alen);
extern int afsconf_Close(struct afsconf_dir *adir);
-extern int afsconf_IntGetKeys(struct afsconf_dir *adir);
+extern int afsconf_UpToDate(void *rock);
+
+struct afsconf_keys;
extern int afsconf_GetKeys(struct afsconf_dir *adir,
struct afsconf_keys *astr);
+
struct ktc_encryptionKey;
extern afs_int32 afsconf_GetLatestKey(struct afsconf_dir *adir,
- afs_int32 * avno,
+ afs_int32 * avno,
struct ktc_encryptionKey *akey);
extern int afsconf_GetKey(void *rock, int avno,
struct ktc_encryptionKey *akey);
char akey[8], afs_int32 overwrite);
extern int afsconf_DeleteKey(struct afsconf_dir *adir, afs_int32 akvno);
+struct afsconf_typedKey;
+struct afsconf_typedKeyList {
+ int nkeys;
+ struct afsconf_typedKey **keys;
+};
+
+typedef enum {
+ afsconf_rxkad = 0,
+ afsconf_rxgk =1
+} afsconf_keyType;
+
+extern struct afsconf_typedKey *
+ afsconf_typedKey_get(struct afsconf_typedKey *);
+extern void afsconf_typedKey_put(struct afsconf_typedKey **);
+extern struct afsconf_typedKey *
+ afsconf_typedKey_new(afsconf_keyType type, int kvno,
+ int subType, struct rx_opaque *key);
+extern void afsconf_typedKey_free(struct afsconf_typedKey **);
+
+extern void afsconf_typedKey_values(struct afsconf_typedKey *key,
+ afsconf_keyType *type,
+ int *kvno,
+ int *minorType,
+ struct rx_opaque **keyMaterial);
+
+extern int afsconf_GetAllKeys(struct afsconf_dir *,
+ struct afsconf_typedKeyList **);
+extern int afsconf_GetKeysByType(struct afsconf_dir *dir,
+ afsconf_keyType type, int kvno,
+ struct afsconf_typedKeyList **);
+extern int afsconf_GetKeyByTypes(struct afsconf_dir *dir,
+ afsconf_keyType type, int kvno, int subType,
+ struct afsconf_typedKey **);
+extern int afsconf_GetLatestKeysByType(struct afsconf_dir *dir,
+ afsconf_keyType type,
+ struct afsconf_typedKeyList **);
+extern int afsconf_GetLatestKeyByTypes(struct afsconf_dir *dir,
+ afsconf_keyType type, int subType,
+ struct afsconf_typedKey **);
+extern void afsconf_PutTypedKeyList(struct afsconf_typedKeyList **keys);
+extern int afsconf_AddTypedKey(struct afsconf_dir *dir,
+ struct afsconf_typedKey *key,
+ int overwrite);
+extern int afsconf_DeleteKeyByType(struct afsconf_dir *dir,
+ afsconf_keyType type, int kvno);
+extern int afsconf_DeleteKeyBySubType(struct afsconf_dir *dir,
+ afsconf_keyType type, int kvno,
+ int subType);
+
/* authcon.c */
struct rx_securityClass;
-extern afs_int32 afsconf_ServerAuth(void *arock,
+extern afs_int32 afsconf_ServerAuth(void *arock,
struct rx_securityClass **,
afs_int32 *);
extern afs_int32 afsconf_ClientAuth(void *arock,
struct rx_securityClass **astr,
afs_int32 * aindex);
-/*!
- * A set of bit flags to control the selection of a security object
- */
-#define AFSCONF_SECOPTS_NOAUTH 0x1
-#define AFSCONF_SECOPTS_LOCALAUTH 0x2
-#define AFSCONF_SECOPTS_ALWAYSENCRYPT 0x4
-#define AFSCONF_SECOPTS_FALLBACK_NULL 0x8
-typedef afs_uint32 afsconf_secflags;
extern afs_int32 afsconf_ClientAuthToken(struct afsconf_cell *info,
afsconf_secflags flags,
afs_int32 *scIndex,
time_t *expires);
-/* Flags for this function */
-#define AFSCONF_SEC_OBJS_RXKAD_CRYPT 1
-extern void afsconf_BuildServerSecurityObjects(struct afsconf_dir *,
- afs_uint32,
+extern void afsconf_SetSecurityFlags(struct afsconf_dir *dir,
+ afsconf_secflags flags);
+
+extern void afsconf_BuildServerSecurityObjects(void *,
struct rx_securityClass ***,
afs_int32 *);
/* writeconfig.c */
-int afsconf_SetExtendedCellInfo(struct afsconf_dir *adir, const char *apath,
+int afsconf_SetExtendedCellInfo(struct afsconf_dir *adir, const char *apath,
struct afsconf_cell *acellInfo, char clones[]);
-int afsconf_SetCellInfo(struct afsconf_dir *adir, const char *apath,
+int afsconf_SetCellInfo(struct afsconf_dir *adir, const char *apath,
struct afsconf_cell *acellInfo);
/* userok.c */
struct rx_call;
+struct rx_identity;
extern int afsconf_CheckAuth(void *arock, struct rx_call *acall);
extern int afsconf_GetNoAuthFlag(struct afsconf_dir *adir);
extern void afsconf_SetNoAuthFlag(struct afsconf_dir *adir, int aflag);
extern int afsconf_DeleteUser(struct afsconf_dir *adir, char *auser);
-extern int afsconf_GetNthUser(struct afsconf_dir *adir, afs_int32 an,
+extern int afsconf_DeleteIdentity(struct afsconf_dir *, struct rx_identity *);
+extern int afsconf_GetNthUser(struct afsconf_dir *adir, afs_int32 an,
char *abuffer, afs_int32 abufferLen);
+extern int afsconf_GetNthIdentity(struct afsconf_dir *, int,
+ struct rx_identity **);
extern int afsconf_AddUser(struct afsconf_dir *adir, char *aname);
+extern int afsconf_AddIdentity(struct afsconf_dir *adir, struct rx_identity *);
extern int afsconf_SuperUser(struct afsconf_dir *adir, struct rx_call *acall,
char *namep);
+extern int afsconf_SuperIdentity(struct afsconf_dir *, struct rx_call *,
+ struct rx_identity **);
+extern int afsconf_IsSuperIdentity(struct afsconf_dir *, struct rx_identity *);
/* some well-known ports and their names; new additions to table in cellconfig.c, too */
#define AFSCONF_FILESERVICE "afs"