Attachment 612778 Details for Bug 857373 – patch

[patch] patch

jvcelak-20120914-moznss-ignore-certdb-sql-prefix-when-checking-existence.patch (text/plain), 1.10 KB, created by Jan Vcelak on 2012-09-14 09:00:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Vcelak

Created: 2012-09-14 09:00:18 UTC

Size: 1.10 KB

patch

obsolete

>From 4bffbbcacc6786487097eb40a69e191ca3815c44 Mon Sep 17 00:00:00 2001
>From: Jan Vcelak <jvcelak@redhat.com>
>Date: Fri, 14 Sep 2012 10:37:06 +0200
>Subject: [PATCH] MozNSS: ignore certdb 'sql:' prefix when checking existence
>
>If the certdb uses newer SQL format, the certificate directory name
>starts with 'sql:'. This prefix has to be ignored when checking
>certificate directory existence.
>---
> libraries/libldap/tls_m.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
>diff --git a/libraries/libldap/tls_m.c b/libraries/libldap/tls_m.c
>index 1422ce2..d2ce94e 100644
>--- a/libraries/libldap/tls_m.c
>+++ b/libraries/libldap/tls_m.c
>@@ -1562,7 +1562,13 @@ tlsm_get_certdb_prefix( const char *certdir, char **realcertdir, char **prefix )
> 		return;
> 	}
> 
>-	prc = PR_GetFileInfo( certdir, &prfi );
>+	/* ignore sql: prefix if provided */
>+	if ( strncmp( "sql:", certdir, 4 ) == 0 ) {
>+		prc = PR_GetFileInfo( certdir + 4, &prfi );
>+	} else {
>+		prc = PR_GetFileInfo( certdir, &prfi );
>+	}
>+
> 	/* if certdir exists (file or directory) then it cannot specify a prefix */
> 	if ( prc == PR_SUCCESS ) {
> 		return;
>-- 
>1.7.11.4
>

Actions: View | Diff

Attachments on bug 857373: 612778