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

3 files changed, 64 insertions, 59 deletions

diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog
index d0903c49fe..e461f74cab 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 d2139a69ce..b01d957949 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 0162887735..e3d6709cf5 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,