Rename all RPC functions from _1 to _2 to match current program version number;

likewise _1_svc to _2_svc in the kadmin server.  Delete the RPC functions from
the libkadm5clnt export list.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17345 dc483132-0cff-0310-8789-dd5450dbe970

12 files changed, 164 insertions, 168 deletions

diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog
index d0903c49f..e461f74ca 100644
--- a/src/kadmin/server/ChangeLog
+++ b/src/kadmin/server/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-20  Ken Raeburn  <raeburn@mit.edu>
+
+	* kadm_rpc_svc.c, server_stubs.c: Rename all RPC functions from
+	_1_svc to _2_svc to match current program version number.
+
 2005-06-20  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in (KDB_DEP_LIB): Use DL_LIB and THREAD_LINKOPTS
diff --git a/src/kadmin/server/kadm_rpc_svc.c b/src/kadmin/server/kadm_rpc_svc.c
index d2139a69c..b01d95794 100644
--- a/src/kadmin/server/kadm_rpc_svc.c
+++ b/src/kadmin/server/kadm_rpc_svc.c
@@ -49,23 +49,23 @@ void kadm_1(rqstp, transp)
    register SVCXPRT *transp;
 {
      union {
-	  cprinc_arg create_principal_1_arg;
-	  dprinc_arg delete_principal_1_arg;
-	  mprinc_arg modify_principal_1_arg;
-	  rprinc_arg rename_principal_1_arg;
-	  gprinc_arg get_principal_1_arg;
-	  chpass_arg chpass_principal_1_arg;
-	  chrand_arg chrand_principal_1_arg;
-	  cpol_arg create_policy_1_arg;
-	  dpol_arg delete_policy_1_arg;
-	  mpol_arg modify_policy_1_arg;
-	  gpol_arg get_policy_1_arg;
-	  setkey_arg setkey_principal_1_arg;
-	  setv4key_arg setv4key_principal_1_arg;
-	  cprinc3_arg create_principal3_1_arg;
-	  chpass3_arg chpass_principal3_1_arg;
-	  chrand3_arg chrand_principal3_1_arg;
-	  setkey3_arg setkey_principal3_1_arg;
+	  cprinc_arg create_principal_2_arg;
+	  dprinc_arg delete_principal_2_arg;
+	  mprinc_arg modify_principal_2_arg;
+	  rprinc_arg rename_principal_2_arg;
+	  gprinc_arg get_principal_2_arg;
+	  chpass_arg chpass_principal_2_arg;
+	  chrand_arg chrand_principal_2_arg;
+	  cpol_arg create_policy_2_arg;
+	  dpol_arg delete_policy_2_arg;
+	  mpol_arg modify_policy_2_arg;
+	  gpol_arg get_policy_2_arg;
+	  setkey_arg setkey_principal_2_arg;
+	  setv4key_arg setv4key_principal_2_arg;
+	  cprinc3_arg create_principal3_2_arg;
+	  chpass3_arg chpass_principal3_2_arg;
+	  chrand3_arg chrand_principal3_2_arg;
+	  setkey3_arg setkey_principal3_2_arg;
      } argument;
      char *result;
      bool_t (*xdr_argument)(), (*xdr_result)();
@@ -89,127 +89,127 @@ void kadm_1(rqstp, transp)
      case CREATE_PRINCIPAL:
 	  xdr_argument = xdr_cprinc_arg;
 	  xdr_result = xdr_generic_ret;
-	  local = (char *(*)()) create_principal_1_svc;
+	  local = (char *(*)()) create_principal_2_svc;
 	  break;
 	  
      case DELETE_PRINCIPAL:
 	  xdr_argument = xdr_dprinc_arg;
 	  xdr_result = xdr_generic_ret;
-	  local = (char *(*)()) delete_principal_1_svc;
+	  local = (char *(*)()) delete_principal_2_svc;
 	  break;
 	  
      case MODIFY_PRINCIPAL:
 	  xdr_argument = xdr_mprinc_arg;
 	  xdr_result = xdr_generic_ret;
-	  local = (char *(*)()) modify_principal_1_svc;
+	  local = (char *(*)()) modify_principal_2_svc;
 	  break;
 	  
      case RENAME_PRINCIPAL:
 	  xdr_argument = xdr_rprinc_arg;
 	  xdr_result = xdr_generic_ret;
-	  local = (char *(*)()) rename_principal_1_svc;
+	  local = (char *(*)()) rename_principal_2_svc;
 	  break;
 	  
      case GET_PRINCIPAL:
 	  xdr_argument = xdr_gprinc_arg;
 	  xdr_result = xdr_gprinc_ret;
-	  local = (char *(*)()) get_principal_1_svc;
+	  local = (char *(*)()) get_principal_2_svc;
 	  break;
 
      case GET_PRINCS:
 	  xdr_argument = xdr_gprincs_arg;
 	  xdr_result = xdr_gprincs_ret;
-	  local = (char *(*)()) get_princs_1_svc;
+	  local = (char *(*)()) get_princs_2_svc;
 	  break;
 	  
      case CHPASS_PRINCIPAL:
 	  xdr_argument = xdr_chpass_arg;
 	  xdr_result = xdr_generic_ret;
-	  local = (char *(*)()) chpass_principal_1_svc;
+	  local = (char *(*)()) chpass_principal_2_svc;
 	  break;
 
      case SETV4KEY_PRINCIPAL:
 	  xdr_argument = xdr_setv4key_arg;
 	  xdr_result = xdr_generic_ret;
-	  local = (char *(*)()) setv4key_principal_1_svc;
+	  local = (char *(*)()) setv4key_principal_2_svc;
 	  break;
 
      case SETKEY_PRINCIPAL:
 	  xdr_argument = xdr_setkey_arg;
 	  xdr_result = xdr_generic_ret;
-	  local = (char *(*)()) setkey_principal_1_svc;
+	  local = (char *(*)()) setkey_principal_2_svc;
 	  break;
 	  
      case CHRAND_PRINCIPAL:
 	  xdr_argument = xdr_chrand_arg;
 	  xdr_result = xdr_chrand_ret;
-	  local = (char *(*)()) chrand_principal_1_svc;
+	  local = (char *(*)()) chrand_principal_2_svc;
 	  break;
 	  
      case CREATE_POLICY:
 	  xdr_argument = xdr_cpol_arg;
 	  xdr_result = xdr_generic_ret;
-	  local = (char *(*)()) create_policy_1_svc;
+	  local = (char *(*)()) create_policy_2_svc;
 	  break;
 	  
      case DELETE_POLICY:
 	  xdr_argument = xdr_dpol_arg;
 	  xdr_result = xdr_generic_ret;
-	  local = (char *(*)()) delete_policy_1_svc;
+	  local = (char *(*)()) delete_policy_2_svc;
 	  break;
 	  
      case MODIFY_POLICY:
 	  xdr_argument = xdr_mpol_arg;
 	  xdr_result = xdr_generic_ret;
-	  local = (char *(*)()) modify_policy_1_svc;
+	  local = (char *(*)()) modify_policy_2_svc;
 	  break;
 	  
      case GET_POLICY:
 	  xdr_argument = xdr_gpol_arg;
 	  xdr_result = xdr_gpol_ret;
-	  local = (char *(*)()) get_policy_1_svc;
+	  local = (char *(*)()) get_policy_2_svc;
 	  break;
 
      case GET_POLS:
 	  xdr_argument = xdr_gpols_arg;
 	  xdr_result = xdr_gpols_ret;
-	  local = (char *(*)()) get_pols_1_svc;
+	  local = (char *(*)()) get_pols_2_svc;
 	  break;
 	  
      case GET_PRIVS:
 	  xdr_argument = xdr_u_int32;
 	  xdr_result = xdr_getprivs_ret;
-	  local = (char *(*)()) get_privs_1_svc;
+	  local = (char *(*)()) get_privs_2_svc;
 	  break;
 
      case INIT:
 	  xdr_argument = xdr_u_int32;
 	  xdr_result = xdr_generic_ret;
-	  local = (char *(*)()) init_1_svc;
+	  local = (char *(*)()) init_2_svc;
 	  break;
 
      case CREATE_PRINCIPAL3:
 	  xdr_argument = xdr_cprinc3_arg;
 	  xdr_result = xdr_generic_ret;
-	  local = (char *(*)()) create_principal3_1_svc;
+	  local = (char *(*)()) create_principal3_2_svc;
 	  break;
 
      case CHPASS_PRINCIPAL3:
 	  xdr_argument = xdr_chpass3_arg;
 	  xdr_result = xdr_generic_ret;
-	  local = (char *(*)()) chpass_principal3_1_svc;
+	  local = (char *(*)()) chpass_principal3_2_svc;
 	  break;
 
      case CHRAND_PRINCIPAL3:
 	  xdr_argument = xdr_chrand3_arg;
 	  xdr_result = xdr_chrand_ret;
-	  local = (char *(*)()) chrand_principal3_1_svc;
+	  local = (char *(*)()) chrand_principal3_2_svc;
 	  break;
 
      case SETKEY_PRINCIPAL3:
 	  xdr_argument = xdr_setkey3_arg;
 	  xdr_result = xdr_generic_ret;
-	  local = (char *(*)()) setkey_principal3_1_svc;
+	  local = (char *(*)()) setkey_principal3_2_svc;
 	  break;
 
      default:
diff --git a/src/kadmin/server/server_stubs.c b/src/kadmin/server/server_stubs.c
index 016288773..e3d6709cf 100644
--- a/src/kadmin/server/server_stubs.c
+++ b/src/kadmin/server/server_stubs.c
@@ -238,7 +238,7 @@ gss_name_to_string(gss_name_t gss_name, gss_buffer_desc *str)
 }
 
 generic_ret *
