summaryrefslogtreecommitdiffstats
path: root/pinst.c
diff options
context:
space:
mode:
authorKamil Dudka <kdudka@redhat.com>2009-05-27 16:24:24 +0200
committerRob Crittenden <rcritten@redhat.com>2009-05-29 12:55:44 -0400
commitf9810df89bfd45d0b69f50b092ecc3593c8bade3 (patch)
tree37045e42bbce3afca522620d96760e9bc19612ef /pinst.c
parent5ad2940670b06e0d9ed2db03ea362385d73e86cb (diff)
downloadpemnss-f9810df89bfd45d0b69f50b092ecc3593c8bade3.zip
pemnss-f9810df89bfd45d0b69f50b092ecc3593c8bade3.tar.gz
pemnss-f9810df89bfd45d0b69f50b092ecc3593c8bade3.tar.xz
Do not bypass initialization if module arguments are omitted.
501058
Diffstat (limited to 'pinst.c')
-rw-r--r--pinst.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/pinst.c b/pinst.c
index 17ffff0..0a80803 100644
--- a/pinst.c
+++ b/pinst.c
@@ -415,14 +415,11 @@ pem_Initialize
CK_C_INITIALIZE_ARGS_PTR modArgs =
NSSCKFWInstance_GetInitArgs(fwInstance);
- if (!modArgs) {
+ if (!modArgs || !modArgs->LibraryParameters) {
goto done;
}
- if (modArgs->LibraryParameters) {
- modparms = (unsigned char *) modArgs->LibraryParameters;
- }
- if (modparms)
- plog("Initialized with %s\n", modparms);
+ modparms = (unsigned char *) modArgs->LibraryParameters;
+ plog("Initialized with %s\n", modparms);
/*
* The initialization string format is a space-delimited file of