summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornelson%bolyard.com <devnull@localhost>2006-10-01 05:53:20 +0000
committernelson%bolyard.com <devnull@localhost>2006-10-01 05:53:20 +0000
commit2ee721031c6995efb1b626fbf1dd2742099da7c2 (patch)
tree112fd1d70be6edb79992e343bfde76ab4ec89c42
parenta8f8c7c28289539fa2ce7e88278ec5e66b9f28b3 (diff)
downloadnss-hg-2ee721031c6995efb1b626fbf1dd2742099da7c2.tar.gz
Bug 354384. Fix some (not all) of the reference leaks in vfyserv.
Also, improve usage message. r=alexei,julien
-rw-r--r--security/nss/cmd/vfyserv/vfyserv.c3
-rw-r--r--security/nss/cmd/vfyserv/vfyutil.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/security/nss/cmd/vfyserv/vfyserv.c b/security/nss/cmd/vfyserv/vfyserv.c
index 3de3ea2e7..b55db11c5 100644
--- a/security/nss/cmd/vfyserv/vfyserv.c
+++ b/security/nss/cmd/vfyserv/vfyserv.c
@@ -86,7 +86,8 @@ static void
Usage(const char *progName)
{
fprintf(stderr,
- "Usage: %s [-p port] [-c connections] [-C cipher(s)] hostname\n",
+"Usage: %s [-p port] [-c connections] [-d dbdir] [-w password]\n"
+"\t\t[-C cipher(s)] hostname\n",
progName);
exit(1);
}
diff --git a/security/nss/cmd/vfyserv/vfyutil.c b/security/nss/cmd/vfyserv/vfyutil.c
index 4741a22ad..038f0194a 100644
--- a/security/nss/cmd/vfyserv/vfyutil.c
+++ b/security/nss/cmd/vfyserv/vfyutil.c
@@ -291,10 +291,10 @@ myGetClientAuthData(void *arg,
break;
}
secStatus = SECFailure;
- break;
}
- CERT_FreeNicknames(names);
+ CERT_DestroyCertificate(cert);
} /* for loop */
+ CERT_FreeNicknames(names);
}
}