From 4e43ea1d0a9170ab207a8efd3c81a4bb15d19036 Mon Sep 17 00:00:00 2001
From: "wtchang%redhat.com" <wtchang%redhat.com>
Date: Fri, 12 May 2006 20:33:47 +0000
Subject: [PATCH] Bugzilla Bug 336937: removed a test that is guaranteed to be
 true.  The patch is contributed by Jon Smirl <jonsmirl@yahoo.com>.
 r=nelsonb,wtc.

---
 security/nss/lib/softoken/pcertdb.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/security/nss/lib/softoken/pcertdb.c b/security/nss/lib/softoken/pcertdb.c
index be2083e28c84..976849504ee0 100644
--- a/security/nss/lib/softoken/pcertdb.c
+++ b/security/nss/lib/softoken/pcertdb.c
@@ -37,7 +37,7 @@
 /*
  * Permanent Certificate database handling code 
  *
- * $Id: pcertdb.c,v 1.61 2006/04/27 18:35:24 alexei.volkov.bugs%sun.com Exp $
+ * $Id: pcertdb.c,v 1.62 2006/05/12 20:33:47 wtchang%redhat.com Exp $
  */
 #include "prtime.h"
 
@@ -2799,8 +2799,7 @@ AddNicknameToSubject(NSSLOWCERTCertDBHandle *dbhandle,
 	goto loser;
     }
     
-    entry->nickname = (nickname) ? 
-			PORT_ArenaStrdup(entry->common.arena, nickname) : NULL;
+    entry->nickname = PORT_ArenaStrdup(entry->common.arena, nickname);
     
     if ( entry->nickname == NULL ) {
 	goto loser;