From: Greg Hudson Date: Tue, 4 May 2010 16:54:00 +0000 (+0000) Subject: Remove some unused fields from kadm5_config_params. Bump the client X-Git-Tag: krb5-1.9-beta1~248 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=61cd64533f42d79628075492c42e1eb4cb2dd274;p=krb5.git Remove some unused fields from kadm5_config_params. Bump the client and server sonames. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23969 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/lib/kadm5/admin.h b/src/lib/kadm5/admin.h index bc882450e..647226c7d 100644 --- a/src/lib/kadm5/admin.h +++ b/src/lib/kadm5/admin.h @@ -242,10 +242,6 @@ typedef struct _kadm5_config_params { file. */ char * dbname; - /* dummy fields to preserve abi for now */ - char * admin_dbname_was_here; - char * admin_lockfile_was_here; - char * admin_keytab; char * acl_file; char * dict_file; diff --git a/src/lib/kadm5/alt_prof.c b/src/lib/kadm5/alt_prof.c index b4841bae8..e3e6d4955 100644 --- a/src/lib/kadm5/alt_prof.c +++ b/src/lib/kadm5/alt_prof.c @@ -594,10 +594,6 @@ krb5_error_code kadm5_get_config_params(context, use_kdc_config, GET_STRING_PARAM(dbname, KADM5_CONFIG_DBNAME, KRB5_CONF_DATABASE_NAME, DEFAULT_KDB_FILE); - params.admin_dbname_was_here = NULL; - params.admin_lockfile_was_here = NULL; - /* never set KADM5_CONFIG_ADBNAME, KADM5_CONFIG_ADB_LOCKFILE */ - /* Get the value for the admin (policy) database lock file*/ if (!GET_STRING_PARAM(admin_keytab, KADM5_CONFIG_ADMIN_KEYTAB, KRB5_CONF_ADMIN_KEYTAB, NULL)) { diff --git a/src/lib/kadm5/clnt/Makefile.in b/src/lib/kadm5/clnt/Makefile.in index f6a11b43a..81aeb2027 100644 --- a/src/lib/kadm5/clnt/Makefile.in +++ b/src/lib/kadm5/clnt/Makefile.in @@ -4,7 +4,7 @@ LOCALINCLUDES = -I$(BUILDTOP)/include/kadm5 DEFS= LIBBASE=kadm5clnt_mit -LIBMAJOR=7 +LIBMAJOR=8 LIBMINOR=0 STOBJLISTS=../OBJS.ST OBJS.ST SHLIB_EXPDEPS=\ diff --git a/src/lib/kadm5/srv/Makefile.in b/src/lib/kadm5/srv/Makefile.in index 9e8b26f83..c7e0fac9b 100644 --- a/src/lib/kadm5/srv/Makefile.in +++ b/src/lib/kadm5/srv/Makefile.in @@ -10,7 +10,7 @@ DEFS= ##DOSLIBNAME = libkadm5srv.lib LIBBASE=kadm5srv_mit -LIBMAJOR=7 +LIBMAJOR=8 LIBMINOR=0 STOBJLISTS=../OBJS.ST OBJS.ST