K5_KEY_COM_ERR,
K5_KEY_GSS_KRB5_SET_CCACHE_OLD_NAME,
K5_KEY_GSS_KRB5_CCACHE_NAME,
- K5_KEY_KDB_ERR_HANDLER,
- K5_KEY_KADM_CLNT_ERR_HANDLER,
K5_KEY_MAX
} k5_key_t;
/* rename shorthand symbols for export */
typedef struct _krb5_db_entry_new {
krb5_magic magic; /* NOT saved */
krb5_ui_2 len;
+ krb5_ui_4 mask; /* members currently changed/set */
krb5_flags attributes;
krb5_deltat max_life;
krb5_deltat max_renewable_life;
krb5_int32 ks_salttype;
} krb5_key_salt_tuple;
-
#define KRB5_KDB_MAGIC_NUMBER 0xdbdbdbdb
#define KRB5_KDB_V1_BASE_LENGTH 38
#define KRB5_KDB_OPEN_RW 0
#define KRB5_KDB_OPEN_RO 1
+#ifndef KRB5_KDB_SRV_TYPE_KDC
+#define KRB5_KDB_SRV_TYPE_KDC 0x0100
+#endif
+
+#ifndef KRB5_KDB_SRV_TYPE_ADMIN
+#define KRB5_KDB_SRV_TYPE_ADMIN 0x0200
+#endif
+
+#ifndef KRB5_KDB_SRV_TYPE_PASSWD
+#define KRB5_KDB_SRV_TYPE_PASSWD 0x0300
+#endif
+
+#ifndef KRB5_KDB_SRV_TYPE_OTHER
+#define KRB5_KDB_SRV_TYPE_OTHER 0x0400
+#endif
+
#define KRB5_KDB_OPT_SET_DB_NAME 0
#define KRB5_KDB_OPT_SET_LOCK_MODE 1
krb5_boolean keepold,
krb5_db_entry * db_entry);
+
krb5_error_code
krb5_dbe_ark( krb5_context context,
krb5_keyblock * master_key,
char * passwd,
krb5_db_entry * db_entry);
-
/* default functions. Should not be directly called */
/*
* Default functions prototype
krb5_boolean keepold,
krb5_db_entry * db_entry);
-
krb5_error_code
krb5_db_create_policy( krb5_context kcontext,
osa_policy_ent_t policy);
krb5_db_free_policy( krb5_context kcontext,
osa_policy_ent_t policy);
-void krb5_db_clr_error(void);
-
#define KRB5_KDB_DEF_FLAGS 0
#endif /* !defined(_WIN32) */
+
#endif /* KRB5_KDB5__ */
return retval;
}
+static void extended_com_err_fn (const char *myprog, errcode_t code,
+ const char *fmt, va_list args)
+{
+ const char *emsg;
+ emsg = krb5_get_error_message (context, code);
+ fprintf (stderr, "%s: %s ", myprog, emsg);
+ krb5_free_error_message (context, emsg);
+ vfprintf (stderr, fmt, args);
+ fprintf (stderr, "\n");
+}
+
char *kadmin_startup(argc, argv)
int argc;
char *argv[];
memset((char *) ¶ms, 0, sizeof(params));
retval = krb5_init_context(&context);
+
+ if (strcmp (whoami, "kadmin.local") == 0)
+ set_com_err_hook(extended_com_err_fn);
+
if (retval) {
com_err(whoami, retval, "while initializing krb5 library");
exit(1);
/*
* Initialize the database.
*/
- if ((kret = krb5_db_open(kcontext, db5util_db_args, KRB5_KDB_OPEN_RW))) {
+ if ((kret = krb5_db_open(kcontext, db5util_db_args,
+ KRB5_KDB_OPEN_RW | KRB5_KDB_SRV_TYPE_OTHER))) {
fprintf(stderr, dbinit_err_fmt,
programname, error_message(kret));
exit_status++;
exit_status++; return;
}
- retval = krb5_db_open(context, db5util_db_args, KRB5_KDB_OPEN_RW);
+ retval = krb5_db_open(context, db5util_db_args,
+ KRB5_KDB_OPEN_RW | KRB5_KDB_SRV_TYPE_OTHER);
if (retval) {
com_err(argv[0], retval, "while initializing the database '%s'",
dbname);
char **db5util_db_args = NULL;
int db5util_db_args_size = 0;
+static void extended_com_err_fn (const char *myprog, errcode_t code,
+ const char *fmt, va_list args)
+{
+ const char *emsg;
+ emsg = krb5_get_error_message (util_context, code);
+ fprintf (stderr, "%s: %s ", myprog, emsg);
+ krb5_free_error_message (util_context, emsg);
+ vfprintf (stderr, fmt, args);
+ fprintf (stderr, "\n");
+}
+
int main(argc, argv)
int argc;
char *argv[];
krb5_error_code retval;
retval = krb5_init_context(&util_context);
+ set_com_err_hook(extended_com_err_fn);
if (retval) {
com_err (progname, retval, "while initializing Kerberos code");
exit(1);
dbactive = FALSE;
valid_master_key = 0;
- if ((retval = krb5_db_open(util_context, db5util_db_args, KRB5_KDB_OPEN_RW))) {
+ if ((retval = krb5_db_open(util_context, db5util_db_args,
+ KRB5_KDB_OPEN_RW | KRB5_KDB_SRV_TYPE_OTHER))) {
com_err(progname, retval, "while initializing database");
exit_status++;
return(1);
kadm5_config_params params;
char **db_args = NULL;
int db_args_size = 0;
+ char *errmsg;
setvbuf(stderr, NULL, _IONBF, 0);
ret = krb5_c_random_os_entropy(context, 1, NULL);
if(ret) {
krb5_klog_syslog(LOG_ERR, "Error getting random seed: %s, aborting",
- error_message(ret));
+ krb5_get_error_message (context, ret));
exit(1);
}
KADM5_STRUCT_VERSION,
KADM5_API_VERSION_2,
db_args,
- &global_server_handle)) !=
- KADM5_OK) {
- const char *e_txt = error_message(ret);
+ &global_server_handle)) != KADM5_OK) {
+ const char *e_txt = krb5_get_error_message (context, ret);
krb5_klog_syslog(LOG_ERR, "%s while initializing, aborting",
e_txt);
fprintf(stderr, "%s: %s while initializing, aborting\n",
if ((ret = kadm5_get_config_params(context, NULL, NULL, ¶ms,
¶ms))) {
- const char *e_txt = error_message(ret);
+ const char *e_txt = krb5_get_error_message (context, ret);
krb5_klog_syslog(LOG_ERR, "%s: %s while initializing, aborting",
whoami, e_txt);
fprintf(stderr, "%s: %s while initializing, aborting\n",
addr.sin_port = htons(params.kadmind_port);
if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
- const char *e_txt = error_message(errno);
+ const char *e_txt = krb5_get_error_message (context, ret);
krb5_klog_syslog(LOG_ERR, "Cannot create TCP socket: %s",
e_txt);
fprintf(stderr, "Cannot create TCP socket: %s",
}
if ((schpw = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
- const char *e_txt = error_message(errno);
+ const char *e_txt = krb5_get_error_message (context, ret);
krb5_klog_syslog(LOG_ERR,
- "cannot create simple chpw socket: %s",
- e_txt);
+ "cannot create simple chpw socket: %s",
+ e_txt);
fprintf(stderr, "Cannot create simple chpw socket: %s",
e_txt);
kadm5_destroy(global_server_handle);
SO_REUSEADDR,
(char *) &allowed,
sizeof(allowed)) < 0) {
- const char *e_txt = error_message(errno);
+ const char *e_txt = krb5_get_error_message (context, ret);
krb5_klog_syslog(LOG_ERR, "Cannot set SO_REUSEADDR: %s",
e_txt);
- fprintf(stderr, "Cannot set SO_REUSEADDR: %s",
- e_txt);
+ fprintf(stderr, "Cannot set SO_REUSEADDR: %s", e_txt);
kadm5_destroy(global_server_handle);
krb5_klog_close(context);
exit(1);
}
if (setsockopt(schpw, SOL_SOCKET, SO_REUSEADDR,
(char *) &allowed, sizeof(allowed)) < 0) {
- const char *e_txt = error_message(errno);
+ const char *e_txt = krb5_get_error_message (context, ret);
krb5_klog_syslog(LOG_ERR, "main",
"cannot set SO_REUSEADDR on simple chpw socket: %s",
e_txt);
if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
int oerrno = errno;
- const char *e_txt = error_message(errno);
+ const char *e_txt = krb5_get_error_message (context, errno);
fprintf(stderr, "%s: Cannot bind socket.\n", whoami);
fprintf(stderr, "bind: %s\n", e_txt);
errno = oerrno;
- krb5_klog_syslog(LOG_ERR, "Cannot bind socket: %s",
- e_txt);
+ krb5_klog_syslog(LOG_ERR, "Cannot bind socket: %s", e_txt);
if(oerrno == EADDRINUSE) {
char *w = strrchr(whoami, '/');
if (w) {
if (bind(schpw, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
char portbuf[32];
int oerrno = errno;
- const char *e_txt = error_message(errno);
+ const char *e_txt = krb5_get_error_message (context, errno);
fprintf(stderr, "%s: Cannot bind socket.\n", whoami);
fprintf(stderr, "bind: %s\n", e_txt);
errno = oerrno;
}
kterr:
if (ret) {
- krb5_klog_syslog(LOG_ERR, "%s", error_message(ret));
+ krb5_klog_syslog(LOG_ERR, "%s", krb5_get_error_message (context, ret));
fprintf(stderr, "%s: Can't set up keytab for RPC.\n", whoami);
kadm5_destroy(global_server_handle);
krb5_klog_close(context);
}
if ((ret = kadm5int_acl_init(context, 0, params.acl_file))) {
+ errmsg = krb5_get_error_message (context, ret);
krb5_klog_syslog(LOG_ERR, "Cannot initialize acl file: %s",
- error_message(ret));
+ errmsg);
fprintf(stderr, "%s: Cannot initialize acl file: %s\n",
- whoami, error_message(ret));
+ whoami, errmsg);
svcauth_gssapi_unset_names();
kadm5_destroy(global_server_handle);
krb5_klog_close(context);
if (!nofork && (ret = daemon(0, 0))) {
ret = errno;
- krb5_klog_syslog(LOG_ERR, "Cannot detach from tty: %s", error_message(ret));
+ errmsg = krb5_get_error_message (context, ret);
+ krb5_klog_syslog(LOG_ERR, "Cannot detach from tty: %s", errmsg);
fprintf(stderr, "%s: Cannot detach from tty: %s\n",
- whoami, error_message(ret));
+ whoami, errmsg);
svcauth_gssapi_unset_names();
kadm5_destroy(global_server_handle);
krb5_klog_close(context);
if (ret = kadm5_flush(global_server_handle)) {
krb5_klog_syslog(LOG_ERR, "FATAL ERROR! %s while flushing databases. "
"Databases may be corrupt! Aborting.",
- error_message(ret));
+ krb5_get_error_message (context, ret));
krb5_klog_close(context);
exit(3);
}
if ((len = recvfrom(s1, req, sizeof(req), 0, (struct sockaddr *)&from,
&fromlen)) < 0) {
krb5_klog_syslog(LOG_ERR, "chpw: Couldn't receive request: %s",
- error_message(errno));
+ krb5_get_error_message (context, errno));
return;
}
if ((ret = krb5_kt_resolve(context, "KDB:", &kt))) {
krb5_klog_syslog(LOG_ERR, "chpw: Couldn't open admin keytab %s",
- error_message(ret));
+ krb5_get_error_message (context, ret));
return;
}
interoperate if the client is single-homed. */
if ((s2 = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
+ char *errmsg = krb5_get_error_message (context, errno);
krb5_klog_syslog(LOG_ERR, "cannot create connecting socket: %s",
- error_message(errno));
+ errmsg);
fprintf(stderr, "Cannot create connecting socket: %s",
- error_message(errno));
+ errmsg);
svcauth_gssapi_unset_names();
kadm5_destroy(global_server_handle);
krb5_klog_close(context);
if (connect(s2, (struct sockaddr *) &from, sizeof(from)) < 0) {
krb5_klog_syslog(LOG_ERR, "chpw: Couldn't connect to client: %s",
- error_message(errno));
+ krb5_get_error_message (context, errno));
goto cleanup;
}
params->realm, s2, kt, &from,
&reqdata, &repdata))) {
krb5_klog_syslog(LOG_ERR, "chpw: Error processing request: %s",
- error_message(ret));
+ krb5_get_error_message (context, ret));
}
close(s2);
krb5_xfree(repdata.data);
krb5_klog_syslog(LOG_ERR, "chpw: Error sending reply: %s",
- error_message(errno));
+ krb5_get_error_message (context, errno));
goto cleanup;
}
return;
}
-
krb5_klog_syslog(LOG_NOTICE, "chpw request from %s for %s: %s",
inet_ntoa(((struct sockaddr_in *)&remote_addr)->sin_addr),
- clientstr, ret ? error_message(ret) : "success");
+ clientstr, ret ? krb5_get_error_message (context, ret) : "success");
krb5_free_unparsed_name(context, clientstr);
if (ret) {
OM_uint32 minor_stat;
kadm5_server_handle_t handle;
restriction_t *rp;
+ char *errmsg;
xdr_free(xdr_generic_ret, &ret);
&arg->rec, arg->mask,
arg->passwd);
if( ret.code == 0 )
- ret.err_str = "success";
+ errmsg = "success";
else
- ret.err_str = error_message(ret.code);
+ errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
krb5_klog_syslog(LOG_NOTICE, LOG_DONE, "kadm5_create_principal",
- prime_arg, ret.err_str,
+ prime_arg, errmsg,
client_name.value, service_name.value,
inet_ntoa(rqstp->rq_xprt->xp_raddr.sin_addr));
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
/* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
}
free_server_handle(handle);
gss_release_buffer(&minor_stat, &service_name);
exit_func:
- if( ret.err_str == NULL )
- {
- if( ret.code == 0 )
- ret.err_str = "success";
- else
- ret.err_str = error_message(ret.code);
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
- }
return &ret;
}
OM_uint32 minor_stat;
kadm5_server_handle_t handle;
restriction_t *rp;
+ char *errmsg;
xdr_free(xdr_generic_ret, &ret);
arg->ks_tuple,
arg->passwd);
if( ret.code == 0 )
- ret.err_str = "success";
+ errmsg = "success";
else
- ret.err_str = error_message(ret.code);
+ errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
krb5_klog_syslog(LOG_NOTICE, LOG_DONE, "kadm5_create_principal",
- prime_arg, ret.err_str,
+ prime_arg, errmsg,
client_name.value, service_name.value,
inet_ntoa(rqstp->rq_xprt->xp_raddr.sin_addr));
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
/* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
}
free_server_handle(handle);
gss_release_buffer(&minor_stat, &client_name);
gss_release_buffer(&minor_stat, &service_name);
exit_func:
- if( ret.err_str == NULL )
- {
- if( ret.code == 0 )
- ret.err_str = "success";
- else
- ret.err_str = error_message(ret.code);
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
- }
return &ret;
}
service_name;
OM_uint32 minor_stat;
kadm5_server_handle_t handle;
+ char *errmsg;
xdr_free(xdr_generic_ret, &ret);
} else {
ret.code = kadm5_delete_principal((void *)handle, arg->princ);
if( ret.code == 0 )
- ret.err_str = "success";
+ errmsg = "success";
else
- ret.err_str = error_message(ret.code);
+ errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
- krb5_klog_syslog(LOG_NOTICE, LOG_DONE, "kadm5_delete_principal", prime_arg,
- ret.err_str,
- client_name.value, service_name.value,
- inet_ntoa(rqstp->rq_xprt->xp_raddr.sin_addr));
+ krb5_klog_syslog(LOG_NOTICE, LOG_DONE, "kadm5_delete_principal",
+ prime_arg, errmsg,
+ client_name.value, service_name.value,
+ inet_ntoa(rqstp->rq_xprt->xp_raddr.sin_addr));
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
/* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
}
free(prime_arg);
gss_release_buffer(&minor_stat, &client_name);
gss_release_buffer(&minor_stat, &service_name);
exit_func:
- if( ret.err_str == NULL )
- {
- if( ret.code == 0 )
- ret.err_str = "success";
- else
- ret.err_str = error_message(ret.code);
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
- }
return &ret;
}
OM_uint32 minor_stat;
kadm5_server_handle_t handle;
restriction_t *rp;
+ char *errmsg;
xdr_free(xdr_generic_ret, &ret);
ret.code = kadm5_modify_principal((void *)handle, &arg->rec,
arg->mask);
if( ret.code == 0 )
- ret.err_str = "success";
+ errmsg = "success";
else
- ret.err_str = error_message(ret.code);
+ errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
krb5_klog_syslog(LOG_NOTICE, LOG_DONE, "kadm5_modify_principal",
- prime_arg, ret.err_str,
- client_name.value, service_name.value,
- inet_ntoa(rqstp->rq_xprt->xp_raddr.sin_addr));
+ prime_arg, errmsg,
+ client_name.value, service_name.value,
+ inet_ntoa(rqstp->rq_xprt->xp_raddr.sin_addr));
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
/* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
}
free_server_handle(handle);
gss_release_buffer(&minor_stat, &client_name);
gss_release_buffer(&minor_stat, &service_name);
exit_func:
- if( ret.err_str == NULL )
- {
- if( ret.code == 0 )
- ret.err_str = "success";
- else
- ret.err_str = error_message(ret.code);
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
- }
return &ret;
}
OM_uint32 minor_stat;
kadm5_server_handle_t handle;
restriction_t *rp;
+ char *errmsg;
xdr_free(xdr_generic_ret, &ret);
ret.code = kadm5_rename_principal((void *)handle, arg->src,
arg->dest);
if( ret.code == 0 )
- ret.err_str = "success";
+ errmsg = "success";
else
- ret.err_str = error_message(ret.code);
+ errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
krb5_klog_syslog(LOG_NOTICE, LOG_DONE, "kadm5_rename_principal",
- prime_arg, ret.err_str,
+ prime_arg, errmsg,
client_name.value, service_name.value,
inet_ntoa(rqstp->rq_xprt->xp_raddr.sin_addr));
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
}
free_server_handle(handle);
free(prime_arg1);
gss_release_buffer(&minor_stat, &client_name);
gss_release_buffer(&minor_stat, &service_name);
exit_func:
- if( ret.err_str == NULL )
- {
- if( ret.code == 0 )
- ret.err_str = "success";
- else
- ret.err_str = error_message(ret.code);
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
- }
return &ret;
}
service_name;
OM_uint32 minor_stat;
kadm5_server_handle_t handle;
+ char *errmsg;
xdr_free(xdr_gprinc_ret, &ret);
}
if( ret.code == 0 )
- ret.err_str = "success";
+ errmsg = "success";
else
- ret.err_str = error_message(ret.code);
+ errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
krb5_klog_syslog(LOG_NOTICE, LOG_DONE, funcname,
prime_arg,
- ret.err_str,
+ errmsg,
client_name.value, service_name.value,
inet_ntoa(rqstp->rq_xprt->xp_raddr.sin_addr));
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
}
free_server_handle(handle);
free(prime_arg);
gss_release_buffer(&minor_stat, &client_name);
gss_release_buffer(&minor_stat, &service_name);
exit_func:
- if( ret.err_str == NULL )
- {
- if( ret.code == 0 )
- ret.err_str = "success";
- else
- ret.err_str = error_message(ret.code);
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
- }
return &ret;
}
service_name;
OM_uint32 minor_stat;
kadm5_server_handle_t handle;
+ char *errmsg;
xdr_free(xdr_gprincs_ret, &ret);
arg->exp, &ret.princs,
&ret.count);
if( ret.code == 0 )
- ret.err_str = "success";
+ errmsg = "success";
else
- ret.err_str = error_message(ret.code);
+ errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
krb5_klog_syslog(LOG_NOTICE, LOG_DONE, "kadm5_get_principals",
prime_arg,
- ret.err_str,
+ errmsg,
client_name.value, service_name.value,
inet_ntoa(rqstp->rq_xprt->xp_raddr.sin_addr));
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
}
free_server_handle(handle);
gss_release_buffer(&minor_stat, &client_name);
gss_release_buffer(&minor_stat, &service_name);
exit_func:
- if( ret.err_str == NULL )
- {
- if( ret.code == 0 )
- ret.err_str = "success";
- else
- ret.err_str = error_message(ret.code);
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
- }
return &ret;
}
service_name;
OM_uint32 minor_stat;
kadm5_server_handle_t handle;
+ char *errmsg;
xdr_free(xdr_generic_ret, &ret);
if(ret.code != KADM5_AUTH_CHANGEPW) {
if( ret.code == 0 )
- ret.err_str = "success";
+ errmsg = "success";
else
- ret.err_str = error_message(ret.code);
+ errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
krb5_klog_syslog(LOG_NOTICE, LOG_DONE, "kadm5_chpass_principal",
- prime_arg, ret.err_str,
+ prime_arg, errmsg,
client_name.value, service_name.value,
inet_ntoa(rqstp->rq_xprt->xp_raddr.sin_addr));
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
}
free_server_handle(handle);
gss_release_buffer(&minor_stat, &client_name);
gss_release_buffer(&minor_stat, &service_name);
exit_func:
- if( ret.err_str == NULL )
- {
- if( ret.code == 0 )
- ret.err_str = "success";
- else
- ret.err_str = error_message(ret.code);
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
- }
return &ret;
}
service_name;
OM_uint32 minor_stat;
kadm5_server_handle_t handle;
+ char *errmsg;
xdr_free(xdr_generic_ret, &ret);
if(ret.code != KADM5_AUTH_CHANGEPW) {
if( ret.code == 0 )
- ret.err_str = "success";
+ errmsg = "success";
else
- ret.err_str = error_message(ret.code);
+ errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
krb5_klog_syslog(LOG_NOTICE, LOG_DONE, "kadm5_chpass_principal",
- prime_arg, ret.err_str,
+ prime_arg, errmsg,
client_name.value, service_name.value,
inet_ntoa(rqstp->rq_xprt->xp_raddr.sin_addr));
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
}
free_server_handle(handle);
gss_release_buffer(&minor_stat, &client_name);
gss_release_buffer(&minor_stat, &service_name);
exit_func:
- if( ret.err_str == NULL )
- {
- if( ret.code == 0 )
- ret.err_str = "success";
- else
- ret.err_str = error_message(ret.code);
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
- }
return &ret;
}
service_name;
OM_uint32 minor_stat;
kadm5_server_handle_t handle;
+ char *errmsg;
xdr_free(xdr_generic_ret, &ret);
if(ret.code != KADM5_AUTH_SETKEY) {
if( ret.code == 0 )
- ret.err_str = "success";
+ errmsg = "success";
else
- ret.err_str = error_message(ret.code);
+ errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
krb5_klog_syslog(LOG_NOTICE, LOG_DONE, "kadm5_setv4key_principal",
- prime_arg, ret.err_str,
+ prime_arg, errmsg,
client_name.value, service_name.value,
inet_ntoa(rqstp->rq_xprt->xp_raddr.sin_addr));
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
}
free_server_handle(handle);
gss_release_buffer(&minor_stat, &client_name);
gss_release_buffer(&minor_stat, &service_name);
exit_func:
- if( ret.err_str == NULL )
- {
- if( ret.code == 0 )
- ret.err_str = "success";
- else
- ret.err_str = error_message(ret.code);
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
- }
return &ret;
}
service_name;
OM_uint32 minor_stat;
kadm5_server_handle_t handle;
+ char *errmsg;
xdr_free(xdr_generic_ret, &ret);
if(ret.code != KADM5_AUTH_SETKEY) {
if( ret.code == 0 )
- ret.err_str = "success";
+ errmsg = "success";
else
- ret.err_str = error_message(ret.code);
+ errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
krb5_klog_syslog(LOG_NOTICE, LOG_DONE, "kadm5_setkey_principal",
- prime_arg, ret.err_str,
+ prime_arg, errmsg,
client_name.value, service_name.value,
inet_ntoa(rqstp->rq_xprt->xp_raddr.sin_addr));
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
}
free_server_handle(handle);
gss_release_buffer(&minor_stat, &client_name);
gss_release_buffer(&minor_stat, &service_name);
exit_func:
- if( ret.err_str == NULL )
- {
- if( ret.code == 0 )
- ret.err_str = "success";
- else
- ret.err_str = error_message(ret.code);
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
- }
return &ret;
}
service_name;
OM_uint32 minor_stat;
kadm5_server_handle_t handle;
+ char *errmsg;
xdr_free(xdr_generic_ret, &ret);
if(ret.code != KADM5_AUTH_SETKEY) {
if( ret.code == 0 )
- ret.err_str = "success";
+ errmsg = "success";
else
- ret.err_str = error_message(ret.code);
+ errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
krb5_klog_syslog(LOG_NOTICE, LOG_DONE, "kadm5_setkey_principal",
- prime_arg, ret.err_str,
+ prime_arg, errmsg,
client_name.value, service_name.value,
inet_ntoa(rqstp->rq_xprt->xp_raddr.sin_addr));
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
}
free_server_handle(handle);
gss_release_buffer(&minor_stat, &client_name);
gss_release_buffer(&minor_stat, &service_name);
exit_func:
- if( ret.err_str == NULL )
- {
- if( ret.code == 0 )
- ret.err_str = "success";
- else
- ret.err_str = error_message(ret.code);
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
- }
return &ret;
}
service_name;
OM_uint32 minor_stat;
kadm5_server_handle_t handle;
+ char *errmsg;
xdr_free(xdr_chrand_ret, &ret);
if(ret.code != KADM5_AUTH_CHANGEPW) {
if( ret.code == 0 )
- ret.err_str = "success";
+ errmsg = "success";
else
- ret.err_str = error_message(ret.code);
+ errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
krb5_klog_syslog(LOG_NOTICE, LOG_DONE, funcname,
- prime_arg, ret.err_str,
+ prime_arg, errmsg,
client_name.value, service_name.value,
inet_ntoa(rqstp->rq_xprt->xp_raddr.sin_addr));
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
}
free_server_handle(handle);
free(prime_arg);
gss_release_buffer(&minor_stat, &client_name);
gss_release_buffer(&minor_stat, &service_name);
exit_func:
- if( ret.err_str == NULL )
- {
- if( ret.code == 0 )
- ret.err_str = "success";
- else
- ret.err_str = error_message(ret.code);
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
- }
return &ret;
}
service_name;
OM_uint32 minor_stat;
kadm5_server_handle_t handle;
+ char *errmsg;
xdr_free(xdr_chrand_ret, &ret);
if(ret.code != KADM5_AUTH_CHANGEPW) {
if( ret.code == 0 )
- ret.err_str = "success";
+ errmsg = "success";
else
- ret.err_str = error_message(ret.code);
+ errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
krb5_klog_syslog(LOG_NOTICE, LOG_DONE, funcname,
- prime_arg, ret.err_str,
+ prime_arg, errmsg,
client_name.value, service_name.value,
inet_ntoa(rqstp->rq_xprt->xp_raddr.sin_addr));
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
}
free_server_handle(handle);
free(prime_arg);
gss_release_buffer(&minor_stat, &client_name);
gss_release_buffer(&minor_stat, &service_name);
exit_func:
- if( ret.err_str == NULL )
- {
- if( ret.code == 0 )
- ret.err_str = "success";
- else
- ret.err_str = error_message(ret.code);
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
- }
return &ret;
}
service_name;
OM_uint32 minor_stat;
kadm5_server_handle_t handle;
+ char *errmsg;
xdr_free(xdr_generic_ret, &ret);
ret.code = kadm5_create_policy((void *)handle, &arg->rec,
arg->mask);
if( ret.code == 0 )
- ret.err_str = "success";
+ errmsg = "success";
else
- ret.err_str = error_message(ret.code);
+ errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
krb5_klog_syslog(LOG_NOTICE, LOG_DONE, "kadm5_create_policy",
((prime_arg == NULL) ? "(null)" : prime_arg),
- ret.err_str,
+ errmsg,
client_name.value, service_name.value,
inet_ntoa(rqstp->rq_xprt->xp_raddr.sin_addr));
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
}
free_server_handle(handle);
gss_release_buffer(&minor_stat, &client_name);
gss_release_buffer(&minor_stat, &service_name);
exit_func:
- if( ret.err_str == NULL )
- {
- if( ret.code == 0 )
- ret.err_str = "success";
- else
- ret.err_str = error_message(ret.code);
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
- }
return &ret;
}
service_name;
OM_uint32 minor_stat;
kadm5_server_handle_t handle;
+ char *errmsg;
xdr_free(xdr_generic_ret, &ret);
} else {
ret.code = kadm5_delete_policy((void *)handle, arg->name);
if( ret.code == 0 )
- ret.err_str = "success";
+ errmsg = "success";
else
- ret.err_str = error_message(ret.code);
+ errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
krb5_klog_syslog(LOG_NOTICE, LOG_DONE, "kadm5_delete_policy",
((prime_arg == NULL) ? "(null)" : prime_arg),
- ret.err_str,
+ errmsg,
client_name.value, service_name.value,
inet_ntoa(rqstp->rq_xprt->xp_raddr.sin_addr));
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
}
free_server_handle(handle);
gss_release_buffer(&minor_stat, &client_name);
gss_release_buffer(&minor_stat, &service_name);
exit_func:
- if( ret.err_str == NULL )
- {
- if( ret.code == 0 )
- ret.err_str = "success";
- else
- ret.err_str = error_message(ret.code);
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
- }
return &ret;
}
service_name;
OM_uint32 minor_stat;
kadm5_server_handle_t handle;
+ char *errmsg;
xdr_free(xdr_generic_ret, &ret);
ret.code = kadm5_modify_policy((void *)handle, &arg->rec,
arg->mask);
if( ret.code == 0 )
- ret.err_str = "success";
+ errmsg = "success";
else
- ret.err_str = error_message(ret.code);
+ errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
krb5_klog_syslog(LOG_NOTICE, LOG_DONE, "kadm5_modify_policy",
((prime_arg == NULL) ? "(null)" : prime_arg),
- ret.err_str,
+ errmsg,
client_name.value, service_name.value,
inet_ntoa(rqstp->rq_xprt->xp_raddr.sin_addr));
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
}
free_server_handle(handle);
gss_release_buffer(&minor_stat, &client_name);
gss_release_buffer(&minor_stat, &service_name);
exit_func:
- if( ret.err_str == NULL )
- {
- if( ret.code == 0 )
- ret.err_str = "success";
- else
- ret.err_str = error_message(ret.code);
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
- }
return &ret;
}
kadm5_policy_ent_t e;
kadm5_principal_ent_rec caller_ent;
kadm5_server_handle_t handle;
+ char *errmsg;
xdr_free(xdr_gpol_ret, &ret);
}
if( ret.code == 0 )
- ret.err_str = "success";
+ errmsg = "success";
else
- ret.err_str = error_message(ret.code);
+ errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
krb5_klog_syslog(LOG_NOTICE, LOG_DONE, funcname,
((prime_arg == NULL) ? "(null)" : prime_arg),
- ret.err_str,
+ errmsg,
client_name.value, service_name.value,
inet_ntoa(rqstp->rq_xprt->xp_raddr.sin_addr));
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
} else {
krb5_klog_syslog(LOG_NOTICE, LOG_UNAUTH, funcname,
prime_arg, client_name.value, service_name.value,
gss_release_buffer(&minor_stat, &client_name);
gss_release_buffer(&minor_stat, &service_name);
exit_func:
- if( ret.err_str == NULL )
- {
- if( ret.code == 0 )
- ret.err_str = "success";
- else
- ret.err_str = error_message(ret.code);
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
- }
return &ret;
}
service_name;
OM_uint32 minor_stat;
kadm5_server_handle_t handle;
+ char *errmsg;
xdr_free(xdr_gpols_ret, &ret);
arg->exp, &ret.pols,
&ret.count);
if( ret.code == 0 )
- ret.err_str = "success";
+ errmsg = "success";
else
- ret.err_str = error_message(ret.code);
+ errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
krb5_klog_syslog(LOG_NOTICE, LOG_DONE, "kadm5_get_policies",
prime_arg,
- ret.err_str,
+ errmsg,
client_name.value, service_name.value,
inet_ntoa(rqstp->rq_xprt->xp_raddr.sin_addr));
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
}
free_server_handle(handle);
gss_release_buffer(&minor_stat, &client_name);
gss_release_buffer(&minor_stat, &service_name);
exit_func:
- if( ret.err_str == NULL )
- {
- if( ret.code == 0 )
- ret.err_str = "success";
- else
- ret.err_str = error_message(ret.code);
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
- }
return &ret;
}
gss_buffer_desc client_name, service_name;
OM_uint32 minor_stat;
kadm5_server_handle_t handle;
+ char *errmsg;
xdr_free(xdr_getprivs_ret, &ret);
ret.code = kadm5_get_privs((void *)handle, &ret.privs);
if( ret.code == 0 )
- ret.err_str = "success";
+ errmsg = "success";
else
- ret.err_str = error_message(ret.code);
+ errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
krb5_klog_syslog(LOG_NOTICE, LOG_DONE, "kadm5_get_privs",
client_name.value,
- ret.err_str,
+ errmsg,
client_name.value, service_name.value,
inet_ntoa(rqstp->rq_xprt->xp_raddr.sin_addr));
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
-
free_server_handle(handle);
gss_release_buffer(&minor_stat, &client_name);
gss_release_buffer(&minor_stat, &service_name);
exit_func:
- if( ret.err_str == NULL )
- {
- if( ret.code == 0 )
- ret.err_str = "success";
- else
- ret.err_str = error_message(ret.code);
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
- }
return &ret;
}
service_name;
kadm5_server_handle_t handle;
OM_uint32 minor_stat;
+ char *errmsg = 0;
xdr_free(xdr_generic_ret, &ret);
goto exit_func;
}
+ if (ret.code != 0)
+ errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
krb5_klog_syslog(LOG_NOTICE, LOG_DONE ", flavor=%d",
(ret.api_version == KADM5_API_VERSION_1 ?
"kadm5_init (V1)" : "kadm5_init"),
client_name.value,
- (ret.code == 0) ? "success" : error_message(ret.code),
+ (ret.code == 0) ? "success" : errmsg,
client_name.value, service_name.value,
inet_ntoa(rqstp->rq_xprt->xp_raddr.sin_addr),
rqstp->rq_cred.oa_flavor);
gss_release_buffer(&minor_stat, &service_name);
exit_func:
- if( ret.err_str == NULL )
- {
- if( ret.code == 0 )
- ret.err_str = "success";
- else
- ret.err_str = error_message(ret.code);
-
- /* xdr free frees this string. so make a copy */
- ret.err_str = strdup( ret.err_str );
- /* no need to check for NULL. Even if it is NULL, atleast error_code will be returned */
- }
return(&ret);
}
# THIS SHOULD BE IN KDC.CONF INSTEAD!
-[db_modules]
+[dbmodules]
db_module_dir = __MODDIR__
foobar_db2_module_blah = {
db_library = db2
#endif /* KRBCONF_KDC_MODIFIES_KDB */
errout:
- if (status)
+ if (status) {
krb5_klog_syslog(LOG_INFO, "AS_REQ (%s) %s: %s: %s for %s%s%s",
ktypestr,
fromstring, status,
cname ? cname : "<unknown client>",
sname ? sname : "<unknown server>",
errcode ? ", " : "",
- errcode ? error_message(errcode) : "");
+ errcode ? krb5_get_error_message (kdc_context, errcode) : "");
+ }
if (errcode) {
if (status == 0)
- status = error_message (errcode);
+ status = krb5_get_error_message (kdc_context, errcode);
errcode -= ERROR_TABLE_BASE_krb5;
if (errcode < 0 || errcode > 128)
errcode = KRB_ERR_GENERIC;
sname ? sname : "<unknown server>",
enc_tkt_reply.transited.tr_contents.length,
enc_tkt_reply.transited.tr_contents.data,
- error_message (errcode));
+ krb5_get_error_message(kdc_context, errcode));
} else
krb5_klog_syslog (LOG_INFO, "not checking transit path");
if (reject_bad_transit
cname ? cname : "<unknown client>",
sname ? sname : "<unknown server>",
errcode ? ", " : "",
- errcode ? error_message(errcode) : "");
+ errcode ? krb5_get_error_message (kdc_context, errcode) : "");
}
if (errcode) {
if (status == 0)
- status = error_message (errcode);
+ status = krb5_get_error_message (kdc_context, errcode);
errcode -= ERROR_TABLE_BASE_krb5;
if (errcode < 0 || errcode > 128)
errcode = KRB_ERR_GENERIC;
enc_tkt_reply, *padata);
if (retval) {
krb5_klog_syslog (LOG_INFO, "preauth (%s) verify failure: %s",
- pa_sys->name, error_message (retval));
+ pa_sys->name,
+ krb5_get_error_message (context, retval));
if (pa_sys->flags & PA_REQUIRED) {
pa_ok = 0;
break;
!isflagset(client->attributes, KRB5_KDB_REQUIRES_HW_AUTH))
return 0;
- if (!pa_found)
+ if (!pa_found) {
krb5_klog_syslog (LOG_INFO, "no valid preauth type found: %s",
- error_message (retval));
+ krb5_get_error_message(context, retval));
+ }
/* The following switch statement allows us
* to return some preauth system errors back to the client.
*/
/* first open the database before doing anything */
#ifdef KRBCONF_KDC_MODIFIES_KDB
- if ((kret = krb5_db_open(rdp->realm_context, db_args, KRB5_KDB_OPEN_RW))) {
+ if ((kret = krb5_db_open(rdp->realm_context, db_args,
+ KRB5_KDB_OPEN_RW | KRB5_KDB_SRV_TYPE_KDC))) {
#else
- if ((kret = krb5_db_open(rdp->realm_context, db_args, KRB5_KDB_OPEN_RO))) {
+ if ((kret = krb5_db_open(rdp->realm_context, db_args,
+ KRB5_KDB_OPEN_RO | KRB5_KDB_SRV_TYPE_KDC))) {
#endif
com_err(progname, kret,
"while initializing database for realm %s", realm);
com_err(argv[0], retval,
"while attempting to retrieve default realm");
fprintf (stderr, "%s: %s, attempting to retrieve default realm\n",
- argv[0], error_message (retval));
+ argv[0], krb5_get_error_message(kcontext, retval));
exit(1);
}
if ((rdatap = (kdc_realm_t *) malloc(sizeof(kdc_realm_t)))) {
#define KADM5_CONFIG_OLD_AUTH_GSSAPI 0x100000
#define KADM5_CONFIG_NO_AUTH 0x200000
#define KADM5_CONFIG_AUTH_NOFALLBACK 0x400000
-
/*
* permission bits
*/
$(srcdir)/client_principal.c \
$(srcdir)/client_init.c \
$(srcdir)/clnt_privs.c \
- $(srcdir)/err_handle.c \
$(srcdir)/clnt_chpass_util.c
OBJS = \
client_principal.$(OBJEXT) \
client_init.$(OBJEXT) \
clnt_privs.$(OBJEXT) \
- err_handle.$(OBJEXT) \
clnt_chpass_util.$(OBJEXT)
STLIBOBJS = \
client_principal.o \
client_init.o \
clnt_privs.o \
- err_handle.o \
clnt_chpass_util.o
-err_handle.o : err_handle.h err_handle.c
-
all-unix:: includes
all-unix:: all-liblinks
all-windows:: $(OBJS)
$(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/kadm5/kadm_rpc.h \
$(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h \
$(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/kdb.h \
- client_internal.h clnt_policy.c err_handle.h
+ client_internal.h clnt_policy.c
client_rpc.so client_rpc.po $(OUTPRE)client_rpc.$(OBJEXT): \
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/gssapi/gssapi.h \
$(BUILDTOP)/include/gssrpc/auth.h $(BUILDTOP)/include/gssrpc/auth_gss.h \
$(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/kadm5/kadm_rpc.h \
$(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h \
$(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/kdb.h \
- client_internal.h client_principal.c err_handle.h
+ client_internal.h client_principal.c
client_init.so client_init.po $(OUTPRE)client_init.$(OBJEXT): \
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/gssapi/gssapi.h \
$(BUILDTOP)/include/gssapi/gssapi_krb5.h $(BUILDTOP)/include/gssrpc/auth.h \
$(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/kadm5/kadm_rpc.h \
$(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h \
$(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/kdb.h \
- client_internal.h clnt_privs.c err_handle.h
-err_handle.so err_handle.po $(OUTPRE)err_handle.$(OBJEXT): \
- $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5.h \
- $(COM_ERR_DEPS) err_handle.c err_handle.h
+ client_internal.h clnt_privs.c
clnt_chpass_util.so clnt_chpass_util.po $(OUTPRE)clnt_chpass_util.$(OBJEXT): \
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/gssapi/gssapi.h \
$(BUILDTOP)/include/gssrpc/auth.h $(BUILDTOP)/include/gssrpc/auth_gss.h \
#endif
#include <errno.h>
#include "client_internal.h"
-#include "err_handle.h"
#ifdef DEBUG
#define eret() do { clnt_perror(handle->clnt, "null ret"); return KADM5_RPC_ERROR; } while (0)
memcpy(ent, &r->rec, sizeof(r->rec));
}
-
- if(r->code)
- {
- krb5_set_err( handle->context, krb5_err_have_str, r->code, r->err_str );
- }
return r->code;
}
*princs = NULL;
}
- if(r->code)
- {
- krb5_set_err( handle->context, krb5_err_have_str, r->code, r->err_str );
- }
return r->code;
}
}
}
- if(r->code)
- {
- krb5_set_err( handle->context, krb5_err_have_str, r->code, r->err_str );
- }
-
return r->code;
}
}
}
- if(r->code)
- {
- krb5_set_err( handle->context, krb5_err_have_str, r->code, r->err_str );
- }
-
return r->code;
}
#include <stdlib.h>
#include <string.h>
#include <errno.h>
-#include "err_handle.h"
kadm5_ret_t
kadm5_create_policy(void *server_handle,
if(r == NULL)
return KADM5_RPC_ERROR;
- if(r->code)
- {
- krb5_set_err( handle->context, krb5_err_have_str, r->code, r->err_str );
- }
return r->code;
}
if(r == NULL)
return KADM5_RPC_ERROR;
- if(r->code)
- {
- krb5_set_err( handle->context, krb5_err_have_str, r->code, r->err_str );
- }
return r->code;
}
if(r == NULL)
return KADM5_RPC_ERROR;
- if(r->code)
- {
- krb5_set_err( handle->context, krb5_err_have_str, r->code, r->err_str );
- }
return r->code;
}
memcpy(ent, &r->rec, sizeof(r->rec));
}
- if(r->code)
- {
- krb5_set_err( handle->context, krb5_err_have_str, r->code, r->err_str );
- }
return r->code;
}
*pols = NULL;
}
- if(r->code)
- {
- krb5_set_err( handle->context, krb5_err_have_str, r->code, r->err_str );
- }
return r->code;
}
#include <kadm5/admin.h>
#include <kadm5/kadm_rpc.h>
#include "client_internal.h"
-#include "err_handle.h"
kadm5_ret_t kadm5_get_privs(void *server_handle, long *privs)
{
else if (r->code == KADM5_OK)
*privs = r->privs;
- if(r->code)
- {
- krb5_set_err( handle->context, krb5_err_have_str, r->code, r->err_str );
- }
return r->code;
}
+++ /dev/null
-/**********************************************************************
-*
-* C %name: err_handle.c %
-* Instance: idc_sec_1
-* Description:
-* %created_by: spradeep %
-* %date_created: Thu Apr 7 15:36:27 2005 %
-*
-**********************************************************************/
-#ifndef lint
-static char *_csrc =
- "@(#) %filespec: err_handle.c~1 % (%full_filespec: err_handle.c~1:csrc:idc_sec#2 %)";
-#endif
-
-/* This file should be ideally be in util/et. But, for now thread
- safety requirement stops me from putting there. If I do, then all
- the applications have to link to pthread. */
-
-#include "autoconf.h"
-/* XXX This file doesn't build multithreaded at the moment. */
-#undef HAVE_PTHREAD_H
-
-#ifdef HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
-#include "err_handle.h"
-#include <assert.h>
-#include <string.h>
-
-#ifdef NOVELL
-krb5_errcode_2_string_func old_error_2_string = NULL;
-#endif
-
-typedef struct
-{
- char krb5_err_str[KRB5_MAX_ERR_STR + 1];
- long err_code;
- krb5_err_subsystem subsystem;
- krb5_context kcontext;
-} krb5_err_struct_t;
-
-#ifdef HAVE_PTHREAD_H
-static void
-tsd_key_destructor(void *data)
-{
- free(data);
-}
-
-static void
-init_err_handling(void)
-{
- assert(!k5_key_register(K5_KEY_KADM_CLNT_ERR_HANDLER, tsd_key_destructor));
-#ifdef NOVELL
- old_error_2_string = error_message;
- error_message = krb5_get_err_string;
-#endif
-}
-
-static pthread_once_t krb5_key_create = PTHREAD_ONCE_INIT;
-
-krb5_error_code
-krb5_set_err(krb5_context kcontext, krb5_err_subsystem subsystem,
- long err_code, char *str)
-{
- int ret;
- krb5_err_struct_t *err_struct;
- pthread_once(&krb5_key_create, init_err_handling);
-
- err_struct = (krb5_err_struct_t *) k5_getspecific(K5_KEY_KADM_CLNT_ERR_HANDLER);
- if (err_struct == NULL) {
- err_struct = calloc(sizeof(krb5_err_struct_t), 1);
- if (err_struct == NULL)
- return ENOMEM;
-
- if ((ret = k5_setspecific(K5_KEY_KADM_CLNT_ERR_HANDLER, err_struct))) {
- free(err_struct);
- return ret;
- }
- }
-
- err_struct->subsystem = subsystem;
- err_struct->err_code = err_code;
- err_struct->kcontext = kcontext;
- if (err_struct->subsystem == krb5_err_have_str) {
- strncpy(err_struct->krb5_err_str, str,
- sizeof(err_struct->krb5_err_str));
- err_struct->krb5_err_str[KRB5_MAX_ERR_STR] = '\0';
- }
-
- return 0;
-}
-
-const char *KRB5_CALLCONV
-krb5_get_err_string(long err_code)
-{
- krb5_err_struct_t *err_struct;
- pthread_once(&krb5_key_create, init_err_handling);
-
- err_struct = (krb5_err_struct_t *) k5_getspecific(K5_KEY_KADM_CLNT_ERR_HANDLER);
- if (err_struct && (err_struct->subsystem == krb5_err_have_str)
- && (err_code == err_struct->err_code)) {
- /* checking error code is for safety.
- In case, the caller ignores a database error and calls
- other calls before doing com_err. Though not perfect,
- caller should call krb5_clr_error before this. */
- err_struct->subsystem = krb5_err_unknown;
- return err_struct->krb5_err_str;
- }
-
- /* Error strings are not generated here. the remaining two cases
- are handled by the default error string convertor. */
-#ifdef NOVELL
- return old_error_2_string(err_code);
-#else
- return error_message(err_code);
-#endif
-}
-
-void
-krb5_clr_error()
-{
- krb5_err_struct_t *err_struct;
- pthread_once(&krb5_key_create, init_err_handling);
-
- err_struct = (krb5_err_struct_t *) k5_getspecific(K5_KEY_KADM_CLNT_ERR_HANDLER);
- if (err_struct)
- err_struct->subsystem = krb5_err_unknown;
-}
-
-#else
-krb5_err_struct_t krb5_err = { {0}, 0, 0, 0 };
-krb5_boolean krb5_init_once = TRUE;
-
-static void
-init_err_handling(void)
-{
- if (krb5_init_once) {
-#ifdef NOVELL
- old_error_2_string = error_message;
- error_message = krb5_get_err_string;
-#endif
- krb5_init_once = FALSE;
- }
-}
-
-krb5_error_code
-krb5_set_err(krb5_context kcontext, krb5_err_subsystem subsystem,
- long err_code, char *str)
-{
- krb5_err_struct_t *err_struct = &krb5_err;
-
- init_err_handling(); /* takes care for multiple inits */
-
- err_struct->subsystem = subsystem;
- err_struct->err_code = err_code;
- err_struct->kcontext = kcontext;
- if (err_struct->subsystem == krb5_err_have_str) {
- strncpy(err_struct->krb5_err_str, str,
- sizeof(err_struct->krb5_err_str));
- err_struct->krb5_err_str[KRB5_MAX_ERR_STR] = '\0';
- }
-
- return 0;
-}
-
-const char *KRB5_CALLCONV
-krb5_get_err_string(long err_code)
-{
- krb5_err_struct_t *err_struct = &krb5_err;
-
- init_err_handling(); /* takes care for multiple inits */
-
- if ((err_struct->subsystem == krb5_err_have_str)
- && (err_code == err_struct->err_code)) {
- /* checking error code is for safety.
- In case, the caller ignores a database error and calls
- other calls before doing com_err. Though not perfect,
- caller should call krb5_clr_error before this. */
- err_struct->subsystem = krb5_err_unknown;
- return err_struct->krb5_err_str;
- }
-
- /* It is not generated here. the remaining two cases are handled
- by the default error string convertor. */
-#ifdef NOVELL
- return old_error_2_string(err_code);
-#else
- return error_message(err_code);
-#endif
-}
-
-void
-krb5_clr_error()
-{
- krb5_err_struct_t *err_struct = &krb5_err;
-
- init_err_handling(); /* takes care for multiple inits */
-
- err_struct->subsystem = krb5_err_unknown;
-}
-
-#endif
+++ /dev/null
-/**********************************************************************
-*
-* C Header: err_handle.h
-* Instance: idc_sec_1
-* Description:
-* %created_by: spradeep %
-* %date_created: Thu Apr 7 15:36:49 2005 %
-*
-**********************************************************************/
-#ifndef _idc_sec_1_err_handle_h_H
-#define _idc_sec_1_err_handle_h_H
-#include <com_err.h>
-#include <krb5.h>
-
-/* Everything else goes here */
-
-#define KRB5_MAX_ERR_STR 1024
-typedef enum krb5_err_subsystem {
- krb5_err_unknown = 0, /* no error or unknown system. Has to be probed */
- krb5_err_system, /* error in system call */
- krb5_err_krblib, /* error in kerberos library call, should lookup in the error table */
- krb5_err_have_str, /* error message is available in the string */
- krb5_err_db /* error is a database error, should be handled by calling DB */
-} krb5_err_subsystem;
-
-typedef krb5_error_code(*krb5_set_err_func_t) (krb5_context,
- krb5_err_subsystem, long,
- char *);
-
-krb5_error_code krb5_set_err(krb5_context kcontext,
- krb5_err_subsystem subsystem, long err_code,
- char *str);
-
-const char *KRB5_CALLCONV krb5_get_err_string(long err_code);
-
-void krb5_clr_error(void);
-
-#endif
struct generic_ret {
krb5_ui_4 api_version;
kadm5_ret_t code;
- char *err_str;
};
typedef struct generic_ret generic_ret;
kadm5_ret_t code;
char **princs;
int count;
- char *err_str;
};
typedef struct gprincs_ret gprincs_ret;
krb5_keyblock key;
krb5_keyblock *keys;
int n_keys;
- char *err_str;
};
typedef struct chrand_ret chrand_ret;
krb5_ui_4 api_version;
kadm5_ret_t code;
kadm5_principal_ent_rec rec;
- char *err_str;
};
typedef struct gprinc_ret gprinc_ret;
krb5_ui_4 api_version;
kadm5_ret_t code;
kadm5_policy_ent_rec rec;
- char *err_str;
};
typedef struct gpol_ret gpol_ret;
kadm5_ret_t code;
char **pols;
int count;
- char *err_str;
};
typedef struct gpols_ret gpols_ret;
krb5_ui_4 api_version;
kadm5_ret_t code;
long privs;
- char *err_str;
};
typedef struct getprivs_ret getprivs_ret;
return (FALSE);
}
- if( xdrs->x_op == XDR_ENCODE )
- {
- char *tmp_str = "Unknown error code";
- if(!xdr_string(xdrs, objp->err_str?&objp->err_str:&tmp_str, (unsigned int)-1 )) {
- return (FALSE);
- }
- } else {
- if(!xdr_string(xdrs, &objp->err_str, (unsigned int)-1 )) {
- return (FALSE);
- }
- }
-
return(TRUE);
}
}
}
- if( xdrs->x_op == XDR_ENCODE )
- {
- char *tmp_str = "Unknown error code";
- if(!xdr_string(xdrs, objp->err_str?&objp->err_str:&tmp_str, (unsigned int)-1 )) {
- return (FALSE);
- }
- } else {
- if(!xdr_string(xdrs, &objp->err_str, (unsigned int)-1 )) {
- return (FALSE);
- }
- }
-
return (TRUE);
}
}
}
- if( xdrs->x_op == XDR_ENCODE )
- {
- char *tmp_str = "Unknown error code";
- if(!xdr_string(xdrs, objp->err_str?&objp->err_str:&tmp_str, (unsigned int)-1 )) {
- return (FALSE);
- }
- } else {
- if(!xdr_string(xdrs, &objp->err_str, (unsigned int)-1 )) {
- return (FALSE);
- }
- }
-
return (TRUE);
}
}
}
- if( xdrs->x_op == XDR_ENCODE )
- {
- char *tmp_str = "Unknown error code";
- if(!xdr_string(xdrs, objp->err_str?&objp->err_str:&tmp_str, (unsigned int)-1 )) {
- return (FALSE);
- }
- } else {
- if(!xdr_string(xdrs, &objp->err_str, (unsigned int)-1 )) {
- return (FALSE);
- }
- }
-
return (TRUE);
}
return (FALSE);
}
- if( xdrs->x_op == XDR_ENCODE )
- {
- char *tmp_str = "Unknown error code";
- if(!xdr_string(xdrs, objp->err_str?&objp->err_str:&tmp_str, (unsigned int)-1 )) {
- return (FALSE);
- }
- } else {
- if(!xdr_string(xdrs, &objp->err_str, (unsigned int)-1 )) {
- return (FALSE);
- }
- }
-
return (TRUE);
}
}
}
- if( xdrs->x_op == XDR_ENCODE )
- {
- char *tmp_str = "Unknown error code";
- if(!xdr_string(xdrs, objp->err_str?&objp->err_str:&tmp_str, (unsigned int)-1 )) {
- return (FALSE);
- }
- } else {
- if(!xdr_string(xdrs, &objp->err_str, (unsigned int)-1 )) {
- return (FALSE);
- }
- }
-
return (TRUE);
}
! xdr_long(xdrs, &objp->privs))
return FALSE;
- if( xdrs->x_op == XDR_ENCODE )
- {
- char *tmp_str = "Unknown error code";
- if(!xdr_string(xdrs, objp->err_str?&objp->err_str:&tmp_str, (unsigned int)-1 )) {
- return (FALSE);
- }
- } else {
- if(!xdr_string(xdrs, &objp->err_str, (unsigned int)-1 )) {
- return (FALSE);
- }
- }
-
return TRUE;
}
* klog_com_err_proc() - Handle com_err(3) messages as specified by the
* profile.
*/
+static krb5_context err_context;
static void
klog_com_err_proc(const char *whoami, long int code, const char *format, va_list ap)
{
/* If reporting an error message, separate it. */
if (code) {
outbuf[sizeof(outbuf) - 1] = '\0';
- strncat(outbuf, error_message(code), sizeof(outbuf) - 1 - strlen(outbuf));
+
+ strncat(outbuf, krb5_get_error_message (err_context, code), sizeof(outbuf) - 1 - strlen(outbuf));
strncat(outbuf, " - ", sizeof(outbuf) - 1 - strlen(outbuf));
}
cp = &outbuf[strlen(outbuf)];
do_openlog = 0;
log_facility = 0;
+ err_context = kcontext;
+
/*
* Look up [logging]-><ename> in the profile. If that doesn't
* succeed, then look for [logging]->default.
return ret;
}
- ret = krb5_db_open(handle->context, db_args, KRB5_KDB_OPEN_RW);
+ ret = krb5_db_open(handle->context, db_args,
+ KRB5_KDB_OPEN_RW | KRB5_KDB_SRV_TYPE_ADMIN);
if (ret) {
krb5_free_context(handle->context);
free_db_args(handle);
CHECK_HANDLE(server_handle);
if ((ret = krb5_db_fini(handle->context)) ||
- (ret = krb5_db_open(handle->context, handle->db_args, KRB5_KDB_OPEN_RW)) ||
+ (ret = krb5_db_open(handle->context, handle->db_args,
+ KRB5_KDB_OPEN_RW | KRB5_KDB_SRV_TYPE_ADMIN)) ||
(ret = adb_policy_close(handle)) ||
(ret = adb_policy_init(handle))) {
(void) kadm5_destroy(server_handle);
if( krb5_db_inited( handle->context ) )
return KADM5_OK;
- return krb5_db_open( handle->context, NULL, KRB5_KDB_OPEN_RW );
+ return krb5_db_open( handle->context, NULL,
+ KRB5_KDB_OPEN_RW | KRB5_KDB_SRV_TYPE_ADMIN );
}
kadm5_ret_t
{
CHECK_HANDLE(server_handle);
- krb5_db_clr_error();
+ krb5_clear_error_message(((kadm5_server_handle_t)server_handle)->context);
if (mask & KADM5_REF_COUNT)
return KADM5_BAD_MASK;
CHECK_HANDLE(server_handle);
- krb5_db_clr_error();
+ krb5_clear_error_message(handle->context);
if(name == (kadm5_policy_t) NULL)
return EINVAL;
{
CHECK_HANDLE(server_handle);
- krb5_db_clr_error();
+ krb5_clear_error_message(((kadm5_server_handle_t)server_handle)->context);
if (mask & KADM5_REF_COUNT)
return KADM5_BAD_MASK;
CHECK_HANDLE(server_handle);
- krb5_db_clr_error();
+ krb5_clear_error_message(handle->context);
/*
* In version 1, entry is a pointer to a kadm5_policy_ent_t that
CHECK_HANDLE(server_handle);
- krb5_db_clr_error();
+ krb5_clear_error_message(handle->context);
/*
* Argument sanity checking, and opening up the DB
}
}
+ /* In all cases key and the principal data is set, let the database provider know */
+ kdb.mask = mask | KADM5_KEY_DATA | KADM5_PRINCIPAL ;
+
/* store the new db entry */
ret = kdb_put_entry(handle, &kdb, &adb);
CHECK_HANDLE(server_handle);
- krb5_db_clr_error();
+ krb5_clear_error_message(handle->context);
if (principal == NULL)
return EINVAL;
CHECK_HANDLE(server_handle);
- krb5_db_clr_error();
+ krb5_clear_error_message(handle->context);
if((mask & KADM5_PRINCIPAL) || (mask & KADM5_LAST_PWD_CHANGE) ||
(mask & KADM5_MOD_TIME) || (mask & KADM5_MOD_NAME) ||
}
}
+ /* let the mask propagate to the database provider */
+ kdb.mask = mask;
+
ret = kdb_put_entry(handle, &kdb, &adb);
if (ret) goto done;
CHECK_HANDLE(server_handle);
- krb5_db_clr_error();
+ krb5_clear_error_message(handle->context);
if (source == NULL || target == NULL)
return EINVAL;
CHECK_HANDLE(server_handle);
- krb5_db_clr_error();
+ krb5_clear_error_message(handle->context);
/*
* In version 1, all the defined fields are always returned.
CHECK_HANDLE(server_handle);
- krb5_db_clr_error();
+ krb5_clear_error_message(handle->context);
hist_added = 0;
memset(&hist, 0, sizeof(hist));
if (ret)
goto done;
+ /* key data and attributes changed, let the database provider know */
+ kdb.mask = KADM5_KEY_DATA | KADM5_ATTRIBUTES /* | KADM5_CPW_FUNCTION */;
+
if ((ret = kdb_put_entry(handle, &kdb, &adb)))
goto done;
int ret, last_pwd, have_pol = 0;
kadm5_server_handle_t handle = server_handle;
- krb5_db_clr_error();
-
if (keyblocks)
*keyblocks = NULL;
CHECK_HANDLE(server_handle);
+ krb5_clear_error_message(handle->context);
+
if (principal == NULL)
return EINVAL;
if (hist_princ && /* this will be NULL when initializing the databse */
}
}
+ /* key data changed, let the database provider know */
+ kdb.mask = KADM5_KEY_DATA /* | KADM5_RANDKEY_USED */;
+
if ((ret = kdb_put_entry(handle, &kdb, &adb)))
goto done;
kadm5_server_handle_t handle = server_handle;
krb5_key_data tmp_key_data;
- krb5_db_clr_error();
-
memset( &tmp_key_data, 0, sizeof(tmp_key_data));
CHECK_HANDLE(server_handle);
+ krb5_clear_error_message(handle->context);
+
if (principal == NULL || keyblock == NULL)
return EINVAL;
if (hist_princ && /* this will be NULL when initializing the databse */
CHECK_HANDLE(server_handle);
- krb5_db_clr_error();
+ krb5_clear_error_message(handle->context);
if (principal == NULL || keyblocks == NULL)
return EINVAL;
SHLIB_DIRS=-L$(TOPLIBD)
SHLIB_RDIRS=$(KRB5_LIBDIR)
-all::
-
adb_err.$(OBJEXT): adb_err.c
adb_err.c adb_err.h: $(srcdir)/adb_err.et
$(srcdir)/kdb_default.c \
$(srcdir)/kdb_cpw.c \
adb_err.c \
- $(srcdir)/err_handle.c \
$(srcdir)/keytab.c
STOBJLISTS=OBJS.ST
kdb_default.o \
kdb_cpw.o \
adb_err.o \
- err_handle.o \
keytab.o
all-unix:: all-liblinks
$(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \
$(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/kdb.h \
$(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
- adb_err.h err_handle.h kdb5.c kdb5.h
+ adb_err.h kdb5.c kdb5.h
encrypt_key.so encrypt_key.po $(OUTPRE)encrypt_key.$(OBJEXT): \
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5.h \
$(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
kdb_cpw.c
adb_err.so adb_err.po $(OUTPRE)adb_err.$(OBJEXT): $(COM_ERR_DEPS) \
adb_err.c
-err_handle.so err_handle.po $(OUTPRE)err_handle.$(OBJEXT): \
- $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5.h \
- $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
- $(COM_ERR_DEPS) $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-int.h \
- $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/k5-platform.h \
- $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \
- $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
- err_handle.c err_handle.h
keytab.so keytab.po $(OUTPRE)keytab.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/osconf.h \
$(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-err.h \
+++ /dev/null
-/**********************************************************************
-*
-* C %name: err_handle.c %
-* Instance: idc_sec_1
-* Description:
-* %created_by: spradeep %
-* %date_created: Thu Apr 7 14:05:00 2005 %
-*
-**********************************************************************/
-#ifndef lint
-static char *_csrc =
- "@(#) %filespec: err_handle.c~1 % (%full_filespec: err_handle.c~1:csrc:idc_sec#1 %)";
-#endif
-
-/* This file should be ideally be in util/et. But, for now thread
- safety requirement stops me from putting there. if I do, then all
- the applications have to link to pthread. */
-
-#include "autoconf.h"
-#if defined(ENABLE_THREADS) && defined(HAVE_PTHREAD_H)
-#include <pthread.h>
-#endif
-#include "err_handle.h"
-#include <assert.h>
-
-#ifdef NOVELL
-krb5_errcode_2_string_func old_error_2_string = NULL;
-#endif
-
-typedef struct
-{
- char krb5_err_str[KRB5_MAX_ERR_STR + 1];
- long err_code;
- krb5_err_subsystem subsystem;
- krb5_context kcontext;
-} krb5_err_struct_t;
-
-#if defined(ENABLE_THREADS) && defined(HAVE_PTHREAD_H)
-static void
-tsd_key_destructor(void *data)
-{
- free(data);
-}
-
-static void
-init_err_handling(void)
-{
- assert(!k5_key_register(K5_KEY_KDB_ERR_HANDLER, tsd_key_destructor));
-#ifdef NOVELL
- old_error_2_string = error_message;
- error_message = krb5_get_err_string;
-#endif
-}
-
-static pthread_once_t krb5_key_create = PTHREAD_ONCE_INIT;
-
-krb5_error_code
-krb5_set_err(krb5_context kcontext, krb5_err_subsystem subsystem,
- long err_code, char *str)
-{
- int ret;
- krb5_err_struct_t *err_struct;
- pthread_once(&krb5_key_create, init_err_handling);
-
- err_struct = (krb5_err_struct_t *) k5_getspecific(K5_KEY_KDB_ERR_HANDLER);
- if (err_struct == NULL) {
- err_struct = calloc(sizeof(krb5_err_struct_t), 1);
- if (err_struct == NULL)
- return ENOMEM;
-
- if ((ret = k5_setspecific(K5_KEY_KDB_ERR_HANDLER, err_struct))) {
- free(err_struct);
- return ret;
- }
- }
-
- err_struct->subsystem = subsystem;
- err_struct->err_code = err_code;
- err_struct->kcontext = kcontext;
- if (err_struct->subsystem == krb5_err_have_str) {
- strncpy(err_struct->krb5_err_str, str,
- sizeof(err_struct->krb5_err_str));
- err_struct->krb5_err_str[KRB5_MAX_ERR_STR] = '\0';
- }
-
- return 0;
-}
-
-const char *KRB5_CALLCONV
-krb5_get_err_string(long err_code)
-{
- krb5_err_struct_t *err_struct;
- pthread_once(&krb5_key_create, init_err_handling);
-
- err_struct = (krb5_err_struct_t *) k5_getspecific(K5_KEY_KDB_ERR_HANDLER);
- if (err_struct && (err_struct->subsystem == krb5_err_have_str)
- && (err_code == err_struct->err_code)) {
- /* Checking error code is for safety.
- In case, the caller ignores a database error and calls
- other calls before doing com_err. Though not perfect,
- caller should call krb5_clr_error before this. */
- err_struct->subsystem = krb5_err_unknown;
- return err_struct->krb5_err_str;
- }
-
- if (err_struct && (err_struct->subsystem == krb5_err_db)
- && (err_code == err_struct->err_code)) {
- err_struct->subsystem = krb5_err_unknown;
- return krb5_db_errcode2string(err_struct->kcontext, err_code);
- }
-
- /* Error strings are not generated here. the remaining two cases
- are handled by the default error string convertor. */
-#ifdef NOVELL
- return old_error_2_string(err_code);
-#else
- return error_message(err_code);
-#endif
-}
-
-void
-krb5_clr_error()
-{
- krb5_err_struct_t *err_struct;
- pthread_once(&krb5_key_create, init_err_handling);
-
- err_struct = (krb5_err_struct_t *) k5_getspecific(K5_KEY_KDB_ERR_HANDLER);
- if (err_struct)
- err_struct->subsystem = krb5_err_unknown;
-}
-
-#else
-krb5_err_struct_t krb5_err = { {0}, 0, 0, 0 };
-krb5_boolean krb5_init_once = TRUE;
-
-static void
-init_err_handling(void)
-{
- if (krb5_init_once) {
-#ifdef NOVELL
- old_error_2_string = error_message;
- error_message = krb5_get_err_string;
-#endif
- krb5_init_once = FALSE;
- }
-}
-
-krb5_error_code
-krb5_set_err(krb5_context kcontext, krb5_err_subsystem subsystem,
- long err_code, char *str)
-{
- krb5_err_struct_t *err_struct = &krb5_err;
-
- init_err_handling(); /* takes care for multiple inits */
-
- err_struct->subsystem = subsystem;
- err_struct->err_code = err_code;
- err_struct->kcontext = kcontext;
- if (err_struct->subsystem == krb5_err_have_str) {
- strncpy(err_struct->krb5_err_str, str,
- sizeof(err_struct->krb5_err_str));
- err_struct->krb5_err_str[KRB5_MAX_ERR_STR] = '\0';
- }
-
- return 0;
-}
-
-const char *KRB5_CALLCONV
-krb5_get_err_string(long err_code)
-{
- krb5_err_struct_t *err_struct = &krb5_err;
-
- init_err_handling(); /* takes care for multiple inits */
-
- if ((err_struct->subsystem == krb5_err_have_str)
- && (err_code == err_struct->err_code)) {
- /* checking error code is for safety.
- In case, the caller ignores a database error and calls
- other calls before doing com_err. Though not perfect,
- caller should call krb5_clr_error before this. */
- err_struct->subsystem = krb5_err_unknown;
- return err_struct->krb5_err_str;
- }
-
- if ((err_struct->subsystem == krb5_err_db)
- && (err_code == err_struct->err_code)) {
- err_struct->subsystem = krb5_err_unknown;
- return krb5_db_errcode2string(err_struct->kcontext, err_code);
- }
-
- /* It is not generated here. the remaining two cases are handled
- by the default error string convertor. */
-#ifdef NOVELL
- return old_error_2_string(err_code);
-#else
- return error_message(err_code);
-#endif
-}
-
-void
-krb5_clr_error()
-{
- krb5_err_struct_t *err_struct = &krb5_err;
-
- init_err_handling(); /* takes care for multiple inits */
-
- err_struct->subsystem = krb5_err_unknown;
-}
-
-#endif
+++ /dev/null
-/**********************************************************************
-*
-* C Header: err_handle.h
-* Instance: idc_sec_1
-* Description:
-* %created_by: spradeep %
-* %date_created: Thu Apr 7 14:05:33 2005 %
-*
-**********************************************************************/
-#ifndef _idc_sec_1_err_handle_h_H
-#define _idc_sec_1_err_handle_h_H
-#include <k5-int.h>
-
-/* Everything else goes here */
-
-#define KRB5_MAX_ERR_STR 1024
-typedef enum krb5_err_subsystem {
- krb5_err_unknown = 0, /* no error or unknown system. Has to be probed */
- krb5_err_system, /* error in system call */
- krb5_err_krblib, /* error in kerberos library call, should lookup in the error table */
- krb5_err_have_str, /* error message is available in the string */
- krb5_err_db /* error is a database error, should be handled by calling DB */
-} krb5_err_subsystem;
-
-typedef krb5_error_code(*krb5_set_err_func_t) (krb5_context,
- krb5_err_subsystem, long,
- char *);
-
-krb5_error_code krb5_set_err(krb5_context kcontext,
- krb5_err_subsystem subsystem, long err_code,
- char *str);
-
-const char *KRB5_CALLCONV krb5_get_err_string(long err_code);
-
-void krb5_clr_error(void);
-
-#endif
kdb_setup_opt_functions(*lib);
- if ((status = (*lib)->vftabl.init_library(krb5_set_err))) {
+ if ((status = (*lib)->vftabl.init_library())) {
/* ERROR. library not initialized cleanly */
sprintf(buf, "%s library initialization failed, error code %ld\n",
lib_name, status);
kdb_setup_opt_functions(*lib);
- if ((status = (*lib)->vftabl.init_library(krb5_set_err))) {
+ if ((status = (*lib)->vftabl.init_library())) {
/* ERROR. library not initialized cleanly */
goto clean_n_exit;
}
} else {
+ err_str = dlerror();
+ if(err_str == NULL)
+ err_str = "";
status = KRB5_KDB_DBTYPE_INIT;
- krb5_set_err(kcontext, krb5_err_have_str, status, dlerror());
+ krb5_set_error_message (kcontext, status, "%s", err_str);
goto clean_n_exit;
}
break;
if (!(*lib)->dl_handle) {
/* library not found in the given list. Error str is already set */
- status = KRB5_KDB_DBTYPE_NOTFOUND;
- krb5_set_err(kcontext, krb5_err_have_str, status, err_str);
+ status = KRB5_KDB_DBTYPE_NOTFOUND;
+ krb5_set_error_message (kcontext, status, "%s", err_str);
goto clean_n_exit;
}
/*
* External functions... DAL API
*/
-void
-krb5_db_clr_error()
-{
- krb5_clr_error();
-}
-
krb5_error_code
krb5_db_open(krb5_context kcontext, char **db_args, int mode)
{
krb5_error_code status = 0;
char *section = NULL;
kdb5_dal_handle *dal_handle;
- char buf[KRB5_MAX_ERR_STR];
section = kdb_get_conf_section(kcontext);
if (section == NULL) {
- sprintf(buf,
+ status = KRB5_KDB_SERVER_INTERNAL_ERR;
+ krb5_set_error_message (kcontext, status,
"unable to determine configuration section for realm %s\n",
kcontext->default_realm ? kcontext->default_realm : "[UNSET]");
- status = -1;
- krb5_set_err(kcontext, krb5_err_have_str, status, buf);
goto clean_n_exit;
}
krb5_error_code status = 0;
char *section = NULL;
kdb5_dal_handle *dal_handle;
- char buf[KRB5_MAX_ERR_STR];
section = kdb_get_conf_section(kcontext);
if (section == NULL) {
- sprintf(buf,
+ status = KRB5_KDB_SERVER_INTERNAL_ERR;
+ krb5_set_error_message (kcontext, status,
"unable to determine configuration section for realm %s\n",
kcontext->default_realm);
- status = -1;
- krb5_set_err(kcontext, krb5_err_have_str, status, buf);
goto clean_n_exit;
}
krb5_error_code status = 0;
char *section = NULL;
kdb5_dal_handle *dal_handle;
- char buf[KRB5_MAX_ERR_STR];
section = kdb_get_conf_section(kcontext);
if (section == NULL) {
- sprintf(buf,
+ status = KRB5_KDB_SERVER_INTERNAL_ERR;
+ krb5_set_error_message (kcontext, status,
"unable to determine configuration section for realm %s\n",
kcontext->default_realm);
- status = -1;
- krb5_set_err(kcontext, krb5_err_have_str, status, buf);
goto clean_n_exit;
}
#include <utime.h>
#include <k5-int.h>
#include "kdb.h"
-#include "err_handle.h"
#define KDB_MAX_DB_NAME 128
#define KDB_REALM_SECTION "realms"
#define KDB_MODULE_POINTER "database_module"
-#define KDB_MODULE_SECTION "db_modules"
+#define KDB_MODULE_DEF_SECTION "dbdefaults"
+#define KDB_MODULE_SECTION "dbmodules"
#define KDB_LIB_POINTER "db_library"
#define KDB_DATABASE_CONF_FILE DEFAULT_SECURE_PROFILE_PATH
#define KDB_DATABASE_ENV_PROF KDC_PROFILE_ENV
#define KRB5_KDB_OPEN_RW 0
#define KRB5_KDB_OPEN_RO 1
+#ifndef KRB5_KDB_SRV_TYPE_KDC
+#define KRB5_KDB_SRV_TYPE_KDC 0x0100
+#endif
+
+#ifndef KRB5_KDB_SRV_TYPE_ADMIN
+#define KRB5_KDB_SRV_TYPE_ADMIN 0x0200
+#endif
+
+#ifndef KRB5_KDB_SRV_TYPE_PASSWD
+#define KRB5_KDB_SRV_TYPE_PASSWD 0x0300
+#endif
+
+#ifndef KRB5_KDB_SRV_TYPE_OTHER
+#define KRB5_KDB_SRV_TYPE_OTHER 0x0400
+#endif
+
#define KRB5_KDB_OPT_SET_DB_NAME 0
#define KRB5_KDB_OPT_SET_LOCK_MODE 1
short int maj_ver;
short int min_ver;
- krb5_error_code (*init_library)(krb5_set_err_func_t);
+ krb5_error_code (*init_library)();
krb5_error_code (*fini_library)();
krb5_error_code (*init_module) ( krb5_context kcontext,
char * conf_section,
krb5_db_open
krb5_db_inited
-krb5_db_clr_error
krb5_db_alloc
krb5_db_free
krb5_db_create
krb5_db_iter_policy
krb5_db_delete_policy
krb5_db_free_policy
+krb5_def_store_mkey
ec KRB5_KDB_DBTYPE_NOTFOUND, "Unable to find requested database type"
ec KRB5_KDB_DBTYPE_NOSUP, "Database type not supported"
ec KRB5_KDB_DBTYPE_INIT, "Database library failed to initialize"
+ec KRB5_KDB_SERVER_INTERNAL_ERR, "Server error"
end
$(TOPLIBD)/libk5crypto$(SHLIBEXT) \
$(TOPLIBD)/libkrb5$(SHLIBEXT)
SHLIB_EXPLIBS= $(GSSRPC_LIBS) -lkrb5 -lcom_err -lk5crypto $(KDB5_DB_LIB) $(SUPPORT_LIB) $(LIBS)
-# -lgssrpc $(KDB5_DB_LIB)
SHLIB_DIRS=-L$(TOPLIBD)
SHLIB_RDIRS=$(KRB5_LIBDIR)
$(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/k5-platform.h \
$(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \
$(SRCTOP)/include/kdb.h $(SRCTOP)/include/port-sockets.h \
- $(SRCTOP)/include/socket-utils.h $(SRCTOP)/lib/kdb/err_handle.h \
- $(SRCTOP)/lib/kdb/kdb5.h kdb_compat.h kdb_db2.c kdb_db2.h \
- kdb_xdr.h policy_db.h
+ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/lib/kdb/kdb5.h \
+ kdb_compat.h kdb_db2.c kdb_db2.h kdb_xdr.h policy_db.h
pol_xdr.so pol_xdr.po $(OUTPRE)pol_xdr.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssrpc/auth.h \
$(BUILDTOP)/include/gssrpc/auth_gss.h $(BUILDTOP)/include/gssrpc/auth_unix.h \
$(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/k5-platform.h \
$(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \
$(SRCTOP)/include/kdb.h $(SRCTOP)/include/port-sockets.h \
- $(SRCTOP)/include/socket-utils.h $(SRCTOP)/lib/kdb/err_handle.h \
- $(SRCTOP)/lib/kdb/kdb5.h db2_exp.c kdb_db2.h kdb_xdr.h \
- policy_db.h
+ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/lib/kdb/kdb5.h \
+ db2_exp.c kdb_db2.h kdb_xdr.h policy_db.h
(context, key));
static krb5_error_code
-hack_init (krb5_set_err_func_t f)
+hack_init ()
{
krb5_error_code c;
c = krb5int_mutex_alloc (&krb5_db2_mutex);
if (c)
return c;
- return krb5_db2_lib_init (f);
+ return krb5_db2_lib_init ();
}
static krb5_error_code
static krb5_error_code krb5_db2_db_set_hashfirst(krb5_context, int);
static char default_db_name[] = DEFAULT_KDB_FILE;
-krb5_set_err_func_t krb5_db2_dal_err_funcp = NULL;
/*
* Locking:
krb5_db2_context *db_ctx;
kdb5_dal_handle *dal_handle;
+ krb5_clear_error_message (context);
if (db_args) {
/* DB2 does not support db_args DB arguments for principal */
- char buf[KRB5_MAX_ERR_STR];
- sprintf(buf, "Unsupported argument \"%s\" for db2", db_args[0]);
- krb5_db2_dal_err_funcp(context, krb5_err_have_str, EINVAL, buf);
+ krb5_set_error_message(context, EINVAL,
+ "Unsupported argument \"%s\" for db2",
+ db_args[0]);
return EINVAL;
}
* DAL API functions
*/
krb5_error_code
-krb5_db2_lib_init(krb5_set_err_func_t set_err)
+krb5_db2_lib_init()
{
- krb5_db2_dal_err_funcp = set_err;
return 0;
}
char **t_ptr = db_args;
char db_name_set = 0;
+ krb5_clear_error_message (kcontext);
+
if (k5db2_inited(kcontext))
return 0;
}
/* ignore hash argument. Might have been passed from create */
else if (!opt || strcmp(opt, "hash")) {
- char buf[KRB5_MAX_ERR_STR];
- sprintf(buf, "Unsupported argument \"%s\" for db2",
- opt ? opt : val);
- krb5_db2_dal_err_funcp(kcontext, krb5_err_have_str, EINVAL, buf);
+ krb5_set_error_message(kcontext, EINVAL,
+ "Unsupported argument \"%s\" for db2",
+ opt ? opt : val);
free(opt);
free(val);
return EINVAL;
krb5_int32 flags = KRB5_KDB_CREATE_BTREE;
char *db_name = NULL;
+ krb5_clear_error_message (kcontext);
+
if (k5db2_inited(kcontext))
return 0;
else if (opt && !strcmp(opt, "hash")) {
flags = KRB5_KDB_CREATE_HASH;
} else {
- char buf[KRB5_MAX_ERR_STR];
- sprintf(buf, "Unsupported argument \"%s\" for db2",
- opt ? opt : val);
- krb5_db2_dal_err_funcp(kcontext, krb5_err_have_str, EINVAL, buf);
+ krb5_set_error_message(kcontext, EINVAL,
+ "Unsupported argument \"%s\" for db2",
+ opt ? opt : val);
free(opt);
free(val);
return EINVAL;
krb5_const_principal searchfor,
int *nentries);
-krb5_error_code krb5_db2_lib_init(krb5_set_err_func_t);
+krb5_error_code krb5_db2_lib_init();
krb5_error_code krb5_db2_lib_cleanup(void);
void krb5_db2_free_policy( krb5_context kcontext,
osa_policy_ent_t entry );
-
-
-extern krb5_set_err_func_t krb5_db2_dal_err_funcp;
-
#endif /* KRB5_KDB_DB2_H */
krb5.conf: Makefile
cat $(SRCTOP)/config-files/krb5.conf > krb5.new
- echo "[db_modules]" >> krb5.new
+ echo "[dbmodules]" >> krb5.new
echo " db_module_dir = `pwd`/../util/fakedest$(KRB5_DB_MODULE_DIR)" >> krb5.new
mv krb5.new krb5.conf
puts $conffile " kdc = FILE:$tmppwd/kdc.log"
puts $conffile " default = FILE:$tmppwd/others.log"
puts $conffile ""
- puts $conffile "\[db_modules\]"
+ puts $conffile "\[dbmodules\]"
puts $conffile " db_module_dir = $tmppwd/../../../util/fakedest$KRB5_DB_MODULE_DIR"
puts $conffile " foo_db2 = {"
puts $conffile " db_library = db2"
projects / krb5.git / commitdiff