
This is the second of two commits in a series that must be picked together. This series of two commits moves parts of lib/krb5/ infrastructure functionality to lib/base/, leaving behind wrappers. Some parts of libkrb5 are entirely generic or easily made so, and could be useful in various parts of Heimdal that are not specific to the krb5 API, such as: - lib/gssapi/ (especially since the integration of NegoEx) - lib/hx509/ - bx509d (which should really move out of kdc/) For the above we need to move these bits of lib/krb5/: - lib/krb5/config_file.c (all of it, leaving forwardings behind) - lib/krb5/config_reg.c (all of it) - lib/krb5/plugin.c (all of it, leaving forwardings behind) - lib/krb5/log.c (all of it, ditto) - lib/krb5/heim_err.et (all of it) And because of those two, these too must also move: - lib/krb5/expand_path.c (all of it, leaving forwardings behind) - lib/krb5/warn.c (just the warning functions, ditto) The changes to the moved files are mostly quite straightforward and are best reviewed with --word-diff=color. We're also creating a heim_context and a heim API to go with it. But it's as thin as possible, with as little state as necessary to enable this move. Functions for dealing with error messages use callbacks. Moving plugin.c does have one knock-on effect on all users of the old krb5 plugin API (which remains), which is that a global search and replace of struct krb5_plugin_data to struct heim_plugin_data was needed, though the layout and size of that structure doesn't change, so the ABI doesn't either. As well, we now build lib/vers/ and lib/com_err/ before lib/base/ so as to be able to move lib/krb5/heim_err.et to lib/base/ so that we can make use of HEIM_ERR_* in lib/base/, specifically in the files that moved. Once this is all done we'll be able to use config files and plugins in lib/hx509/, we'll be able to move bx509d out of kdc/, and so on. Most if not all of the new functions in lib/base/ are Heimdal-private, thus calling conventions for them are not declared. Status: - builds and passes CIs (Travis, Appveyor) - ran make check-valgrind and no new leaks or other memory errors - ready for review HOW TO REVIEW: $ # Review file moves: $ git log --stat -n1 HEAD^ $ $ # Review changes to moved files using --word-diff=color $ git log -p -b -w --word-diff=color HEAD^..HEAD \ lib/base/config_file.c \ lib/base/config_reg.c \ lib/base/expand_path.c \ lib/base/warn.c \ lib/krb5/config_file.c \ lib/krb5/config_reg.c \ lib/krb5/expand_path.c \ lib/krb5/warn.c $ $ # Review the whole thing, possibly adding -b and/or -w, and $ # maybe --word-diff=color: $ git log -p origin/master..HEAD $ git log -p -b -w origin/master..HEAD $ git log -p -b -w --word-diff=color origin/master..HEAD TBD (future commits): - make lib/gssapi use the new heimbase functions - move kx509/bx509d common code to lib/hx509/ or other approp. location - move bx509d out of kdc/
205 lines
6.0 KiB
C
205 lines
6.0 KiB
C
/*
|
|
* Copyright (c) 1997-2000 Kungliga Tekniska Högskolan
|
|
* (Royal Institute of Technology, Stockholm, Sweden).
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
*
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* 3. Neither the name of the Institute nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
/* $Id$ */
|
|
|
|
#ifndef __kadm5_privatex_h__
|
|
#define __kadm5_privatex_h__
|
|
|
|
#include "kadm5-hook.h"
|
|
|
|
#ifdef HAVE_SYS_UN_H
|
|
#include <sys/un.h>
|
|
#endif
|
|
|
|
struct kadm_func {
|
|
kadm5_ret_t (*chpass_principal) (void *, krb5_principal, int,
|
|
int, krb5_key_salt_tuple*, const char*);
|
|
kadm5_ret_t (*create_principal) (void*, kadm5_principal_ent_t, uint32_t,
|
|
int, krb5_key_salt_tuple *,
|
|
const char*);
|
|
kadm5_ret_t (*delete_principal) (void*, krb5_principal);
|
|
kadm5_ret_t (*destroy) (void*);
|
|
kadm5_ret_t (*flush) (void*);
|
|
kadm5_ret_t (*get_principal) (void*, krb5_principal,
|
|
kadm5_principal_ent_t, uint32_t);
|
|
kadm5_ret_t (*get_principals) (void*, const char*, char***, int*);
|
|
kadm5_ret_t (*get_privs) (void*, uint32_t*);
|
|
kadm5_ret_t (*modify_principal) (void*, kadm5_principal_ent_t, uint32_t);
|
|
kadm5_ret_t (*randkey_principal) (void*, krb5_principal, krb5_boolean, int,
|
|
krb5_key_salt_tuple*, krb5_keyblock**,
|
|
int*);
|
|
kadm5_ret_t (*rename_principal) (void*, krb5_principal, krb5_principal);
|
|
kadm5_ret_t (*chpass_principal_with_key) (void *, krb5_principal, int,
|
|
int, krb5_key_data *);
|
|
kadm5_ret_t (*lock) (void *);
|
|
kadm5_ret_t (*unlock) (void *);
|
|
kadm5_ret_t (*setkey_principal_3) (void *, krb5_principal, krb5_boolean,
|
|
int, krb5_key_salt_tuple *,
|
|
krb5_keyblock *, int);
|
|
kadm5_ret_t (*prune_principal) (void *, krb5_principal, int);
|
|
};
|
|
|
|
typedef struct kadm5_hook_context {
|
|
void *dsohandle;
|
|
const kadm5_hook_ftable *hook;
|
|
void *data;
|
|
} kadm5_hook_context;
|
|
|
|
/* XXX should be integrated */
|
|
typedef struct kadm5_common_context {
|
|
krb5_context context;
|
|
krb5_boolean my_context;
|
|
struct kadm_func funcs;
|
|
void *data;
|
|
} kadm5_common_context;
|
|
|
|
typedef struct kadm5_log_peer {
|
|
int fd;
|
|
char *name;
|
|
krb5_auth_context ac;
|
|
struct kadm5_log_peer *next;
|
|
} kadm5_log_peer;
|
|
|
|
typedef struct kadm5_log_context {
|
|
char *log_file;
|
|
int log_fd;
|
|
int read_only;
|
|
int lock_mode;
|
|
uint32_t version;
|
|
time_t last_time;
|
|
#ifndef NO_UNIX_SOCKETS
|
|
struct sockaddr_un socket_name;
|
|
#else
|
|
struct addrinfo *socket_info;
|
|
#endif
|
|
krb5_socket_t socket_fd;
|
|
} kadm5_log_context;
|
|
|
|
typedef struct kadm5_server_context {
|
|
krb5_context context;
|
|
krb5_boolean my_context;
|
|
struct kadm_func funcs;
|
|
/* */
|
|
kadm5_config_params config;
|
|
HDB *db;
|
|
int keep_open;
|
|
krb5_principal caller;
|
|
unsigned acl_flags;
|
|
kadm5_log_context log_context;
|
|
size_t num_hooks;
|
|
kadm5_hook_context **hooks;
|
|
} kadm5_server_context;
|
|
|
|
typedef struct kadm5_client_context {
|
|
krb5_context context;
|
|
krb5_boolean my_context;
|
|
struct kadm_func funcs;
|
|
/* */
|
|
krb5_auth_context ac;
|
|
char *realm;
|
|
char *admin_server;
|
|
int kadmind_port;
|
|
krb5_socket_t sock;
|
|
char *client_name;
|
|
char *service_name;
|
|
krb5_prompter_fct prompter;
|
|
const char *keytab;
|
|
krb5_ccache ccache;
|
|
kadm5_config_params *realm_params;
|
|
} kadm5_client_context;
|
|
|
|
typedef struct kadm5_ad_context {
|
|
krb5_context context;
|
|
krb5_boolean my_context;
|
|
struct kadm_func funcs;
|
|
/* */
|
|
kadm5_config_params config;
|
|
krb5_principal caller;
|
|
krb5_ccache ccache;
|
|
char *client_name;
|
|
char *realm;
|
|
void *ldap_conn;
|
|
char *base_dn;
|
|
} kadm5_ad_context;
|
|
|
|
/*
|
|
* This enum is used in the iprop log file and on the wire in the iprop
|
|
* protocol. DO NOT CHANGE, except to add new op types at the end, and
|
|
* look for places in lib/kadm5/log.c to update.
|
|
*/
|
|
enum kadm_ops {
|
|
kadm_get,
|
|
kadm_delete,
|
|
kadm_create,
|
|
kadm_rename,
|
|
kadm_chpass,
|
|
kadm_modify,
|
|
kadm_randkey,
|
|
kadm_get_privs,
|
|
kadm_get_princs,
|
|
kadm_chpass_with_key,
|
|
kadm_nop,
|
|
kadm_prune,
|
|
kadm_first = kadm_get,
|
|
kadm_last = kadm_prune
|
|
};
|
|
|
|
/* FIXME nop types are currently not implemented */
|
|
enum kadm_nop_type {
|
|
kadm_nop_plain, /* plain nop, not relevance except as uberblock */
|
|
kadm_nop_trunc, /* indicates that the master truncated the log */
|
|
kadm_nop_close /* indicates that the master closed this log */
|
|
};
|
|
|
|
enum kadm_iter_opts {
|
|
kadm_forward = 1,
|
|
kadm_backward = 2,
|
|
kadm_confirmed = 4,
|
|
kadm_unconfirmed = 8
|
|
};
|
|
|
|
enum kadm_recover_mode {
|
|
kadm_recover_commit,
|
|
kadm_recover_replay
|
|
};
|
|
|
|
#define KADMIN_APPL_VERSION "KADM0.1"
|
|
#define KADMIN_OLD_APPL_VERSION "KADM0.0"
|
|
|
|
extern struct heim_plugin_data kadm5_hook_plugin_data;
|
|
|
|
#include "kadm5-private.h"
|
|
|
|
#endif /* __kadm5_privatex_h__ */
|