summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Yee <ny.nathan.yee@gmail.com>2015-08-18 15:20:37 -0700
committerJacobo Aragunde Pérez <jaragunde@igalia.com>2015-08-19 07:50:16 +0000
commit7a736718069f8d88743ffc6f51b7f59558db54e9 (patch)
tree61315f4379b3cb87cd1850ac213dbf908807136c
parent8be5ec39051cc0eb70ec9882a45a95c661f7398f (diff)
Revert strdup to PL_strdup in nss_secutil.cfeature/gsoc15-online-update
Change-Id: Iec4ae361831f9002cf4317c0bd4c2d365c20282a Reviewed-on: https://gerrit.libreoffice.org/17847 Reviewed-by: Jacobo Aragunde Pérez <jaragunde@igalia.com> Tested-by: Jacobo Aragunde Pérez <jaragunde@igalia.com>
-rw-r--r--onlineupdate/Executable_mar.mk5
-rw-r--r--onlineupdate/source/libmar/sign/nss_secutil.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/onlineupdate/Executable_mar.mk b/onlineupdate/Executable_mar.mk
index 7a42b3ca437d..6ac1af1fa407 100644
--- a/onlineupdate/Executable_mar.mk
+++ b/onlineupdate/Executable_mar.mk
@@ -24,7 +24,10 @@ $(eval $(call gb_Executable_add_libs,mar,\
))
endif
-$(eval $(call gb_Executable_use_externals,mar,nss3))
+$(eval $(call gb_Executable_use_externals,mar,\
+ nss3 \
+ plc4 \
+))
$(eval $(call gb_Executable_add_cobjects,mar,\
onlineupdate/source/libmar/src/mar_create \
diff --git a/onlineupdate/source/libmar/sign/nss_secutil.c b/onlineupdate/source/libmar/sign/nss_secutil.c
index ac8954ceb953..1f89cbf4c8b7 100644
--- a/onlineupdate/source/libmar/sign/nss_secutil.c
+++ b/onlineupdate/source/libmar/sign/nss_secutil.c
@@ -214,7 +214,7 @@ SECU_GetModulePassword(PK11SlotInfo *slot, PRBool retry, void *arg)
*/
pw = SECU_FilePasswd(slot, retry, pwdata->data);
pwdata->source = PW_PLAINTEXT;
- pwdata->data = strdup(pw);
+ pwdata->data = PL_strdup(pw);
/* it's already been dup'ed */
return pw;
case PW_EXTERNAL:
@@ -228,7 +228,7 @@ SECU_GetModulePassword(PK11SlotInfo *slot, PRBool retry, void *arg)
}
/* Fall Through */
case PW_PLAINTEXT:
- return strdup(pwdata->data);
+ return PL_strdup(pwdata->data);
default:
break;
}