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

diff --git a/src/lib/kadm5/ChangeLog b/src/lib/kadm5/ChangeLog
index da81cca5600f499f1dfc72c33e6077695c2dc865..8706ec072af80a1f8d47842ea4f8271b79f976c9 100644 (file)
--- a/src/lib/kadm5/ChangeLog
+++ b/src/lib/kadm5/ChangeLog
@@ -1,3 +1,13 @@
+2000-02-26  Tom Yu  <tlyu@mit.edu>
+
+       * 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  <raeburn@mit.edu>
 
        * 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 d8904e664ab3322abf80ec4f62a98e12ef567632..159c7fb58a242aa38ee4937b988442feb096dc6d 100644 (file)
--- 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 37f4207edd8c2785164f8adaa7fa5189403c24fa..79dc124d04055a17114a38a700f53e0528e8fa52 100644 (file)
--- a/src/lib/kadm5/clnt/ChangeLog
+++ b/src/lib/kadm5/clnt/ChangeLog
@@ -1,3 +1,11 @@
+2000-02-26  Tom Yu  <tlyu@mit.edu>
+
+       * 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  <tlyu@mit.edu>
 
        * client_rpc.c: Add new client stubs.

diff --git a/src/lib/kadm5/clnt/Makefile.in b/src/lib/kadm5/clnt/Makefile.in
index 0fc00ffe83d83d8dfb1cc85374862630e1220042..2d69cdca4f4dddbc75a808e21048929497e5e3a0 100644 (file)
--- 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 97ea6989c7b61a32581e0e471b1138c92c0736b6..cd2bdf042b3fd9dbab742e44563d9f2fdca5a91d 100644 (file)
--- 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 e1aa364321b903c2a2b4b93642494f586225720b..4387f70a7f085fc35700e0fe7411ec295a47903f 100644 (file)
--- 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 69b8da8752ff2a825a3f89f9c8b126a13f0207b6..bf40048369434f94d88d3bd1ed8485c8fe78664d 100644 (file)
--- 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 cc1a96808c2ae982b97d9b2e80b1d6d87c83c002..3ada002ce20132393d1fd450b3b09b78570bfbcf 100644 (file)
--- a/src/lib/kadm5/srv/ChangeLog
+++ b/src/lib/kadm5/srv/ChangeLog
@@ -1,3 +1,11 @@
+2000-02-26  Tom Yu  <tlyu@mit.edu>
+
+       * 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  <raeburn@mit.edu>
 
        * 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 ed9018f04abb765ac0cb126449df6ab1b7ddf954..a0d18e447c2e7558d5c94be3b83ba067d53fd172 100644 (file)
--- 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 f8148a046fc062b599aea2c809c30dbf96eac1ab..4981703b45b2da4b81b3d7a4f8f3547d79149fc8 100644 (file)
--- 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);