oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

lower amount of shadow and const warnings

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15587 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-07-07 22:06:50 +00:00
parent 7da40a08e1
commit 5654000990
8 changed files with 39 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kadmin/add-random-users.c
View File

@@ -156,12 +156,12 @@ usage (int ret)
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
int optind = 0; int optidx = 0;
int n = NUSERS; int n = NUSERS;
const char *filename = WORDS_FILENAME; const char *filename = WORDS_FILENAME;
setprogname(argv[0]); setprogname(argv[0]);
if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind)) if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optidx))
usage(1); usage(1);
if (help_flag) if (help_flag)
usage (0); usage (0);
@@ -170,8 +170,8 @@ main(int argc, char **argv)
return 0; return 0;
} }
srand (0); srand (0);
argc -= optind; argc -= optidx;
argv += optind; argv += optidx;
if (argc > 0) { if (argc > 0) {
if (argc > 1) if (argc > 1)

10
kadmin/ext.c
View File

@@ -63,13 +63,13 @@ do_ext_keytab(krb5_principal principal, void *data)
return ENOMEM; return ENOMEM;
} }
for (i = 0; i < princ.n_key_data; i++) { for (i = 0; i < princ.n_key_data; i++) {
krb5_key_data *k = &princ.key_data[i]; krb5_key_data *kd = &princ.key_data[i];
keys[i].principal = princ.principal; keys[i].principal = princ.principal;
keys[i].vno = k->key_data_kvno; keys[i].vno = kd->key_data_kvno;
keys[i].keyblock.keytype = k->key_data_type[0]; keys[i].keyblock.keytype = kd->key_data_type[0];
keys[i].keyblock.keyvalue.length = k->key_data_length[0]; keys[i].keyblock.keyvalue.length = kd->key_data_length[0];
keys[i].keyblock.keyvalue.data = k->key_data_contents[0]; keys[i].keyblock.keyvalue.data = kd->key_data_contents[0];
keys[i].timestamp = time(NULL); keys[i].timestamp = time(NULL);
} }

4
kadmin/kadm_conn.c
View File

@@ -266,6 +266,10 @@ start_server(krb5_context context)
sizeof(one)) < 0) sizeof(one)) < 0)
krb5_warn(context, errno, "setsockopt"); krb5_warn(context, errno, "setsockopt");
#endif #endif
{
int on = 1;
setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on));
}
if (bind (s, ap->ai_addr, ap->ai_addrlen) < 0) { if (bind (s, ap->ai_addr, ap->ai_addrlen) < 0) {
krb5_warn(context, errno, "bind"); krb5_warn(context, errno, "bind");
close(s); close(s);

8
kadmin/kadmin.c
View File

@@ -170,7 +170,7 @@ main(int argc, char **argv)
krb5_error_code ret; krb5_error_code ret;
char **files; char **files;
kadm5_config_params conf; kadm5_config_params conf;
int optind = 0; int optidx = 0;
int exit_status = 0; int exit_status = 0;
setprogname(argv[0]); setprogname(argv[0]);
@@ -179,7 +179,7 @@ main(int argc, char **argv)
if (ret) if (ret)
errx (1, "krb5_init_context failed: %d", ret); errx (1, "krb5_init_context failed: %d", ret);
if(getarg(args, num_args, argc, argv, &optind)) if(getarg(args, num_args, argc, argv, &optidx))
usage(1); usage(1);
if (help_flag) if (help_flag)
@@ -190,8 +190,8 @@ main(int argc, char **argv)
exit(0); exit(0);
} }
argc -= optind; argc -= optidx;
argv += optind; argv += optidx;
if (config_file == NULL) if (config_file == NULL)
config_file = HDB_DB_DIR "/kdc.conf"; config_file = HDB_DB_DIR "/kdc.conf";

6
kadmin/kadmin_locl.h
View File

@@ -111,7 +111,7 @@ int edit_attributes (const char *prompt, krb5_flags *attr, int *mask,
int bit); int bit);
void time_t2str(time_t t, char *str, size_t len, int include_time); void time_t2str(time_t t, char *str, size_t len, int include_time);
int str2time_t (const char *str, time_t *time); int str2time_t (const char *str, time_t *);
int parse_timet (const char *resp, krb5_timestamp *value, int *mask, int bit); int parse_timet (const char *resp, krb5_timestamp *value, int *mask, int bit);
int edit_timet (const char *prompt, krb5_timestamp *value, int *mask, int edit_timet (const char *prompt, krb5_timestamp *value, int *mask,
int bit); int bit);
@@ -134,13 +134,13 @@ int set_entry(krb5_context context,
const char *pw_expiration, const char *pw_expiration,
const char *attributes); const char *attributes);
int int
foreach_principal(const char *exp, foreach_principal(const char *exp_str,
int (*func)(krb5_principal, void*), int (*func)(krb5_principal, void*),
const char *funcname, const char *funcname,
void *data); void *data);
int parse_des_key (const char *key_string, int parse_des_key (const char *key_string,
krb5_key_data *key_data, const char **err); krb5_key_data *key_data, const char **);
/* server.c */ /* server.c */

16
kadmin/kadmind.c
View File

