summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2008-09-24 11:26:28 -0400
committerSimo Sorce <ssorce@redhat.com>2008-09-24 11:26:28 -0400
commita49fa9e1f24daa3390d0813193a6cce42f8c0835 (patch)
treebe5ebe62b5ac255e3ca5758a14c177c83df6b235
parent03a57334bdf1c7ee0e058301b0fc4503b757100a (diff)
parent4d8a255c062d943695ae35c467ec8f2b0f7fa4b7 (diff)
downloadfreeipa-a49fa9e1f24daa3390d0813193a6cce42f8c0835.tar.gz
freeipa-a49fa9e1f24daa3390d0813193a6cce42f8c0835.tar.xz
freeipa-a49fa9e1f24daa3390d0813193a6cce42f8c0835.zip
Merge branch 'master' of ssh://simo@git.fedorahosted.org/git/freeipa into ipa-1-2
-rw-r--r--ipa-client/ipa-getkeytab.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipa-client/ipa-getkeytab.c b/ipa-client/ipa-getkeytab.c
index f153094d8..fbeb547a8 100644
--- a/ipa-client/ipa-getkeytab.c
+++ b/ipa-client/ipa-getkeytab.c
@@ -756,7 +756,7 @@ int main(int argc, char *argv[])
if (!password) {
exit(2);
}
- } else if (strchr(enctypes_string, ':')) {
+ } else if (enctypes_string && strchr(enctypes_string, ':')) {
if (!quiet) {
fprintf(stderr, "Warning: salt types are not honored with randomized passwords (see opt. -P)\n");
}