svn rev #21708: trunk/src/kadmin/server/
ghudson@MIT.EDU
ghudson at MIT.EDU
Tue Jan 6 15:24:10 EST 2009
http://src.mit.edu/fisheye/changelog/krb5/?cs=21708
Commit By: ghudson
Log Message:
In kadmin, remove a bunch of checks for handle being NULL (some old,
some introduced by the last rev) when it is known from context that
handle is not NULL.
Changed Files:
U trunk/src/kadmin/server/server_stubs.c
Modified: trunk/src/kadmin/server/server_stubs.c
===================================================================
--- trunk/src/kadmin/server/server_stubs.c 2009-01-06 16:01:56 UTC (rev 21707)
+++ trunk/src/kadmin/server/server_stubs.c 2009-01-06 20:24:09 UTC (rev 21708)
@@ -340,14 +340,14 @@
arg->passwd);
if( ret.code != 0 )
- errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
+ errmsg = krb5_get_error_message(handle->context, ret.code);
log_done("kadm5_create_principal", prime_arg,
errmsg ? errmsg : "success",
&client_name, &service_name, rqstp);
if (errmsg != NULL)
- krb5_free_error_message(handle ? handle->context : NULL, errmsg);
+ krb5_free_error_message(handle->context, errmsg);
}
free_server_handle(handle);
free(prime_arg);
@@ -405,14 +405,14 @@
arg->ks_tuple,
arg->passwd);
if( ret.code != 0 )
- errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
+ errmsg = krb5_get_error_message(handle->context, ret.code);
log_done("kadm5_create_principal", prime_arg,
errmsg ? errmsg : "success",
&client_name, &service_name, rqstp);
if (errmsg != NULL)
- krb5_free_error_message(handle ? handle->context : NULL, errmsg);
+ krb5_free_error_message(handle->context, errmsg);
}
free_server_handle(handle);
free(prime_arg);
@@ -463,14 +463,14 @@
} else {
ret.code = kadm5_delete_principal((void *)handle, arg->princ);
if( ret.code != 0 )
- errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
+ errmsg = krb5_get_error_message(handle->context, ret.code);
log_done("kadm5_delete_principal", prime_arg,
errmsg ? errmsg : "success",
&client_name, &service_name, rqstp);
if (errmsg != NULL)
- krb5_free_error_message(handle ? handle->context : NULL, errmsg);
+ krb5_free_error_message(handle->context, errmsg);
}
free(prime_arg);
@@ -525,14 +525,14 @@
ret.code = kadm5_modify_principal((void *)handle, &arg->rec,
arg->mask);
if( ret.code != 0 )
- errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
+ errmsg = krb5_get_error_message(handle->context, ret.code);
log_done("kadm5_modify_principal", prime_arg,
errmsg ? errmsg : "success",
&client_name, &service_name, rqstp);
if (errmsg != NULL)
- krb5_free_error_message(handle ? handle->context : NULL, errmsg);
+ krb5_free_error_message(handle->context, errmsg);
}
free_server_handle(handle);
free(prime_arg);
@@ -615,7 +615,7 @@
ret.code = kadm5_rename_principal((void *)handle, arg->src,
arg->dest);
if( ret.code != 0 )
- errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
+ errmsg = krb5_get_error_message(handle->context, ret.code);
/* okay to cast lengths to int because trunc_name limits max value */
krb5_klog_syslog(LOG_NOTICE,
@@ -630,7 +630,7 @@
inet_ntoa(rqstp->rq_xprt->xp_raddr.sin_addr));
if (errmsg != NULL)
- krb5_free_error_message(handle ? handle->context : NULL, errmsg);
+ krb5_free_error_message(handle->context, errmsg);
}
free_server_handle(handle);
@@ -702,13 +702,13 @@
}
if( ret.code != 0 )
- errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
+ errmsg = krb5_get_error_message(handle->context, ret.code);
log_done(funcname, prime_arg, errmsg ? errmsg : "success",
&client_name, &service_name, rqstp);
if (errmsg != NULL)
- krb5_free_error_message(handle ? handle->context : NULL, errmsg);
+ krb5_free_error_message(handle->context, errmsg);
}
free_server_handle(handle);
free(prime_arg);
@@ -762,14 +762,14 @@
arg->exp, &ret.princs,
&ret.count);
if( ret.code != 0 )
- errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
+ errmsg = krb5_get_error_message(handle->context, ret.code);
log_done("kadm5_get_principals", prime_arg,
errmsg ? errmsg : "success",
&client_name, &service_name, rqstp);
if (errmsg != NULL)
- krb5_free_error_message(handle ? handle->context : NULL, errmsg);
+ krb5_free_error_message(handle->context, errmsg);
}
free_server_handle(handle);
@@ -827,14 +827,14 @@
if (ret.code != KADM5_AUTH_CHANGEPW) {
if (ret.code != 0)
- errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
+ errmsg = krb5_get_error_message(handle->context, ret.code);
log_done("kadm5_chpass_principal", prime_arg,
errmsg ? errmsg : "success",
&client_name, &service_name, rqstp);
if (errmsg != NULL)
- krb5_free_error_message(handle ? handle->context : NULL, errmsg);
+ krb5_free_error_message(handle->context, errmsg);
}
free_server_handle(handle);
@@ -899,14 +899,14 @@
if(ret.code != KADM5_AUTH_CHANGEPW) {
if( ret.code != 0 )
- errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
+ errmsg = krb5_get_error_message(handle->context, ret.code);
log_done("kadm5_chpass_principal", prime_arg,
errmsg ? errmsg : "success",
&client_name, &service_name, rqstp);
if (errmsg != NULL)
- krb5_free_error_message(handle ? handle->context : NULL, errmsg);
+ krb5_free_error_message(handle->context, errmsg);
}
free_server_handle(handle);
@@ -962,14 +962,14 @@
if(ret.code != KADM5_AUTH_SETKEY) {
if( ret.code != 0 )
- errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
+ errmsg = krb5_get_error_message(handle->context, ret.code);
log_done("kadm5_setv4key_principal", prime_arg,
errmsg ? errmsg : "success",
&client_name, &service_name, rqstp);
if (errmsg != NULL)
- krb5_free_error_message(handle ? handle->context : NULL, errmsg);
+ krb5_free_error_message(handle->context, errmsg);
}
free_server_handle(handle);
@@ -1025,14 +1025,14 @@
if(ret.code != KADM5_AUTH_SETKEY) {
if( ret.code != 0 )
- errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
+ errmsg = krb5_get_error_message(handle->context, ret.code);
log_done("kadm5_setkey_principal", prime_arg,
errmsg ? errmsg : "success",
&client_name, &service_name, rqstp);
if (errmsg != NULL)
- krb5_free_error_message(handle ? handle->context : NULL, errmsg);
+ krb5_free_error_message(handle->context, errmsg);
}
free_server_handle(handle);
@@ -1091,14 +1091,14 @@
if(ret.code != KADM5_AUTH_SETKEY) {
if( ret.code != 0 )
- errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
+ errmsg = krb5_get_error_message(handle->context, ret.code);
log_done("kadm5_setkey_principal", prime_arg,
errmsg ? errmsg : "success",
&client_name, &service_name, rqstp);
if (errmsg != NULL)
- krb5_free_error_message(handle ? handle->context : NULL, errmsg);
+ krb5_free_error_message(handle->context, errmsg);
}
free_server_handle(handle);
@@ -1174,13 +1174,13 @@
if(ret.code != KADM5_AUTH_CHANGEPW) {
if( ret.code != 0 )
- errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
+ errmsg = krb5_get_error_message(handle->context, ret.code);
log_done(funcname, prime_arg, errmsg ? errmsg : "success",
&client_name, &service_name, rqstp);
if (errmsg != NULL)
- krb5_free_error_message(handle ? handle->context : NULL, errmsg);
+ krb5_free_error_message(handle->context, errmsg);
}
free_server_handle(handle);
free(prime_arg);
@@ -1260,13 +1260,13 @@
if(ret.code != KADM5_AUTH_CHANGEPW) {
if( ret.code != 0 )
- errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
+ errmsg = krb5_get_error_message(handle->context, ret.code);
log_done(funcname, prime_arg, errmsg ? errmsg : "success",
&client_name, &service_name, rqstp);
if (errmsg != NULL)
- krb5_free_error_message(handle ? handle->context : NULL, errmsg);
+ krb5_free_error_message(handle->context, errmsg);
}
free_server_handle(handle);
free(prime_arg);
@@ -1316,7 +1316,7 @@
ret.code = kadm5_create_policy((void *)handle, &arg->rec,
arg->mask);
if( ret.code != 0 )
- errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
+ errmsg = krb5_get_error_message(handle->context, ret.code);
log_done("kadm5_create_policy",
((prime_arg == NULL) ? "(null)" : prime_arg),
@@ -1324,7 +1324,7 @@
&client_name, &service_name, rqstp);
if (errmsg != NULL)
- krb5_free_error_message(handle ? handle->context : NULL, errmsg);
+ krb5_free_error_message(handle->context, errmsg);
}
free_server_handle(handle);
gss_release_buffer(&minor_stat, &client_name);
@@ -1371,7 +1371,7 @@
} else {
ret.code = kadm5_delete_policy((void *)handle, arg->name);
if( ret.code != 0 )
- errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
+ errmsg = krb5_get_error_message(handle->context, ret.code);
log_done("kadm5_delete_policy",
((prime_arg == NULL) ? "(null)" : prime_arg),
@@ -1379,7 +1379,7 @@
&client_name, &service_name, rqstp);
if (errmsg != NULL)
- krb5_free_error_message(handle ? handle->context : NULL, errmsg);
+ krb5_free_error_message(handle->context, errmsg);
}
free_server_handle(handle);
gss_release_buffer(&minor_stat, &client_name);
@@ -1427,7 +1427,7 @@
ret.code = kadm5_modify_policy((void *)handle, &arg->rec,
arg->mask);
if( ret.code != 0 )
- errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
+ errmsg = krb5_get_error_message(handle->context, ret.code);
log_done("kadm5_modify_policy",
((prime_arg == NULL) ? "(null)" : prime_arg),
@@ -1435,7 +1435,7 @@
&client_name, &service_name, rqstp);
if (errmsg != NULL)
- krb5_free_error_message(handle ? handle->context : NULL, errmsg);
+ krb5_free_error_message(handle->context, errmsg);
}
free_server_handle(handle);
gss_release_buffer(&minor_stat, &client_name);
@@ -1513,14 +1513,14 @@
}
if( ret.code != 0 )
- errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
+ errmsg = krb5_get_error_message(handle->context, ret.code);
log_done(funcname,
((prime_arg == NULL) ? "(null)" : prime_arg),
errmsg ? errmsg : "success",
&client_name, &service_name, rqstp);
if (errmsg != NULL)
- krb5_free_error_message(handle ? handle->context : NULL, errmsg);
+ krb5_free_error_message(handle->context, errmsg);
} else {
log_unauth(funcname, prime_arg,
@@ -1576,14 +1576,14 @@
arg->exp, &ret.pols,
&ret.count);
if( ret.code != 0 )
- errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
+ errmsg = krb5_get_error_message(handle->context, ret.code);
log_done("kadm5_get_policies", prime_arg,
errmsg ? errmsg : "success",
&client_name, &service_name, rqstp);
if (errmsg != NULL)
- krb5_free_error_message(handle ? handle->context : NULL, errmsg);
+ krb5_free_error_message(handle->context, errmsg);
}
free_server_handle(handle);
gss_release_buffer(&minor_stat, &client_name);
@@ -1619,14 +1619,14 @@
ret.code = kadm5_get_privs((void *)handle, &ret.privs);
if( ret.code != 0 )
- errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
+ errmsg = krb5_get_error_message(handle->context, ret.code);
log_done("kadm5_get_privs", client_name.value,
errmsg ? errmsg : "success",
&client_name, &service_name, rqstp);
if (errmsg != NULL)
- krb5_free_error_message(handle ? handle->context : NULL, errmsg);
+ krb5_free_error_message(handle->context, errmsg);
free_server_handle(handle);
gss_release_buffer(&minor_stat, &client_name);
@@ -1680,7 +1680,7 @@
inet_ntoa(rqstp->rq_xprt->xp_raddr.sin_addr),
rqstp->rq_cred.oa_flavor);
if (errmsg != NULL)
- krb5_free_error_message(handle ? handle->context : NULL, errmsg);
+ krb5_free_error_message(NULL, errmsg);
gss_release_buffer(&minor_stat, &client_name);
gss_release_buffer(&minor_stat, &service_name);
More information about the cvs-krb5
mailing list