summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/kadm5/ChangeLog3
-rw-r--r--src/lib/kadm5/clnt/ChangeLog8
-rw-r--r--src/lib/kadm5/clnt/client_init.c4
-rw-r--r--src/lib/kadm5/clnt/client_principal.c28
-rw-r--r--src/lib/kadm5/clnt/client_rpc.c42
-rw-r--r--src/lib/kadm5/clnt/clnt_policy.c10
-rw-r--r--src/lib/kadm5/clnt/clnt_privs.c7
-rw-r--r--src/lib/kadm5/clnt/libkadm5clnt.exports23
-rw-r--r--src/lib/kadm5/kadm_rpc.h84
9 files changed, 100 insertions, 109 deletions
diff --git a/src/lib/kadm5/ChangeLog b/src/lib/kadm5/ChangeLog
index 6941e4bb63..0f910962b2 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 bf44190cec..9597b56052 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 cf5638e467..248d3a3cec 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 eb22483252..9816dd9718 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 4e3b68a7f4..768d8265fc 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 55bef4af76..f9fdee40ac 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 497feea5d4..e594080a8a 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 85f4b615ad..0548bef15f 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 b1658c37f8..3d11f09168 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 ();