From ee2044f38503edd2fdb8df9f3398784f747910fb Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Fri, 22 Mar 2013 12:59:48 -0400 Subject: Get rid of osconfig.c These variables were marked as internal in 1996. Two are unused and the other is easily replaced with the macro it is initialized from. --- src/include/k5-int.h | 3 --- src/lib/krb5/libkrb5.exports | 3 --- src/lib/krb5/os/Makefile.in | 3 --- src/lib/krb5/os/os-proto.h | 1 - src/lib/krb5/os/osconfig.c | 41 ----------------------------------------- src/lib/krb5/os/sendto_kdc.c | 4 ++-- 6 files changed, 2 insertions(+), 53 deletions(-) delete mode 100644 src/lib/krb5/os/osconfig.c diff --git a/src/include/k5-int.h b/src/include/k5-int.h index c60035b4c1..cb8350f2d4 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -134,9 +134,6 @@ typedef UINT64_TYPE krb5_ui_8; typedef INT64_TYPE krb5_int64; -#define DEFAULT_PWD_STRING1 "Enter password" -#define DEFAULT_PWD_STRING2 "Re-enter password for verification" - #define KRB5_KDB_MAX_LIFE (60*60*24) /* one day */ #define KRB5_KDB_MAX_RLIFE (60*60*24*7) /* one week */ #define KRB5_KDB_EXPIRATION 2145830400 /* Thu Jan 1 00:00:00 2038 UTC */ diff --git a/src/lib/krb5/libkrb5.exports b/src/lib/krb5/libkrb5.exports index 8d19f14938..1656cfc502 100644 --- a/src/lib/krb5/libkrb5.exports +++ b/src/lib/krb5/libkrb5.exports @@ -253,8 +253,6 @@ krb5_crypto_us_timeofday krb5_decode_authdata_container krb5_decode_ticket krb5_decrypt_tkt_part -krb5_default_pwd_prompt1 -krb5_default_pwd_prompt2 krb5_deltat_to_string krb5_encode_authdata_container krb5_encode_kdc_rep @@ -435,7 +433,6 @@ krb5_lock_file krb5_make_authdata_kdc_issued krb5_make_full_ipaddr krb5_make_fulladdr -krb5_max_dgram_size krb5_mcc_ops krb5_merge_authdata krb5_mk_1cred diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in index bf6155773c..d95ece00b7 100644 --- a/src/lib/krb5/os/Makefile.in +++ b/src/lib/krb5/os/Makefile.in @@ -44,7 +44,6 @@ STLIBOBJS= \ lock_file.o \ net_read.o \ net_write.o \ - osconfig.o \ port2ip.o \ prompter.o \ read_msg.o \ @@ -92,7 +91,6 @@ OBJS= \ $(OUTPRE)lock_file.$(OBJEXT) \ $(OUTPRE)net_read.$(OBJEXT) \ $(OUTPRE)net_write.$(OBJEXT) \ - $(OUTPRE)osconfig.$(OBJEXT) \ $(OUTPRE)port2ip.$(OBJEXT) \ $(OUTPRE)prompter.$(OBJEXT) \ $(OUTPRE)read_msg.$(OBJEXT) \ @@ -140,7 +138,6 @@ SRCS= \ $(srcdir)/lock_file.c \ $(srcdir)/net_read.c \ $(srcdir)/net_write.c \ - $(srcdir)/osconfig.c \ $(srcdir)/prompter.c \ $(srcdir)/read_msg.c \ $(srcdir)/read_pwd.c \ diff --git a/src/lib/krb5/os/os-proto.h b/src/lib/krb5/os/os-proto.h index f0071d69ae..e50a0d4563 100644 --- a/src/lib/krb5/os/os-proto.h +++ b/src/lib/krb5/os/os-proto.h @@ -116,7 +116,6 @@ extern k5_mutex_t krb5int_us_time_mutex; extern unsigned int krb5_max_skdc_timeout; extern unsigned int krb5_skdc_timeout_shift; extern unsigned int krb5_skdc_timeout_1; -extern unsigned int krb5_max_dgram_size; krb5_error_code localauth_names_initvt(krb5_context context, int maj_ver, int min_ver, krb5_plugin_vtable vtable); diff --git a/src/lib/krb5/os/osconfig.c b/src/lib/krb5/os/osconfig.c deleted file mode 100644 index 1f6be6fecc..0000000000 --- a/src/lib/krb5/os/osconfig.c +++ /dev/null @@ -1,41 +0,0 @@ -/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -/* lib/krb5/os/osconfig.c */ -/* - * Copyright 1990 by the Massachusetts Institute of Technology. - * All Rights Reserved. - * - * Export of this software from the United States of America may - * require a specific license from the United States Government. - * It is the responsibility of any person or organization contemplating - * export to obtain such a license before exporting. - * - * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and - * distribute this software and its documentation for any purpose and - * without fee is hereby granted, provided that the above copyright - * notice appear in all copies and that both that copyright notice and - * this permission notice appear in supporting documentation, and that - * the name of M.I.T. not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. Furthermore if you modify this software you must label - * your software as modified software and not distribute it in such a - * fashion that it might be confused with the original M.I.T. software. - * M.I.T. makes no representations about the suitability of - * this software for any purpose. It is provided "as is" without express - * or implied warranty. - */ - -/* - * Definition of default configuration parameters. - * - * ***** WARNING ***** - * These globals are internal library interfaces and are not - * supported. Do not use them in any production code, as they will be - * removed from the library in the future. - */ - -#include "k5-int.h" - -unsigned int krb5_max_dgram_size = MAX_DGRAM_SIZE; - -const char *krb5_default_pwd_prompt1 = DEFAULT_PWD_STRING1; -const char *krb5_default_pwd_prompt2 = DEFAULT_PWD_STRING2; diff --git a/src/lib/krb5/os/sendto_kdc.c b/src/lib/krb5/os/sendto_kdc.c index edc4a6e3a5..040c554e43 100644 --- a/src/lib/krb5/os/sendto_kdc.c +++ b/src/lib/krb5/os/sendto_kdc.c @@ -634,12 +634,12 @@ add_connection(struct conn_state **conns, struct addrinfo *ai, set_conn_state_msg_length (state, message); if (*udpbufp == NULL) { - *udpbufp = malloc(krb5_max_dgram_size); + *udpbufp = malloc(MAX_DGRAM_SIZE); if (*udpbufp == 0) return ENOMEM; } state->x.in.buf = *udpbufp; - state->x.in.bufsize = krb5_max_dgram_size; + state->x.in.bufsize = MAX_DGRAM_SIZE; } /* Chain the new state onto the tail of the list. */ -- cgit