oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Fix warning in lib/gssapi/test_acquire_cred.c

Browse Source
This commit is contained in:
Nicolas Williams
2018-12-28 12:05:20 -06:00
committed by Jeffrey Altman
parent 7d5f955b51
commit 6f7c0e53c8
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/gssapi/test_acquire_cred.c
View File

@@ -126,7 +126,7 @@ static gss_cred_id_t
acquire_cred_service(const char *service, acquire_cred_service(const char *service,
gss_OID nametype, gss_OID nametype,
gss_OID_set oidset, gss_OID_set oidset,
int flags) gss_cred_usage_t usage)
{ {
OM_uint32 major_status, minor_status; OM_uint32 major_status, minor_status;
gss_cred_id_t cred_handle; gss_cred_id_t cred_handle;
@@ -150,7 +150,7 @@ acquire_cred_service(const char *service,
name, name,
0, 0,
oidset, oidset,
flags, usage,
&cred_handle, &cred_handle,
NULL, NULL,
&time_rec); &time_rec);
@@ -211,8 +211,8 @@ main(int argc, char **argv)
gss_cred_id_t cred; gss_cred_id_t cred;
gss_name_t target = GSS_C_NO_NAME; gss_name_t target = GSS_C_NO_NAME;
int i, optidx = 0; int i, optidx = 0;
OM_uint32 flag; gss_cred_usage_t cred_usage = GSS_C_BOTH;
gss_OID type; gss_OID type = GSS_C_NT_HOSTBASED_SERVICE;
setprogname(argv[0]); setprogname(argv[0]);
if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optidx)) if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optidx))
@@ -234,15 +234,14 @@ main(int argc, char **argv)
if (acquire_type) { if (acquire_type) {
if (strcasecmp(acquire_type, "both") == 0) if (strcasecmp(acquire_type, "both") == 0)
flag = GSS_C_BOTH; cred_usage = GSS_C_BOTH;
else if (strcasecmp(acquire_type, "accept") == 0) else if (strcasecmp(acquire_type, "accept") == 0)
flag = GSS_C_ACCEPT; cred_usage = GSS_C_ACCEPT;
else if (strcasecmp(acquire_type, "initiate") == 0) else if (strcasecmp(acquire_type, "initiate") == 0)
flag = GSS_C_INITIATE; cred_usage = GSS_C_INITIATE;
else else
errx(1, "unknown type %s", acquire_type); errx(1, "unknown type %s", acquire_type);
} else }
flag = GSS_C_ACCEPT;
if (name_type) { if (name_type) {
if (strcasecmp("hostbased-service", name_type) == 0) if (strcasecmp("hostbased-service", name_type) == 0)
@@ -251,8 +250,7 @@ main(int argc, char **argv)
type = GSS_C_NT_USER_NAME; type = GSS_C_NT_USER_NAME;
else else
errx(1, "unknown name type %s", name_type); errx(1, "unknown name type %s", name_type);
} else }
type = GSS_C_NT_HOSTBASED_SERVICE;
if (ccache) { if (ccache) {
maj_stat = gss_krb5_ccache_name(&min_stat, ccache, NULL); maj_stat = gss_krb5_ccache_name(&min_stat, ccache, NULL);
@@ -289,7 +287,7 @@ main(int argc, char **argv)
for (i = 0; i < num_loops; i++) { for (i = 0; i < num_loops; i++) {
cred = acquire_cred_service(acquire_name, type, oidset, flag); cred = acquire_cred_service(acquire_name, type, oidset, cred_usage);
if (enctype) { if (enctype) {
int32_t enctypelist = enctype; int32_t enctypelist = enctype;