
We turn on a few extra warnings and fix the fallout that occurs when building with --enable-developer. Note that we get different warnings on different machines and so this will be a work in progress. So far, we have built on NetBSD/amd64 5.99.64 (which uses gcc 4.5.3) and Ubuntu 10.04.3 LTS (which uses gcc 4.4.3). Notably, we fixed 1. a lot of missing structure initialisers, 2. unchecked return values for functions that glibc marks as __attribute__((warn-unused-result)), 3. made minor modifications to slc and asn1_compile which can generate code which generates warnings, and 4. a few stragglers here and there. We turned off the extended warnings for many programs in appl/ as they are nearing the end of their useful lifetime, e.g. rsh, rcp, popper, ftp and telnet. Interestingly, glibc's strncmp() macro needed to be worked around whereas the function calls did not. We have not yet tried this on 32 bit platforms, so there will be a few more warnings when we do.
269 lines
6.4 KiB
C
269 lines
6.4 KiB
C
/*
|
|
* Copyright (c) 2005 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.
|
|
*/
|
|
|
|
#include "hdb_locl.h"
|
|
|
|
struct hdb_dbinfo {
|
|
char *label;
|
|
char *realm;
|
|
char *dbname;
|
|
char *mkey_file;
|
|
char *acl_file;
|
|
char *log_file;
|
|
const krb5_config_binding *binding;
|
|
struct hdb_dbinfo *next;
|
|
};
|
|
|
|
static int
|
|
get_dbinfo(krb5_context context,
|
|
const krb5_config_binding *db_binding,
|
|
const char *label,
|
|
struct hdb_dbinfo **db)
|
|
{
|
|
struct hdb_dbinfo *di;
|
|
const char *p;
|
|
|
|
*db = NULL;
|
|
|
|
p = krb5_config_get_string(context, db_binding, "dbname", NULL);
|
|
if(p == NULL)
|
|
return 0;
|
|
|
|
di = calloc(1, sizeof(*di));
|
|
if (di == NULL) {
|
|
krb5_set_error_message(context, ENOMEM, "malloc: out of memory");
|
|
return ENOMEM;
|
|
}
|
|
di->label = strdup(label);
|
|
di->dbname = strdup(p);
|
|
|
|
p = krb5_config_get_string(context, db_binding, "realm", NULL);
|
|
if(p)
|
|
di->realm = strdup(p);
|
|
p = krb5_config_get_string(context, db_binding, "mkey_file", NULL);
|
|
if(p)
|
|
di->mkey_file = strdup(p);
|
|
p = krb5_config_get_string(context, db_binding, "acl_file", NULL);
|
|
if(p)
|
|
di->acl_file = strdup(p);
|
|
p = krb5_config_get_string(context, db_binding, "log_file", NULL);
|
|
if(p)
|
|
di->log_file = strdup(p);
|
|
|
|
di->binding = db_binding;
|
|
|
|
*db = di;
|
|
return 0;
|
|
}
|
|
|
|
|
|
int
|
|
hdb_get_dbinfo(krb5_context context, struct hdb_dbinfo **dbp)
|
|
{
|
|
const krb5_config_binding *db_binding;
|
|
struct hdb_dbinfo *di, **dt, *databases;
|
|
const char *default_dbname = HDB_DEFAULT_DB;
|
|
const char *default_mkey = HDB_DB_DIR "/m-key";
|
|
const char *default_acl = HDB_DB_DIR "/kadmind.acl";
|
|
const char *p;
|
|
int ret;
|
|
|
|
*dbp = NULL;
|
|
dt = NULL;
|
|
databases = NULL;
|
|
|
|
db_binding = krb5_config_get_list(context, NULL,
|
|
"kdc",
|
|
"database",
|
|
NULL);
|
|
if (db_binding) {
|
|
|
|
ret = get_dbinfo(context, db_binding, "default", &di);
|
|
if (ret == 0 && di) {
|
|
databases = di;
|
|
dt = &di->next;
|
|
}
|
|
|
|
for ( ; db_binding != NULL; db_binding = db_binding->next) {
|
|
|
|
if (db_binding->type != krb5_config_list)
|
|
continue;
|
|
|
|
ret = get_dbinfo(context, db_binding->u.list,
|
|
db_binding->name, &di);
|
|
if (ret)
|
|
krb5_err(context, 1, ret, "failed getting realm");
|
|
|
|
if (di == NULL)
|
|
continue;
|
|
|
|
if (dt)
|
|
*dt = di;
|
|
else
|
|
databases = di;
|
|
dt = &di->next;
|
|
|
|
}
|
|
}
|
|
|
|
if(databases == NULL) {
|
|
/* if there are none specified, create one and use defaults */
|
|
di = calloc(1, sizeof(*di));
|
|
databases = di;
|
|
di->label = strdup("default");
|
|
}
|
|
|
|
for(di = databases; di; di = di->next) {
|
|
if(di->dbname == NULL) {
|
|
di->dbname = strdup(default_dbname);
|
|
if (di->mkey_file == NULL)
|
|
di->mkey_file = strdup(default_mkey);
|
|
}
|
|
if(di->mkey_file == NULL) {
|
|
p = strrchr(di->dbname, '.');
|
|
if(p == NULL || strchr(p, '/') != NULL)
|
|
/* final pathname component does not contain a . */
|
|
ret = asprintf(&di->mkey_file, "%s.mkey", di->dbname);
|
|
else
|
|
/* the filename is something.else, replace .else with
|
|
.mkey */
|
|
ret = asprintf(&di->mkey_file, "%.*s.mkey",
|
|
(int)(p - di->dbname), di->dbname);
|
|
if (ret == -1)
|
|
return ENOMEM;
|
|
}
|
|
if(di->acl_file == NULL)
|
|
di->acl_file = strdup(default_acl);
|
|
}
|
|
*dbp = databases;
|
|
return 0;
|
|
}
|
|
|
|
|
|
struct hdb_dbinfo *
|
|
hdb_dbinfo_get_next(struct hdb_dbinfo *dbp, struct hdb_dbinfo *dbprevp)
|
|
{
|
|
if (dbprevp == NULL)
|
|
return dbp;
|
|
else
|
|
return dbprevp->next;
|
|
}
|
|
|
|
const char *
|
|
hdb_dbinfo_get_label(krb5_context context, struct hdb_dbinfo *dbp)
|
|
{
|
|
return dbp->label;
|
|
}
|
|
|
|
const char *
|
|
hdb_dbinfo_get_realm(krb5_context context, struct hdb_dbinfo *dbp)
|
|
{
|
|
return dbp->realm;
|
|
}
|
|
|
|
const char *
|
|
hdb_dbinfo_get_dbname(krb5_context context, struct hdb_dbinfo *dbp)
|
|
{
|
|
return dbp->dbname;
|
|
}
|
|
|
|
const char *
|
|
hdb_dbinfo_get_mkey_file(krb5_context context, struct hdb_dbinfo *dbp)
|
|
{
|
|
return dbp->mkey_file;
|
|
}
|
|
|
|
const char *
|
|
hdb_dbinfo_get_acl_file(krb5_context context, struct hdb_dbinfo *dbp)
|
|
{
|
|
return dbp->acl_file;
|
|
}
|
|
|
|
const char *
|
|
hdb_dbinfo_get_log_file(krb5_context context, struct hdb_dbinfo *dbp)
|
|
{
|
|
return dbp->log_file;
|
|
}
|
|
|
|
const krb5_config_binding *
|
|
hdb_dbinfo_get_binding(krb5_context context, struct hdb_dbinfo *dbp)
|
|
{
|
|
return dbp->binding;
|
|
}
|
|
|
|
void
|
|
hdb_free_dbinfo(krb5_context context, struct hdb_dbinfo **dbp)
|
|
{
|
|
struct hdb_dbinfo *di, *ndi;
|
|
|
|
for(di = *dbp; di != NULL; di = ndi) {
|
|
ndi = di->next;
|
|
free (di->label);
|
|
free (di->realm);
|
|
free (di->dbname);
|
|
free (di->mkey_file);
|
|
free (di->acl_file);
|
|
free (di->log_file);
|
|
free(di);
|
|
}
|
|
*dbp = NULL;
|
|
}
|
|
|
|
/**
|
|
* Return the directory where the hdb database resides.
|
|
*
|
|
* @param context Kerberos 5 context.
|
|
*
|
|
* @return string pointing to directory.
|
|
*/
|
|
|
|
const char *
|
|
hdb_db_dir(krb5_context context)
|
|
{
|
|
return HDB_DB_DIR;
|
|
}
|
|
|
|
/**
|
|
* Return the default hdb database resides.
|
|
*
|
|
* @param context Kerberos 5 context.
|
|
*
|
|
* @return string pointing to directory.
|
|
*/
|
|
|
|
const char *
|
|
hdb_default_db(krb5_context context)
|
|
{
|
|
return HDB_DEFAULT_DB;
|
|
}
|