-create_principal_1_svc(cprinc_arg *arg, struct svc_req *rqstp)
+create_principal_2_svc(cprinc_arg *arg, struct svc_req *rqstp)
 {
     static generic_ret		ret;
     char			*prime_arg;
@@ -316,7 +316,7 @@ create_principal_1_svc(cprinc_arg *arg, struct svc_req *rqstp)
 }
 
 generic_ret *
-create_principal3_1_svc(cprinc3_arg *arg, struct svc_req *rqstp)
+create_principal3_2_svc(cprinc3_arg *arg, struct svc_req *rqstp)
 {
     static generic_ret		ret;
     char			*prime_arg;
@@ -395,7 +395,7 @@ exit_func:
 }
 
 generic_ret *
-delete_principal_1_svc(dprinc_arg *arg, struct svc_req *rqstp)
+delete_principal_2_svc(dprinc_arg *arg, struct svc_req *rqstp)
 {
     static generic_ret		    ret;
     char			    *prime_arg;
@@ -469,7 +469,7 @@ delete_principal_1_svc(dprinc_arg *arg, struct svc_req *rqstp)
 }
 
 generic_ret *
-modify_principal_1_svc(mprinc_arg *arg, struct svc_req *rqstp)
+modify_principal_2_svc(mprinc_arg *arg, struct svc_req *rqstp)
 {
     static generic_ret		    ret;
     char			    *prime_arg;
@@ -544,7 +544,7 @@ exit_func:
 }
 
 generic_ret *