@@ -91,9 +91,9 @@ main(int argc, char **argv)
{ {
krb5_error_code ret; krb5_error_code ret;
char **files; char **files;
int optind = 0; int optidx = 0;
int e, i; int e, i;
krb5_log_facility *logf; krb5_log_facility *logfacility;
krb5_keytab keytab; krb5_keytab keytab;
setprogname(argv[0]); setprogname(argv[0]);
@@ -102,8 +102,8 @@ main(int argc, char **argv)
if (ret) if (ret)
errx (1, "krb5_init_context failed: %d", ret); errx (1, "krb5_init_context failed: %d", ret);
while((e = getarg(args, num_args, argc, argv, &optind))) while((e = getarg(args, num_args, argc, argv, &optidx)))
warnx("error at argument `%s'", argv[optind]); warnx("error at argument `%s'", argv[optidx]);
if (help_flag) if (help_flag)
usage (0); usage (0);
@@ -113,8 +113,8 @@ main(int argc, char **argv)
exit(0); exit(0);
} }
argc -= optind; argc -= optidx;
argv += optind; argv += optidx;
if (config_file == NULL) if (config_file == NULL)
config_file = HDB_DB_DIR "/kdc.conf"; config_file = HDB_DB_DIR "/kdc.conf";
@@ -128,10 +128,10 @@ main(int argc, char **argv)
if(ret) if(ret)
krb5_err(context, 1, ret, "reading configuration files"); krb5_err(context, 1, ret, "reading configuration files");
ret = krb5_openlog(context, "kadmind", &logf); ret = krb5_openlog(context, "kadmind", &logfacility);
if (ret) if (ret)
krb5_err(context, 1, ret, "krb5_openlog"); krb5_err(context, 1, ret, "krb5_openlog");
ret = krb5_set_warn_dest(context, logf); ret = krb5_set_warn_dest(context, logfacility);
if (ret) if (ret)
krb5_err(context, 1, ret, "krb5_set_warn_dest"); krb5_err(context, 1, ret, "krb5_set_warn_dest");

8
kadmin/load.c
View File

@@ -316,7 +316,7 @@ parse_generation(char *str, GENERATION **gen)
*/ */
static int static int
doit(const char *filename, int merge) doit(const char *filename, int mergep)
{ {
krb5_error_code ret; krb5_error_code ret;
FILE *f; FILE *f;
@@ -340,7 +340,7 @@ doit(const char *filename, int merge)
return 1; return 1;
} }
if(!merge) if(!mergep)
flags |= O_CREAT | O_TRUNC; flags |= O_CREAT | O_TRUNC;
ret = db->hdb_open(context, db, flags, 0600); ret = db->hdb_open(context, db, flags, 0600);
if(ret){ if(ret){
@@ -487,14 +487,14 @@ doit(const char *filename, int merge)
extern int local_flag; extern int local_flag;
static int static int
loadit(int merge, const char *name, int argc, char **argv) loadit(int mergep, const char *name, int argc, char **argv)
{ {
if(!local_flag) { if(!local_flag) {
krb5_warnx(context, "%s is only available in local (-l) mode", name); krb5_warnx(context, "%s is only available in local (-l) mode", name);
return 0; return 0;
} }
doit(argv[0], merge); doit(argv[0], mergep);
return 0; return 0;
} }

14
kadmin/util.c
View File

@@ -487,7 +487,7 @@ is_expression(const char *string)
/* loop over all principals matching exp */ /* loop over all principals matching exp */
int int
foreach_principal(const char *exp, foreach_principal(const char *exp_str,
int (*func)(krb5_principal, void*), int (*func)(krb5_principal, void*),
const char *funcname, const char *funcname,
void *data) void *data)
@@ -501,9 +501,9 @@ foreach_principal(const char *exp,
/* if this isn't an expression, there is no point in wading /* if this isn't an expression, there is no point in wading
through the whole database looking for matches */ through the whole database looking for matches */
is_expr = is_expression(exp); is_expr = is_expression(exp_str);
if(is_expr) if(is_expr)
ret = kadm5_get_principals(kadm_handle, exp, &princs, &num_princs); ret = kadm5_get_principals(kadm_handle, exp_str, &princs, &num_princs);
if(!is_expr || ret == KADM5_AUTH_LIST) { if(!is_expr || ret == KADM5_AUTH_LIST) {
/* we might be able to perform the requested opreration even /* we might be able to perform the requested opreration even
if we're not allowed to list principals */ if we're not allowed to list principals */
@@ -511,7 +511,7 @@ foreach_principal(const char *exp,
princs = malloc(sizeof(*princs)); princs = malloc(sizeof(*princs));
if(princs == NULL) if(princs == NULL)
return ENOMEM; return ENOMEM;
princs[0] = strdup(exp); princs[0] = strdup(exp_str);
if(princs[0] == NULL){ if(princs[0] == NULL){
free(princs); free(princs);
return ENOMEM; return ENOMEM;
@@ -604,14 +604,14 @@ hex2n (char c)
int int
parse_des_key (const char *key_string, krb5_key_data *key_data, parse_des_key (const char *key_string, krb5_key_data *key_data,
const char **err) const char **error)
{ {
const char *p = key_string; const char *p = key_string;
unsigned char bits[8]; unsigned char bits[8];
int i; int i;
if (strlen (key_string) != 16) { if (strlen (key_string) != 16) {
*err = "bad length, should be 16 for DES key"; *error = "bad length, should be 16 for DES key";
return 1; return 1;
} }
for (i = 0; i < 8; ++i) { for (i = 0; i < 8; ++i) {
@@ -620,7 +620,7 @@ parse_des_key (const char *key_string, krb5_key_data *key_data,
d1 = hex2n(p[2 * i]); d1 = hex2n(p[2 * i]);
d2 = hex2n(p[2 * i + 1]); d2 = hex2n(p[2 * i + 1]);
if (d1 < 0 || d2 < 0) { if (d1 < 0 || d2 < 0) {
*err = "non-hex character"; *error = "non-hex character";
return 1; return 1;
} }
bits[i] = (d1 << 4) | d2; bits[i] = (d1 << 4) | d2;