From c8ff7ee971aaf226eec969bdb9b90a1d27de0c07 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Sun, 27 Feb 2000 22:18:16 +0000 Subject: [PATCH] Remove keepold argument from create_principal_3, since it is rather useless. Update library version numbers, xdr functions, etc. accordingly. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12082 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/kadm5/ChangeLog | 10 ++++++++++ src/lib/kadm5/admin.h | 2 +- src/lib/kadm5/clnt/ChangeLog | 8 ++++++++ src/lib/kadm5/clnt/Makefile.in | 2 +- src/lib/kadm5/clnt/client_principal.c | 3 +-- src/lib/kadm5/kadm_rpc.h | 1 - src/lib/kadm5/kadm_rpc_xdr.c | 3 --- src/lib/kadm5/srv/ChangeLog | 8 ++++++++ src/lib/kadm5/srv/Makefile.in | 2 +- src/lib/kadm5/srv/svr_principal.c | 5 ++--- 10 files changed, 32 insertions(+), 12 deletions(-) diff --git a/src/lib/kadm5/ChangeLog b/src/lib/kadm5/ChangeLog index da81cca56..8706ec072 100644 --- a/src/lib/kadm5/ChangeLog +++ b/src/lib/kadm5/ChangeLog @@ -1,3 +1,13 @@ +2000-02-26 Tom Yu + + * kadm_rpc_xdr.c (xdr_cprinc3_arg): Don't XDR the nonexistent + keepold flag. + + * kadm_rpc.h: Remove keepold flag from cprinc3_arg. + + * admin.h: Remove keepold flag from create_principal_3, which was + kinda ridiculous. + 2000-02-22 Ken Raeburn * Makefile.in (includes): Extract basename of header file to be diff --git a/src/lib/kadm5/admin.h b/src/lib/kadm5/admin.h index d8904e664..159c7fb58 100644 --- a/src/lib/kadm5/admin.h +++ b/src/lib/kadm5/admin.h @@ -305,7 +305,7 @@ kadm5_ret_t kadm5_create_principal(void *server_handle, long mask, char *pass); kadm5_ret_t kadm5_create_principal_3(void *server_handle, kadm5_principal_ent_t ent, - long mask, krb5_boolean keepold, + long mask, int n_ks_tuple, krb5_key_salt_tuple *ks_tuple, char *pass); diff --git a/src/lib/kadm5/clnt/ChangeLog b/src/lib/kadm5/clnt/ChangeLog index 37f4207ed..79dc124d0 100644 --- a/src/lib/kadm5/clnt/ChangeLog +++ b/src/lib/kadm5/clnt/ChangeLog @@ -1,3 +1,11 @@ +2000-02-26 Tom Yu + + * client_principal.c (kadm5_create_principal_3): Remove keepold + argument. + + * Makefile.in (LIBMAJOR): Bump major number due to call signature + changes. + 2000-02-13 Tom Yu * client_rpc.c: Add new client stubs. diff --git a/src/lib/kadm5/clnt/Makefile.in b/src/lib/kadm5/clnt/Makefile.in index 0fc00ffe8..2d69cdca4 100644 --- a/src/lib/kadm5/clnt/Makefile.in +++ b/src/lib/kadm5/clnt/Makefile.in @@ -5,7 +5,7 @@ BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U) LOCALINCLUDES = -I$(BUILDTOP)/include/kadm5 LIB=kadm5clnt -LIBMAJOR=3 +LIBMAJOR=4 LIBMINOR=0 STOBJLISTS=../OBJS.ST OBJS.ST SHLIB_EXPDEPS=\ diff --git a/src/lib/kadm5/clnt/client_principal.c b/src/lib/kadm5/clnt/client_principal.c index 97ea6989c..cd2bdf042 100644 --- a/src/lib/kadm5/clnt/client_principal.c +++ b/src/lib/kadm5/clnt/client_principal.c @@ -74,7 +74,7 @@ kadm5_create_principal(void *server_handle, kadm5_ret_t kadm5_create_principal_3(void *server_handle, kadm5_principal_ent_t princ, long mask, - krb5_boolean keepold, int n_ks_tuple, + int n_ks_tuple, krb5_key_salt_tuple *ks_tuple, char *pw) { @@ -88,7 +88,6 @@ kadm5_create_principal_3(void *server_handle, arg.mask = mask; arg.passwd = pw; arg.api_version = handle->api_version; - arg.keepold = keepold; arg.n_ks_tuple = n_ks_tuple; arg.ks_tuple = ks_tuple; diff --git a/src/lib/kadm5/kadm_rpc.h b/src/lib/kadm5/kadm_rpc.h index e1aa36432..4387f70a7 100644 --- a/src/lib/kadm5/kadm_rpc.h +++ b/src/lib/kadm5/kadm_rpc.h @@ -16,7 +16,6 @@ struct cprinc3_arg { krb5_ui_4 api_version; kadm5_principal_ent_rec rec; long mask; - krb5_boolean keepold; int n_ks_tuple; krb5_key_salt_tuple *ks_tuple; char *passwd; diff --git a/src/lib/kadm5/kadm_rpc_xdr.c b/src/lib/kadm5/kadm_rpc_xdr.c index 69b8da875..bf4004836 100644 --- a/src/lib/kadm5/kadm_rpc_xdr.c +++ b/src/lib/kadm5/kadm_rpc_xdr.c @@ -498,9 +498,6 @@ xdr_cprinc3_arg(XDR *xdrs, cprinc3_arg *objp) if (!xdr_long(xdrs, &objp->mask)) { return (FALSE); } - if (!xdr_bool(xdrs, &objp->keepold)) { - return (FALSE); - } if (!xdr_array(xdrs, (caddr_t *)&objp->ks_tuple, (unsigned int *)&objp->n_ks_tuple, ~0, sizeof(krb5_key_salt_tuple), diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog index cc1a96808..3ada002ce 100644 --- a/src/lib/kadm5/srv/ChangeLog +++ b/src/lib/kadm5/srv/ChangeLog @@ -1,3 +1,11 @@ +2000-02-26 Tom Yu + + * svr_principal.c (kadm5_create_principal_3): Remove keepold + argument. + + * Makefile.in (LIBMAJOR): Bump major number due to call signature + changes. + 2000-02-25 Ken Raeburn * server_acl.c (acl_get_line): Patch from Matt Crawford to permit diff --git a/src/lib/kadm5/srv/Makefile.in b/src/lib/kadm5/srv/Makefile.in index ed9018f04..a0d18e447 100644 --- a/src/lib/kadm5/srv/Makefile.in +++ b/src/lib/kadm5/srv/Makefile.in @@ -9,7 +9,7 @@ DEFINES = @HESIOD_DEFS@ ##DOSLIBNAME = libkadm5srv.lib LIB=kadm5srv -LIBMAJOR=3 +LIBMAJOR=4 LIBMINOR=0 STOBJLISTS=../OBJS.ST OBJS.ST SHLIB_EXPDEPS=\ diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c index f8148a046..4981703b4 100644 --- a/src/lib/kadm5/srv/svr_principal.c +++ b/src/lib/kadm5/srv/svr_principal.c @@ -106,12 +106,11 @@ kadm5_create_principal(void *server_handle, { return kadm5_create_principal_3(server_handle, entry, mask, - FALSE, 0, NULL, password); + 0, NULL, password); } kadm5_ret_t kadm5_create_principal_3(void *server_handle, kadm5_principal_ent_t entry, long mask, - krb5_boolean keepold, int n_ks_tuple, krb5_key_salt_tuple *ks_tuple, char *password) { @@ -250,7 +249,7 @@ kadm5_create_principal_3(void *server_handle, n_ks_tuple?n_ks_tuple:handle->params.num_keysalts, password, (mask & KADM5_KVNO)?entry->kvno:1, - keepold, &kdb)) { + FALSE, &kdb)) { krb5_dbe_free_contents(handle->context, &kdb); if (mask & KADM5_POLICY) (void) kadm5_free_policy_ent(handle->lhandle, &polent); -- 2.26.2