-rename_principal_1_svc(rprinc_arg *arg, struct svc_req *rqstp)
+rename_principal_2_svc(rprinc_arg *arg, struct svc_req *rqstp)
 {
     static generic_ret		ret;
     char			*prime_arg1,
@@ -634,7 +634,7 @@ exit_func:
 }
 
 gprinc_ret *
-get_principal_1_svc(gprinc_arg *arg, struct svc_req *rqstp)
+get_principal_2_svc(gprinc_arg *arg, struct svc_req *rqstp)
 {
     static gprinc_ret		    ret;
     kadm5_principal_ent_t_v1	    e;
@@ -727,7 +727,7 @@ exit_func:
 }
 
 gprincs_ret *
-get_princs_1_svc(gprincs_arg *arg, struct svc_req *rqstp)
+get_princs_2_svc(gprincs_arg *arg, struct svc_req *rqstp)
 {
     static gprincs_ret		    ret;
     char			    *prime_arg;
@@ -803,7 +803,7 @@ exit_func:
 }
 
 generic_ret *
-chpass_principal_1_svc(chpass_arg *arg, struct svc_req *rqstp)
+chpass_principal_2_svc(chpass_arg *arg, struct svc_req *rqstp)
 {
     static generic_ret		    ret;
     char			    *prime_arg;
@@ -884,7 +884,7 @@ exit_func:
 }
 
 generic_ret *
-chpass_principal3_1_svc(chpass3_arg *arg, struct svc_req *rqstp)
+chpass_principal3_2_svc(chpass3_arg *arg, struct svc_req *rqstp)
 {
     static generic_ret		    ret;
     char			    *prime_arg;
@@ -971,7 +971,7 @@ exit_func:
 }
 
 generic_ret *
-setv4key_principal_1_svc(setv4key_arg *arg, struct svc_req *rqstp)
+setv4key_principal_2_svc(setv4key_arg *arg, struct svc_req *rqstp)
 {
     static generic_ret		    ret;
     char			    *prime_arg;
@@ -1049,7 +1049,7 @@ exit_func:
 }
 
 generic_ret *
-setkey_principal_1_svc(setkey_arg *arg, struct svc_req *rqstp)
+setkey_principal_2_svc(setkey_arg *arg, struct svc_req *rqstp)
 {
     static generic_ret		    ret;
     char			    *prime_arg;
@@ -1127,7 +1127,7 @@ exit_func:
 }
 
 generic_ret *
-setkey_principal3_1_svc(setkey3_arg *arg, struct svc_req *rqstp)
+setkey_principal3_2_svc(setkey3_arg *arg, struct svc_req *rqstp)
 {
     static generic_ret		    ret;
     char			    *prime_arg;
@@ -1208,7 +1208,7 @@ exit_func:
 }
 
 chrand_ret *
-chrand_principal_1_svc(chrand_arg *arg, struct svc_req *rqstp)
+chrand_principal_2_svc(chrand_arg *arg, struct svc_req *rqstp)
 {
     static chrand_ret		ret;
     krb5_keyblock		*k;
@@ -1305,7 +1305,7 @@ exit_func:
 }
 
 chrand_ret *
-chrand_principal3_1_svc(chrand3_arg *arg, struct svc_req *rqstp)
+chrand_principal3_2_svc(chrand3_arg *arg, struct svc_req *rqstp)
 {
     static chrand_ret		ret;
     krb5_keyblock		*k;
@@ -1407,7 +1407,7 @@ exit_func:
 }
 
 generic_ret *
-create_policy_1_svc(cpol_arg *arg, struct svc_req *rqstp)
+create_policy_2_svc(cpol_arg *arg, struct svc_req *rqstp)
 {
     static generic_ret		    ret;
     char			    *prime_arg;
@@ -1479,7 +1479,7 @@ exit_func:
 }
 
 generic_ret *
-delete_policy_1_svc(dpol_arg *arg, struct svc_req *rqstp)
+delete_policy_2_svc(dpol_arg *arg, struct svc_req *rqstp)
 {
     static generic_ret		    ret;
     char			    *prime_arg;
@@ -1549,7 +1549,7 @@ exit_func:
 }
 
 generic_ret *
-modify_policy_1_svc(mpol_arg *arg, struct svc_req *rqstp)
+modify_policy_2_svc(mpol_arg *arg, struct svc_req *rqstp)
 {
     static generic_ret		    ret;
     char			    *prime_arg;
@@ -1620,7 +1620,7 @@ exit_func:
 }
 
 gpol_ret * 
-get_policy_1_svc(gpol_arg *arg, struct svc_req *rqstp)
+get_policy_2_svc(gpol_arg *arg, struct svc_req *rqstp)
 {
     static gpol_ret		ret;
     kadm5_ret_t		ret2;
@@ -1725,7 +1725,7 @@ exit_func:
 }
 
 gpols_ret *
-get_pols_1_svc(gpols_arg *arg, struct svc_req *rqstp)
+get_pols_2_svc(gpols_arg *arg, struct svc_req *rqstp)
 {
     static gpols_ret		    ret;
     char			    *prime_arg;
@@ -1798,7 +1798,7 @@ exit_func:
     return &ret;
 }
 
-getprivs_ret * get_privs_1_svc(krb5_ui_4 *arg, struct svc_req *rqstp)
+getprivs_ret * get_privs_2_svc(krb5_ui_4 *arg, struct svc_req *rqstp)
 {
      static getprivs_ret	    ret;
      gss_buffer_desc		    client_name, service_name;
@@ -1856,7 +1856,7 @@ exit_func:
      return &ret;
 }
 
