* client_rpc.c: Insure pointer argument type is same as passed

        onto xdr functions. (arguments specified to *3_1 functions were
        for the *_1 functions).

	* client_init.c, client_principal.c, clnt_policy.c: Cleanup unused
        variables and assignments in conditionals.

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

diff --git a/src/lib/kadm5/clnt/ChangeLog b/src/lib/kadm5/clnt/ChangeLog
index afb88b0102d63148c9a2590b425e3d6d7e63b162..a5491814654b12582a98b5a2218839ac1588ddf0 100644 (file)
--- a/src/lib/kadm5/clnt/ChangeLog
+++ b/src/lib/kadm5/clnt/ChangeLog
@@ -1,3 +1,12 @@
+Sun Feb 18 17:32:53 2001  Ezra Peisach  <epeisach@mit.edu>
+
+       * client_rpc.c: Insure pointer argument type is same as passed
+        onto xdr functions. (arguments specified to *3_1 functions were
+        for the *_1 functions).
+
+       * client_init.c, client_principal.c, clnt_policy.c: Cleanup unused
+        variables and assignments in conditionals.
+
 2000-10-17  Ezra Peisach  <epeisach@mit.edu>
 
        * clnt_chpass_util.c (kadm5_chpass_principal_util): Change msg_len

diff --git a/src/lib/kadm5/clnt/client_init.c b/src/lib/kadm5/clnt/client_init.c
index 94bbb58c7f8e6ef30b79c81c8f9c5be1ced7da29..2a895c014d292135cbc7381c43a13c5f0313f2ff 100644 (file)
--- a/src/lib/kadm5/clnt/client_init.c
+++ b/src/lib/kadm5/clnt/client_init.c
@@ -148,11 +148,10 @@ static kadm5_ret_t _kadm5_init_any(char *client_name,
 {
      struct sockaddr_in addr;
      struct hostent *hp;
-     struct servent *srv;
      int fd;
      int i;
 
-     char full_service_name[BUFSIZ], host[MAXHOSTNAMELEN], *ccname_orig;
+     char full_service_name[BUFSIZ], *ccname_orig;
      const char *c_ccname_orig; 
      char *realm;
      krb5_creds        creds;
@@ -161,7 +160,10 @@ static kadm5_ret_t _kadm5_init_any(char *client_name,
      
      OM_uint32 gssstat, minor_stat;
      gss_buffer_desc input_name;
-     gss_name_t gss_target, gss_client;
+     gss_name_t gss_client;
+#ifndef INIT_TEST
+     gss_name_t gss_target;
+#endif
      gss_cred_id_t gss_client_creds = GSS_C_NO_CREDENTIAL;
 
      kadm5_server_handle_t handle;
@@ -430,7 +432,7 @@ static kadm5_ret_t _kadm5_init_any(char *client_name,
      handle->lhandle->clnt = handle->clnt;
 
      /* now that handle->clnt is set, we can check the handle */
-     if (code = _kadm5_check_handle((void *) handle))
+     if ((code = _kadm5_check_handle((void *) handle)))
          goto error;
 
      /*

diff --git a/src/lib/kadm5/clnt/client_principal.c b/src/lib/kadm5/clnt/client_principal.c
index 18ac45238236b842ef79c7c671e4b5a4830d35f1..e364d2df4929c6b371ee0d76546c1483a45a8604 100644 (file)
--- a/src/lib/kadm5/clnt/client_principal.c
+++ b/src/lib/kadm5/clnt/client_principal.c
@@ -214,7 +214,6 @@ kadm5_get_principal(void *server_handle,
     gprinc_arg arg;
     gprinc_ret *r;
     kadm5_server_handle_t handle = server_handle;
-    krb5_error_code retval;
 
     CHECK_HANDLE(server_handle);
 
@@ -259,7 +258,6 @@ kadm5_get_principals(void *server_handle,
     gprincs_arg        arg;
     gprincs_ret        *r;
     kadm5_server_handle_t handle = server_handle;
-    krb5_error_code retval;
 
     CHECK_HANDLE(server_handle);
 
@@ -438,7 +436,6 @@ kadm5_randkey_principal_3(void *server_handle,
 {
     chrand3_arg                arg;
     chrand_ret         *r;
-    krb5_keyblock      new;
     kadm5_server_handle_t handle = server_handle;
     int                        i, ret;
 
@@ -490,7 +487,6 @@ kadm5_randkey_principal(void *server_handle,
 {
     chrand_arg         arg;
     chrand_ret         *r;
-    krb5_keyblock      new;
     kadm5_server_handle_t handle = server_handle;
     int                        i, ret;
 

diff --git a/src/lib/kadm5/clnt/client_rpc.c b/src/lib/kadm5/clnt/client_rpc.c
index 8f309bb78e79ea7d35493f752c91201550381c37..4e3b68a7f4f9fb78de08c7c919cfe6c1316e5b91 100644 (file)
--- a/src/lib/kadm5/clnt/client_rpc.c
+++ b/src/lib/kadm5/clnt/client_rpc.c
@@ -25,7 +25,7 @@ create_principal_1(argp, clnt)
 
 generic_ret *
 create_principal3_1(argp, clnt)
-       cprinc_arg *argp;
+       cprinc3_arg *argp;
        CLIENT *clnt;
 {
        static generic_ret res;
@@ -95,7 +95,7 @@ get_principal_1(argp, clnt)
 
 gprincs_ret *
 get_princs_1(argp, clnt)
-       gprinc_arg *argp;
+       gprincs_arg *argp;
        CLIENT *clnt;
 {
        static gprincs_ret res;
@@ -124,7 +124,7 @@ chpass_principal_1(argp, clnt)
 
 generic_ret *
 chpass_principal3_1(argp, clnt)
-       chpass_arg *argp;
+       chpass3_arg *argp;
        CLIENT *clnt;
 {
        static generic_ret res;
@@ -166,7 +166,7 @@ setkey_principal_1(argp, clnt)
 
 generic_ret *
 setkey_principal3_1(argp, clnt)
-       setkey_arg *argp;
+       setkey3_arg *argp;
        CLIENT *clnt;
 {
        static generic_ret res;
@@ -194,7 +194,7 @@ chrand_principal_1(argp, clnt)
 
 chrand_ret *
 chrand_principal3_1(argp, clnt)
-       chrand_arg *argp;
+       chrand3_arg *argp;
        CLIENT *clnt;
 {
        static chrand_ret res;
@@ -264,7 +264,7 @@ get_policy_1(argp, clnt)
 
 gpols_ret *
 get_pols_1(argp, clnt)
-       gprinc_arg *argp;
+       gpols_arg *argp;
        CLIENT *clnt;
 {
        static gpols_ret res;

diff --git a/src/lib/kadm5/clnt/clnt_policy.c b/src/lib/kadm5/clnt/clnt_policy.c
index aa9ad0821b8774541425d01b9f8997a8df5c863f..ee229216aa428263a2e77c76561dafd9d8a417f1 100644 (file)
--- a/src/lib/kadm5/clnt/clnt_policy.c
+++ b/src/lib/kadm5/clnt/clnt_policy.c
@@ -128,7 +128,6 @@ kadm5_get_policies(void *server_handle,
     gpols_arg  arg;
     gpols_ret  *r;
     kadm5_server_handle_t handle = server_handle;
-    krb5_error_code retval;
 
     CHECK_HANDLE(server_handle);