147 lines
4.0 KiB
Diff
147 lines
4.0 KiB
Diff
diff --git a/utils/gssd/krb5_util.c b/utils/gssd/krb5_util.c
|
|
index a1c43d2..8c73748 100644
|
|
--- a/utils/gssd/krb5_util.c
|
|
+++ b/utils/gssd/krb5_util.c
|
|
@@ -484,7 +484,7 @@ gssd_get_single_krb5_cred(krb5_context context,
|
|
if (ccache)
|
|
krb5_cc_close(context, ccache);
|
|
krb5_free_cred_contents(context, &my_creds);
|
|
- free(k5err);
|
|
+ krb5_free_string(context, k5err);
|
|
return (code);
|
|
}
|
|
|
|
@@ -723,7 +723,7 @@ gssd_search_krb5_keytab(krb5_context context, krb5_keytab kt,
|
|
"we failed to unparse principal name: %s\n",
|
|
k5err);
|
|
k5_free_kt_entry(context, kte);
|
|
- free(k5err);
|
|
+ krb5_free_string(context, k5err);
|
|
k5err = NULL;
|
|
continue;
|
|
}
|
|
@@ -770,7 +770,7 @@ gssd_search_krb5_keytab(krb5_context context, krb5_keytab kt,
|
|
if (retval < 0)
|
|
retval = 0;
|
|
out:
|
|
- free(k5err);
|
|
+ krb5_free_string(context, k5err);
|
|
return retval;
|
|
}
|
|
|
|
@@ -799,7 +799,7 @@ find_keytab_entry(krb5_context context, krb5_keytab kt,
|
|
int tried_all = 0, tried_default = 0, tried_upper = 0;
|
|
krb5_principal princ;
|
|
const char *notsetstr = "not set";
|
|
- char *adhostoverride;
|
|
+ char *adhostoverride = NULL;
|
|
|
|
|
|
/* Get full target hostname */
|
|
@@ -827,7 +827,6 @@ find_keytab_entry(krb5_context context, krb5_keytab kt,
|
|
adhostoverride);
|
|
/* No overflow: Windows cannot handle strings longer than 19 chars */
|
|
strcpy(myhostad, adhostoverride);
|
|
- free(adhostoverride);
|
|
} else {
|
|
strcpy(myhostad, myhostname);
|
|
for (i = 0; myhostad[i] != 0; ++i) {
|
|
@@ -836,6 +835,8 @@ find_keytab_entry(krb5_context context, krb5_keytab kt,
|
|
myhostad[i] = '$';
|
|
myhostad[i+1] = 0;
|
|
}
|
|
+ if (adhostoverride)
|
|
+ krb5_free_string(context, adhostoverride);
|
|
|
|
if (!srchost) {
|
|
retval = get_full_hostname(myhostname, myhostname, sizeof(myhostname));
|
|
@@ -926,7 +927,7 @@ find_keytab_entry(krb5_context context, krb5_keytab kt,
|
|
k5err = gssd_k5_err_msg(context, code);
|
|
printerr(1, "%s while building principal for '%s'\n",
|
|
k5err, spn);
|
|
- free(k5err);
|
|
+ krb5_free_string(context, k5err);
|
|
k5err = NULL;
|
|
continue;
|
|
}
|
|
@@ -936,7 +937,7 @@ find_keytab_entry(krb5_context context, krb5_keytab kt,
|
|
k5err = gssd_k5_err_msg(context, code);
|
|
printerr(3, "%s while getting keytab entry for '%s'\n",
|
|
k5err, spn);
|
|
- free(k5err);
|
|
+ krb5_free_string(context, k5err);
|
|
k5err = NULL;
|
|
/*
|
|
* We tried the active directory machine account
|
|
@@ -985,7 +986,7 @@ out:
|
|
k5_free_default_realm(context, default_realm);
|
|
if (realmnames)
|
|
krb5_free_host_realm(context, realmnames);
|
|
- free(k5err);
|
|
+ krb5_free_string(context, k5err);
|
|
return retval;
|
|
}
|
|
|
|
@@ -1248,7 +1249,7 @@ gssd_destroy_krb5_machine_creds(void)
|
|
printerr(0, "WARNING: %s while resolving credential "
|
|
"cache '%s' for destruction\n", k5err,
|
|
ple->ccname);
|
|
- free(k5err);
|
|
+ krb5_free_string(context, k5err);
|
|
k5err = NULL;
|
|
continue;
|
|
}
|
|
@@ -1257,13 +1258,13 @@ gssd_destroy_krb5_machine_creds(void)
|
|
k5err = gssd_k5_err_msg(context, code);
|
|
printerr(0, "WARNING: %s while destroying credential "
|
|
"cache '%s'\n", k5err, ple->ccname);
|
|
- free(k5err);
|
|
+ krb5_free_string(context, k5err);
|
|
k5err = NULL;
|
|
}
|
|
}
|
|
krb5_free_context(context);
|
|
out:
|
|
- free(k5err);
|
|
+ krb5_free_string(context, k5err);
|
|
}
|
|
|
|
/*
|
|
@@ -1346,7 +1347,7 @@ out_free_kt:
|
|
out_free_context:
|
|
krb5_free_context(context);
|
|
out:
|
|
- free(k5err);
|
|
+ krb5_free_string(context, k5err);
|
|
return retval;
|
|
}
|
|
|
|
diff --git a/utils/mount/mount.c b/utils/mount/mount.c
|
|
index 2be3dc2..b98f9e0 100644
|
|
--- a/utils/mount/mount.c
|
|
+++ b/utils/mount/mount.c
|
|
@@ -393,11 +393,6 @@ int main(int argc, char *argv[])
|
|
if(!strncmp(progname, "umount", strlen("umount")))
|
|
exit(nfsumount(argc, argv));
|
|
|
|
- if ((argc < 3)) {
|
|
- mount_usage();
|
|
- exit(EX_USAGE);
|
|
- }
|
|
-
|
|
mount_config_init(progname);
|
|
|
|
while ((c = getopt_long(argc, argv, "rvVwfno:hs",
|
|
@@ -437,6 +432,11 @@ int main(int argc, char *argv[])
|
|
}
|
|
}
|
|
|
|
+ if ((argc < 3)) {
|
|
+ mount_usage();
|
|
+ exit(EX_USAGE);
|
|
+ }
|
|
+
|
|
/*
|
|
* Extra non-option words at the end are bogus...
|
|
*/
|