#include <rx/rx.h>
#include <rx/rxstat.h>
+#ifdef AFS_NT40_ENV
+# include <afs/krb5_nt.h>
+#endif
+
#include <afs/afs_Admin.h>
#include <afs/pthread_glock.h>
#include <afs/cellconfig.h>
#include <afs/vlserver.h>
#include <afs/pterror.h>
#include <afs/bnode.h>
-#include <afs/volser.h>
#include <afs/afscbint.h>
-
-#ifdef AFS_NT40_ENV
-# define EncryptionKey Krb5EncryptionKey
-# include <krb5/krb5.h>
-# undef EncryptionKey
-#endif
+#include <afs/volser.h>
#include "afs_AdminInternal.h"
#include "afs_utilAdmin.h"
initialize_AU_error_table();
initialize_AV_error_table();
initialize_VOLS_error_table();
+#ifdef AFS_KRB5_ERROR_ENV
+ initialize_krb5();
+#endif
error_init_done = 1;
}
+/*
+ * (*errorTextP) will not be freed by the caller.
+ */
int ADMINAPI
util_AdminErrorCodeTranslate(afs_status_t errorCode, int langId,
const char **errorTextP, afs_status_p st)
*errorTextP = afs_error_message(code);
#ifdef AFS_KRB5_ERROR_ENV
if (strncmp(*errorTextP, "unknown", strlen("unknown")) == 0) {
- *errorTextP = krb5_get_error_message(NULL, code);
+ const char *msg = fetch_krb5_error_message(code);
+ if (msg)
+ *errorTextP = msg;
}
#endif
rc = 1;
*/
typedef struct database_server_get {
- int total;
- int index;
+ unsigned int total;
+ unsigned int index;
struct afsconf_dir *conf;
struct afsconf_cell cell;
util_databaseServerEntry_t server[CACHED_ITEMS];
{
int rc = 0;
afs_status_t tst = 0;
- afs_admin_iterator_p iter =
- (afs_admin_iterator_p) malloc(sizeof(afs_admin_iterator_t));
- database_server_get_p serv =
- (database_server_get_p) calloc(1, sizeof(database_server_get_t));
+ afs_admin_iterator_p iter = malloc(sizeof(afs_admin_iterator_t));
+ database_server_get_p serv = calloc(1, sizeof(database_server_get_t));
char copyCell[MAXCELLCHARS];
/*
s->stats_v1.func_index = *(ptr++);
hi = *(ptr++);
lo = *(ptr++);
- hset64(s->stats_v1.invocations, hi, lo);
+ s->stats_v1.invocations = ((afs_uint64) hi << 32) + lo;
hi = *(ptr++);
lo = *(ptr++);
- hset64(s->stats_v1.bytes_sent, hi, lo);
+ s->stats_v1.bytes_sent = ((afs_uint64) hi << 32) + lo;
hi = *(ptr++);
lo = *(ptr++);
- hset64(s->stats_v1.bytes_rcvd, hi, lo);
+ s->stats_v1.bytes_rcvd = ((afs_uint64) hi << 32) + lo;
s->stats_v1.queue_time_sum.sec = *(ptr++);
s->stats_v1.queue_time_sum.usec = *(ptr++);
s->stats_v1.queue_time_sum_sqr.sec = *(ptr++);
{
int rc = 0;
afs_status_t tst = 0;
- afs_admin_iterator_p iter =
- (afs_admin_iterator_p) malloc(sizeof(afs_admin_iterator_t));
- rpc_stat_get_p stat = (rpc_stat_get_p) malloc(sizeof(rpc_stat_get_t));
+ afs_admin_iterator_p iter = malloc(sizeof(afs_admin_iterator_t));
+ rpc_stat_get_p stat = malloc(sizeof(rpc_stat_get_t));
if (conn == NULL) {
tst = ADMRXCONNNULL;
goto fail_util_CMGetServerPrefsBegin;
}
- iter = (afs_admin_iterator_p) malloc(sizeof(afs_admin_iterator_t));
+ iter = malloc(sizeof(afs_admin_iterator_t));
if (iter == NULL) {
tst = ADMNOMEM;
goto fail_util_CMGetServerPrefsBegin;
}
- pref = (cm_srvr_pref_get_p) malloc(sizeof(cm_srvr_pref_get_t));
+ pref = malloc(sizeof(cm_srvr_pref_get_t));
if (pref == NULL) {
free(iter);
tst = ADMNOMEM;
goto fail_util_CMListCellsBegin;
}
- iter = (afs_admin_iterator_p) malloc(sizeof(afs_admin_iterator_t));
+ iter = malloc(sizeof(afs_admin_iterator_t));
if (iter == NULL) {
tst = ADMNOMEM;
goto fail_util_CMListCellsBegin;
}
- cell = (cm_list_cell_get_p) malloc(sizeof(cm_list_cell_get_t));
+ cell = malloc(sizeof(cm_list_cell_get_t));
if (cell == NULL) {
free(iter);
tst = ADMNOMEM;
goto fail_util_RXDebugConnectionsBegin;
}
- iter = (afs_admin_iterator_p) malloc(sizeof(afs_admin_iterator_t));
+ iter = malloc(sizeof(afs_admin_iterator_t));
if (iter == NULL) {
tst = ADMNOMEM;
goto fail_util_RXDebugConnectionsBegin;
goto fail_util_RXDebugConnectionsBegin;
}
- t = (rxdebug_conn_get_p) malloc(sizeof(rxdebug_conn_get_t));
+ t = malloc(sizeof(rxdebug_conn_get_t));
if (t == NULL) {
free(iter);
tst = ADMNOMEM;
goto fail_util_RXDebugPeersBegin;
}
- iter = (afs_admin_iterator_p) malloc(sizeof(afs_admin_iterator_t));
+ iter = malloc(sizeof(afs_admin_iterator_t));
if (iter == NULL) {
tst = ADMNOMEM;
goto fail_util_RXDebugPeersBegin;
goto fail_util_RXDebugPeersBegin;
}
- t = (rxdebug_peer_get_p) malloc(sizeof(rxdebug_peer_get_t));
+ t = malloc(sizeof(rxdebug_peer_get_t));
if (t == NULL) {
free(iter);
tst = ADMNOMEM;