-generic_ret *init_1_svc(krb5_ui_4 *arg, struct svc_req *rqstp)
+generic_ret *init_2_svc(krb5_ui_4 *arg, struct svc_req *rqstp)
 {
      static generic_ret		ret;
      gss_buffer_desc		client_name,
diff --git a/src/lib/kadm5/ChangeLog b/src/lib/kadm5/ChangeLog
index 6941e4bb6..0f910962b 100644
--- a/src/lib/kadm5/ChangeLog
+++ b/src/lib/kadm5/ChangeLog
@@ -4,7 +4,8 @@
 
 	* kadm_rpc.h: Remove krb5_ui_4 casts on RPC defined numbers.
 	Remove argument names from RPC proc declarations.  Reorder
-	declarations, change whitespace.
+	declarations, change whitespace.  Renamed all RPC functions from
+	_1 to _2 to match current program version number.
 
 2005-06-20  Ken Raeburn  <raeburn@mit.edu>
 
diff --git a/src/lib/kadm5/clnt/ChangeLog b/src/lib/kadm5/clnt/ChangeLog
index bf44190ce..9597b5605 100644
--- a/src/lib/kadm5/clnt/ChangeLog
+++ b/src/lib/kadm5/clnt/ChangeLog
@@ -1,3 +1,11 @@
+2005-08-20  Ken Raeburn  <raeburn@mit.edu>
+
+	* libkadm5clnt.exports: Delete RPC functions, and references to
+	adb error table.
+	* client_init.c, client_principal.c, client_rpc.c, clnt_policy.c,
+	clnt_privs.c: Renamed all RPC functions from _1 to _2 to match
+	current program version number.
+
 2005-07-01  Ken Raeburn  <raeburn@mit.edu>
 
 	* err_handle.c (krb5_err_key): Variable deleted.
diff --git a/src/lib/kadm5/clnt/client_init.c b/src/lib/kadm5/clnt/client_init.c
index cf5638e46..248d3a3ce 100644
--- a/src/lib/kadm5/clnt/client_init.c
+++ b/src/lib/kadm5/clnt/client_init.c
@@ -324,11 +324,11 @@ static kadm5_ret_t _kadm5_init_any(char *client_name,
      if (code)
 	  goto error;
 
-     r = init_1(&handle->api_version, handle->clnt);
+     r = init_2(&handle->api_version, handle->clnt);
      if (r == NULL) {
 	  code = KADM5_RPC_ERROR;
 #ifdef DEBUG
-	  clnt_perror(handle->clnt, "init_1 null resp");
+	  clnt_perror(handle->clnt, "init_2 null resp");
 #endif
 	  goto error;
      }
diff --git a/src/lib/kadm5/clnt/client_principal.c b/src/lib/kadm5/clnt/client_principal.c
index eb2248325..9816dd971 100644
--- a/src/lib/kadm5/clnt/client_principal.c
+++ b/src/lib/kadm5/clnt/client_principal.c
@@ -70,7 +70,7 @@ kadm5_create_principal(void *server_handle,
 	 arg.rec.tl_data = NULL;
     }
 	 
-    r = create_principal_1(&arg, handle->clnt);
+    r = create_principal_2(&arg, handle->clnt);
 
     if (handle->api_version == KADM5_API_VERSION_1)
 	 krb5_free_principal(handle->context, arg.rec.mod_name);
@@ -131,7 +131,7 @@ kadm5_create_principal_3(void *server_handle,
 	 arg.rec.tl_data = NULL;
     }
 	 
-    r = create_principal3_1(&arg, handle->clnt);
+    r = create_principal3_2(&arg, handle->clnt);
 
     if (handle->api_version == KADM5_API_VERSION_1)
 	 krb5_free_principal(handle->context, arg.rec.mod_name);
@@ -154,7 +154,7 @@ kadm5_delete_principal(void *server_handle, krb5_principal principal)
 	return EINVAL;
     arg.princ = principal;
     arg.api_version = handle->api_version;
-    r = delete_principal_1(&arg, handle->clnt);
+    r = delete_principal_2(&arg, handle->clnt);
     if(r == NULL)
 	eret();    
     return r->code;
@@ -203,7 +203,7 @@ kadm5_modify_principal(void *server_handle,
     } else
 	 arg.rec.mod_name = NULL;
     
-    r = modify_principal_1(&arg, handle->clnt);
+    r = modify_principal_2(&arg, handle->clnt);
 
     if (handle->api_version == KADM5_API_VERSION_1)
 	 krb5_free_principal(handle->context, arg.rec.mod_name);    
@@ -232,7 +232,7 @@ kadm5_get_principal(void *server_handle,
     else
        arg.mask = mask;
     arg.api_version = handle->api_version;
-    r = get_principal_1(&arg, handle->clnt);
+    r = get_principal_2(&arg, handle->clnt);
     if(r == NULL)
 	eret();
     if (handle->api_version == KADM5_API_VERSION_1) {
@@ -277,7 +277,7 @@ kadm5_get_principals(void *server_handle,
 	return EINVAL;
     arg.exp = exp;
     arg.api_version = handle->api_version;
-    r = get_princs_1(&arg, handle->clnt);
+    r = get_princs_2(&arg, handle->clnt);
     if(r == NULL)
 	eret();
     if(r->code == 0) {
@@ -310,7 +310,7 @@ kadm5_rename_principal(void *server_handle,
     arg.api_version = handle->api_version;
     if (source == NULL || dest == NULL)
 	return EINVAL;
-    r = rename_principal_1(&arg, handle->clnt);
+    r = rename_principal_2(&arg, handle->clnt);
     if(r == NULL)
 	eret();        
     return r->code;
@@ -332,7 +332,7 @@ kadm5_chpass_principal(void *server_handle,
 
     if(princ == NULL)
 	return EINVAL;
-    r = chpass_principal_1(&arg, handle->clnt);
+    r = chpass_principal_2(&arg, handle->clnt);
     if(r == NULL)
 	eret();        
     return r->code;
@@ -359,7 +359,7 @@ kadm5_chpass_principal_3(void *server_handle,
 
     if(princ == NULL)
 	return EINVAL;
-    r = chpass_principal3_1(&arg, handle->clnt);
+    r = chpass_principal3_2(&arg, handle->clnt);
     if(r == NULL)
 	eret();        
     return r->code;
@@ -382,7 +382,7 @@ kadm5_setv4key_principal(void *server_handle,
 
     if(princ == NULL || keyblock == NULL)
 	return EINVAL;
-    r = setv4key_principal_1(&arg, handle->clnt);
+    r = setv4key_principal_2(&arg, handle->clnt);
     if(r == NULL)
 	eret();        
     return r->code;
@@ -407,7 +407,7 @@ kadm5_setkey_principal(void *server_handle,
 
     if(princ == NULL || keyblocks == NULL)
 	return EINVAL;
-    r = setkey_principal_1(&arg, handle->clnt);
+    r = setkey_principal_2(&arg, handle->clnt);
     if(r == NULL)
 	eret();        
     return r->code;
@@ -437,7 +437,7 @@ kadm5_setkey_principal_3(void *server_handle,
 
     if(princ == NULL || keyblocks == NULL)
 	return EINVAL;
-    r = setkey_principal3_1(&arg, handle->clnt);
+    r = setkey_principal3_2(&arg, handle->clnt);
     if(r == NULL)
 	eret();        
     return r->code;
@@ -465,7 +465,7 @@ kadm5_randkey_principal_3(void *server_handle,
 
     if(princ == NULL)
 	return EINVAL;
-    r = chrand_principal3_1(&arg, handle->clnt);
+    r = chrand_principal3_2(&arg, handle->clnt);
     if(r == NULL)
 	eret();
     if (handle->api_version == KADM5_API_VERSION_1) {
@@ -518,7 +518,7 @@ kadm5_randkey_principal(void *server_handle,
 
     if(princ == NULL)
 	return EINVAL;
-    r = chrand_principal_1(&arg, handle->clnt);
+    r = chrand_principal_2(&arg, handle->clnt);
     if(r == NULL)
 	eret();
     if (handle->api_version == KADM5_API_VERSION_1) {
diff --git a/src/lib/kadm5/clnt/client_rpc.c b/src/lib/kadm5/clnt/client_rpc.c
index 4e3b68a7f..768d8265f 100644
--- a/src/lib/kadm5/clnt/client_rpc.c
+++ b/src/lib/kadm5/clnt/client_rpc.c
@@ -10,7 +10,7 @@
 static struct timeval TIMEOUT = { 25, 0 };
 
 generic_ret *
-create_principal_1(argp, clnt)
+create_principal_2(argp, clnt)
 	cprinc_arg *argp;
 	CLIENT *clnt;
 {
@@ -24,7 +24,7 @@ create_principal_1(argp, clnt)
 }
 
 generic_ret *
-create_principal3_1(argp, clnt)
+create_principal3_2(argp, clnt)
 	cprinc3_arg *argp;
 	CLIENT *clnt;
 {
@@ -38,7 +38,7 @@ create_principal3_1(argp, clnt)
 }
 
 generic_ret *
-delete_principal_1(argp, clnt)
+delete_principal_2(argp, clnt)
 	dprinc_arg *argp;
 	CLIENT *clnt;
 {
@@ -52,7 +52,7 @@ delete_principal_1(argp, clnt)
 }
 
 generic_ret *
-modify_principal_1(argp, clnt)
+modify_principal_2(argp, clnt)
 	mprinc_arg *argp;
 	CLIENT *clnt;
 {
@@ -66,7 +66,7 @@ modify_principal_1(argp, clnt)
 }
 
 generic_ret *
-rename_principal_1(argp, clnt)
+rename_principal_2(argp, clnt)
 	rprinc_arg *argp;
 	CLIENT *clnt;
 {
@@ -80,7 +80,7 @@ rename_principal_1(argp, clnt)
 }
 
 gprinc_ret *
-get_principal_1(argp, clnt)
+get_principal_2(argp, clnt)
 	gprinc_arg *argp;
 	CLIENT *clnt;
 {
@@ -94,7 +94,7 @@ get_principal_1(argp, clnt)
 }
 
 gprincs_ret *
-get_princs_1(argp, clnt)
+get_princs_2(argp, clnt)
 	gprincs_arg *argp;
 	CLIENT *clnt;
 {
@@ -109,7 +109,7 @@ get_princs_1(argp, clnt)
 }
 
 generic_ret *
-chpass_principal_1(argp, clnt)
+chpass_principal_2(argp, clnt)
 	chpass_arg *argp;
 	CLIENT *clnt;
 {
@@ -123,7 +123,7 @@ chpass_principal_1(argp, clnt)
 }
 
 generic_ret *
-chpass_principal3_1(argp, clnt)
+chpass_principal3_2(argp, clnt)
 	chpass3_arg *argp;
 	CLIENT *clnt;
 {
@@ -137,7 +137,7 @@ chpass_principal3_1(argp, clnt)
 }
 
 generic_ret *
-setv4key_principal_1(argp, clnt)
+setv4key_principal_2(argp, clnt)
 	setv4key_arg *argp;
 	CLIENT *clnt;
 {
@@ -151,7 +151,7 @@ setv4key_principal_1(argp, clnt)
 }
 
 generic_ret *
-setkey_principal_1(argp, clnt)
+setkey_principal_2(argp, clnt)
 	setkey_arg *argp;
 	CLIENT *clnt;
 {
@@ -165,7 +165,7 @@ setkey_principal_1(argp, clnt)
 }
 
 generic_ret *
-setkey_principal3_1(argp, clnt)
+setkey_principal3_2(argp, clnt)
 	setkey3_arg *argp;
 	CLIENT *clnt;
 {
@@ -179,7 +179,7 @@ setkey_principal3_1(argp, clnt)
 }
 
 chrand_ret *
-chrand_principal_1(argp, clnt)
+chrand_principal_2(argp, clnt)
 	chrand_arg *argp;
 	CLIENT *clnt;
 {
@@ -193,7 +193,7 @@ chrand_principal_1(argp, clnt)
 }
 
 chrand_ret *
-chrand_principal3_1(argp, clnt)
+chrand_principal3_2(argp, clnt)
 	chrand3_arg *argp;
 	CLIENT *clnt;
 {
@@ -207,7 +207,7 @@ chrand_principal3_1(argp, clnt)
 }
 
 generic_ret *
-create_policy_1(argp, clnt)
+create_policy_2(argp, clnt)
 	cpol_arg *argp;
 	CLIENT *clnt;
 {
@@ -221,7 +221,7 @@ create_policy_1(argp, clnt)
 }
 
 generic_ret *
-delete_policy_1(argp, clnt)
+delete_policy_2(argp, clnt)
 	dpol_arg *argp;
 	CLIENT *clnt;
 {
@@ -235,7 +235,7 @@ delete_policy_1(argp, clnt)
 }
 
 generic_ret *
-modify_policy_1(argp, clnt)
+modify_policy_2(argp, clnt)
 	mpol_arg *argp;
 	CLIENT *clnt;
 {
@@ -249,7 +249,7 @@ modify_policy_1(argp, clnt)
 }
 
 gpol_ret *
-get_policy_1(argp, clnt)
+get_policy_2(argp, clnt)
 	gpol_arg *argp;
 	CLIENT *clnt;
 {
@@ -263,7 +263,7 @@ get_policy_1(argp, clnt)
 }
 
 gpols_ret *
-get_pols_1(argp, clnt)
+get_pols_2(argp, clnt)
 	gpols_arg *argp;
 	CLIENT *clnt;
 {
@@ -277,7 +277,7 @@ get_pols_1(argp, clnt)
 	return (&res);
 }
 
-getprivs_ret *get_privs_1(argp, clnt)
+getprivs_ret *get_privs_2(argp, clnt)
    void *argp;
    CLIENT *clnt;
 {
@@ -292,7 +292,7 @@ getprivs_ret *get_privs_1(argp, clnt)
 }
 
 generic_ret *
-init_1(argp, clnt)
+init_2(argp, clnt)
    void *argp;
    CLIENT *clnt;
 {
diff --git a/src/lib/kadm5/clnt/clnt_policy.c b/src/lib/kadm5/clnt/clnt_policy.c
index 55bef4af7..f9fdee40a 100644
--- a/src/lib/kadm5/clnt/clnt_policy.c
+++ b/src/lib/kadm5/clnt/clnt_policy.c
@@ -32,7 +32,7 @@ kadm5_create_policy(void *server_handle,
     arg.mask = mask;
     arg.api_version = handle->api_version;
     memcpy(&arg.rec, policy, sizeof(kadm5_policy_ent_rec));
-    r = create_policy_1(&arg, handle->clnt);
+    r = create_policy_2(&arg, handle->clnt);
     if(r == NULL)
 	return KADM5_RPC_ERROR;    
 
@@ -58,7 +58,7 @@ kadm5_delete_policy(void *server_handle, char *name)
     arg.name = name;
     arg.api_version = handle->api_version;
 
-    r = delete_policy_1(&arg, handle->clnt);
+    r = delete_policy_2(&arg, handle->clnt);
     if(r == NULL)
 	return KADM5_RPC_ERROR;    
 
@@ -86,7 +86,7 @@ kadm5_modify_policy(void *server_handle,
     arg.api_version = handle->api_version;
 
     memcpy(&arg.rec, policy, sizeof(kadm5_policy_ent_rec));
-    r = modify_policy_1(&arg, handle->clnt);
+    r = modify_policy_2(&arg, handle->clnt);
     if(r == NULL)
 	return KADM5_RPC_ERROR;    
 
@@ -112,7 +112,7 @@ kadm5_get_policy(void *server_handle, char *name, kadm5_policy_ent_t ent)
     if(name == NULL)
 	return EINVAL;
 	
-    r = get_policy_1(&arg, handle->clnt);
+    r = get_policy_2(&arg, handle->clnt);
     if(r == NULL)
 	return KADM5_RPC_ERROR;
     if (handle->api_version == KADM5_API_VERSION_1) {
@@ -153,7 +153,7 @@ kadm5_get_policies(void *server_handle,
 	return EINVAL;
     arg.exp = exp;
     arg.api_version = handle->api_version;
-    r = get_pols_1(&arg, handle->clnt);
+    r = get_pols_2(&arg, handle->clnt);
     if(r == NULL)
 	return KADM5_RPC_ERROR;
     if(r->code == 0) {
diff --git a/src/lib/kadm5/clnt/clnt_privs.c b/src/lib/kadm5/clnt/clnt_privs.c
index 497feea5d..e594080a8 100644
--- a/src/lib/kadm5/clnt/clnt_privs.c
+++ b/src/lib/kadm5/clnt/clnt_privs.c
@@ -5,6 +5,11 @@
  * $Source$
  * 
  * $Log$
+ * Revision 1.4  2005/08/20 09:14:59  raeburn
+ * Rename all RPC functions from _1 to _2 to match current program version number;
+ * likewise _1_svc to _2_svc in the kadmin server.  Delete the RPC functions from
+ * the libkadm5clnt export list.
+ *
  * Revision 1.3  2005/06/21 01:35:56  raeburn
  * Novell Database Abstraction Layer merge.
  * Will probably break things.
@@ -81,7 +86,7 @@ kadm5_ret_t kadm5_get_privs(void *server_handle, long *privs)
      getprivs_ret *r;
      kadm5_server_handle_t handle = server_handle;
 
-     r = get_privs_1(&handle->api_version, handle->clnt);
+     r = get_privs_2(&handle->api_version, handle->clnt);
      if (r == NULL)
 	  return KADM5_RPC_ERROR;
      else if (r->code == KADM5_OK)
diff --git a/src/lib/kadm5/clnt/libkadm5clnt.exports b/src/lib/kadm5/clnt/libkadm5clnt.exports
index 85f4b615a..0548bef15 100644
--- a/src/lib/kadm5/clnt/libkadm5clnt.exports
+++ b/src/lib/kadm5/clnt/libkadm5clnt.exports
@@ -1,24 +1,7 @@
 _kadm5_check_handle
 _kadm5_chpass_principal_util
-chpass_principal3_1
-chpass_principal_1
-chrand_principal3_1
-chrand_principal_1
-create_policy_1
-create_principal3_1
-create_principal_1
-delete_policy_1
-delete_principal_1
-et_adb_error_table
 et_ovk_error_table
 et_ovku_error_table
-get_policy_1
-get_pols_1
-get_principal_1
-get_princs_1
-get_privs_1
-init_1
-initialize_adb_error_table
 initialize_ovk_error_table
 initialize_ovku_error_table
 kadm5_chpass_principal
@@ -78,8 +61,6 @@ krb5_klog_syslog
 krb5_read_realm_params
 krb5_string_to_flags
 krb5_string_to_keysalts
-modify_policy_1
-modify_principal_1
 ovsec_kadm_chpass_principal
 ovsec_kadm_chpass_principal_util
 ovsec_kadm_create_policy
@@ -103,10 +84,6 @@ ovsec_kadm_modify_policy
 ovsec_kadm_modify_principal
 ovsec_kadm_randkey_principal
 ovsec_kadm_rename_principal
-rename_principal_1
-setkey_principal3_1
-setkey_principal_1
-setv4key_principal_1
 xdr_chpass3_arg
 xdr_chpass_arg
 xdr_chrand3_arg
diff --git a/src/lib/kadm5/kadm_rpc.h b/src/lib/kadm5/kadm_rpc.h
index b1658c37f..3d11f0916 100644
--- a/src/lib/kadm5/kadm_rpc.h
+++ b/src/lib/kadm5/kadm_rpc.h
@@ -209,68 +209,68 @@ typedef struct getprivs_ret getprivs_ret;
 #define KADM 2112
 #define KADMVERS 2
 #define CREATE_PRINCIPAL 1
-extern  generic_ret * create_principal_1(cprinc_arg *, CLIENT *);
-extern  generic_ret * create_principal_1_svc(cprinc_arg *, struct svc_req *);
+extern  generic_ret * create_principal_2(cprinc_arg *, CLIENT *);
+extern  generic_ret * create_principal_2_svc(cprinc_arg *, struct svc_req *);
 #define DELETE_PRINCIPAL 2
-extern  generic_ret * delete_principal_1(dprinc_arg *, CLIENT *);
-extern  generic_ret * delete_principal_1_svc(dprinc_arg *, struct svc_req *);
+extern  generic_ret * delete_principal_2(dprinc_arg *, CLIENT *);
+extern  generic_ret * delete_principal_2_svc(dprinc_arg *, struct svc_req *);
 #define MODIFY_PRINCIPAL 3
-extern  generic_ret * modify_principal_1(mprinc_arg *, CLIENT *);
-extern  generic_ret * modify_principal_1_svc(mprinc_arg *, struct svc_req *);
+extern  generic_ret * modify_principal_2(mprinc_arg *, CLIENT *);
+extern  generic_ret * modify_principal_2_svc(mprinc_arg *, struct svc_req *);
 #define RENAME_PRINCIPAL 4
-extern  generic_ret * rename_principal_1(rprinc_arg *, CLIENT *);
-extern  generic_ret * rename_principal_1_svc(rprinc_arg *, struct svc_req *);
+extern  generic_ret * rename_principal_2(rprinc_arg *, CLIENT *);
+extern  generic_ret * rename_principal_2_svc(rprinc_arg *, struct svc_req *);
 #define GET_PRINCIPAL 5
-extern  gprinc_ret * get_principal_1(gprinc_arg *, CLIENT *);
-extern  gprinc_ret * get_principal_1_svc(gprinc_arg *, struct svc_req *);
+extern  gprinc_ret * get_principal_2(gprinc_arg *, CLIENT *);
+extern  gprinc_ret * get_principal_2_svc(gprinc_arg *, struct svc_req *);
 #define CHPASS_PRINCIPAL 6
-extern  generic_ret * chpass_principal_1(chpass_arg *, CLIENT *);
-extern  generic_ret * chpass_principal_1_svc(chpass_arg *, struct svc_req *);
+extern  generic_ret * chpass_principal_2(chpass_arg *, CLIENT *);
+extern  generic_ret * chpass_principal_2_svc(chpass_arg *, struct svc_req *);
 #define CHRAND_PRINCIPAL 7
-extern  chrand_ret * chrand_principal_1(chrand_arg *, CLIENT *);
-extern  chrand_ret * chrand_principal_1_svc(chrand_arg *, struct svc_req *);
+extern  chrand_ret * chrand_principal_2(chrand_arg *, CLIENT *);
+extern  chrand_ret * chrand_principal_2_svc(chrand_arg *, struct svc_req *);
 #define CREATE_POLICY 8
-extern  generic_ret * create_policy_1(cpol_arg *, CLIENT *);
-extern  generic_ret * create_policy_1_svc(cpol_arg *, struct svc_req *);
+extern  generic_ret * create_policy_2(cpol_arg *, CLIENT *);
+extern  generic_ret * create_policy_2_svc(cpol_arg *, struct svc_req *);
 #define DELETE_POLICY 9
-extern  generic_ret * delete_policy_1(dpol_arg *, CLIENT *);
-extern  generic_ret * delete_policy_1_svc(dpol_arg *, struct svc_req *);
+extern  generic_ret * delete_policy_2(dpol_arg *, CLIENT *);
+extern  generic_ret * delete_policy_2_svc(dpol_arg *, struct svc_req *);
 #define MODIFY_POLICY 10
-extern  generic_ret * modify_policy_1(mpol_arg *, CLIENT *);
-extern  generic_ret * modify_policy_1_svc(mpol_arg *, struct svc_req *);
+extern  generic_ret * modify_policy_2(mpol_arg *, CLIENT *);
+extern  generic_ret * modify_policy_2_svc(mpol_arg *, struct svc_req *);
 #define GET_POLICY 11
-extern  gpol_ret * get_policy_1(gpol_arg *, CLIENT *);
-extern  gpol_ret * get_policy_1_svc(gpol_arg *, struct svc_req *);
+extern  gpol_ret * get_policy_2(gpol_arg *, CLIENT *);
+extern  gpol_ret * get_policy_2_svc(gpol_arg *, struct svc_req *);
 #define GET_PRIVS 12
-extern  getprivs_ret * get_privs_1(void *, CLIENT *);
-extern  getprivs_ret * get_privs_1_svc(krb5_ui_4 *, struct svc_req *);
+extern  getprivs_ret * get_privs_2(void *, CLIENT *);
+extern  getprivs_ret * get_privs_2_svc(krb5_ui_4 *, struct svc_req *);
 #define INIT 13
-extern  generic_ret * init_1(void *, CLIENT *);
-extern  generic_ret * init_1_svc(krb5_ui_4 *, struct svc_req *);
+extern  generic_ret * init_2(void *, CLIENT *);
+extern  generic_ret * init_2_svc(krb5_ui_4 *, struct svc_req *);
 #define GET_PRINCS 14
-extern  gprincs_ret * get_princs_1(gprincs_arg *, CLIENT *);
-extern  gprincs_ret * get_princs_1_svc(gprincs_arg *, struct svc_req *);
+extern  gprincs_ret * get_princs_2(gprincs_arg *, CLIENT *);
+extern  gprincs_ret * get_princs_2_svc(gprincs_arg *, struct svc_req *);
 #define GET_POLS 15
-extern  gpols_ret * get_pols_1(gpols_arg *, CLIENT *);
-extern  gpols_ret * get_pols_1_svc(gpols_arg *, struct svc_req *);
+extern  gpols_ret * get_pols_2(gpols_arg *, CLIENT *);
+extern  gpols_ret * get_pols_2_svc(gpols_arg *, struct svc_req *);
 #define SETKEY_PRINCIPAL 16
-extern  generic_ret * setkey_principal_1(setkey_arg *, CLIENT *);
-extern  generic_ret * setkey_principal_1_svc(setkey_arg *, struct svc_req *);
+extern  generic_ret * setkey_principal_2(setkey_arg *, CLIENT *);
+extern  generic_ret * setkey_principal_2_svc(setkey_arg *, struct svc_req *);
 #define SETV4KEY_PRINCIPAL 17
-extern  generic_ret * setv4key_principal_1(setv4key_arg *, CLIENT *);
-extern  generic_ret * setv4key_principal_1_svc(setv4key_arg *, struct svc_req *);
+extern  generic_ret * setv4key_principal_2(setv4key_arg *, CLIENT *);
+extern  generic_ret * setv4key_principal_2_svc(setv4key_arg *, struct svc_req *);
 #define CREATE_PRINCIPAL3 18
-extern  generic_ret * create_principal3_1(cprinc3_arg *, CLIENT *);
-extern  generic_ret * create_principal3_1_svc(cprinc3_arg *, struct svc_req *);
+extern  generic_ret * create_principal3_2(cprinc3_arg *, CLIENT *);
+extern  generic_ret * create_principal3_2_svc(cprinc3_arg *, struct svc_req *);
 #define CHPASS_PRINCIPAL3 19
-extern  generic_ret * chpass_principal3_1(chpass3_arg *, CLIENT *);
-extern  generic_ret * chpass_principal3_1_svc(chpass3_arg *, struct svc_req *);
+extern  generic_ret * chpass_principal3_2(chpass3_arg *, CLIENT *);
+extern  generic_ret * chpass_principal3_2_svc(chpass3_arg *, struct svc_req *);
 #define CHRAND_PRINCIPAL3 20
-extern  chrand_ret * chrand_principal3_1(chrand3_arg *, CLIENT *);
-extern  chrand_ret * chrand_principal3_1_svc(chrand3_arg *, struct svc_req *);
+extern  chrand_ret * chrand_principal3_2(chrand3_arg *, CLIENT *);
+extern  chrand_ret * chrand_principal3_2_svc(chrand3_arg *, struct svc_req *);
 #define SETKEY_PRINCIPAL3 21
-extern  generic_ret * setkey_principal3_1(setkey3_arg *, CLIENT *);
-extern  generic_ret * setkey_principal3_1_svc(setkey3_arg *, struct svc_req *);
+extern  generic_ret * setkey_principal3_2(setkey3_arg *, CLIENT *);
+extern  generic_ret * setkey_principal3_2_svc(setkey3_arg *, struct svc_req *);
 
 extern bool_t xdr_cprinc_arg ();
 extern bool_t xdr_cprinc3_arg ();