Bug 148194 - "Remove session-logout code from security module" ((Av1-19T) <nsNSSComponent.cpp>) [r=kaie]

This commit is contained in:
Serge Gautherie 2008-08-20 00:17:20 -05:00
parent e89115ea32
commit 3c8395dc50

View File

@ -1957,7 +1957,6 @@ nsNSSComponent::RandomUpdate(void *entropy, PRInt32 bufLen)
#define PROFILE_CHANGE_TEARDOWN_VETO_TOPIC "profile-change-teardown-veto"
#define PROFILE_BEFORE_CHANGE_TOPIC "profile-before-change"
#define PROFILE_AFTER_CHANGE_TOPIC "profile-after-change"
#define SESSION_LOGOUT_TOPIC "session-logout"
NS_IMETHODIMP
nsNSSComponent::Observe(nsISupports *aSubject, const char *aTopic,
@ -2044,12 +2043,6 @@ nsNSSComponent::Observe(nsISupports *aSubject, const char *aTopic,
}
}
}
else if ((nsCRT::strcmp(aTopic, SESSION_LOGOUT_TOPIC) == 0) && mNSSInitialized) {
nsNSSShutDownPreventionLock locker;
PK11_LogoutAll();
SSL_ClearSessionCache();
LogoutAuthenticatedPK11();
}
else if (nsCRT::strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID) == 0) {
nsNSSShutDownPreventionLock locker;
PRBool clearSessionCache = PR_FALSE;
@ -2185,7 +2178,6 @@ nsNSSComponent::RegisterObservers()
observerService->AddObserver(this, PROFILE_CHANGE_TEARDOWN_VETO_TOPIC, PR_FALSE);
observerService->AddObserver(this, PROFILE_BEFORE_CHANGE_TOPIC, PR_FALSE);
observerService->AddObserver(this, PROFILE_AFTER_CHANGE_TOPIC, PR_FALSE);
observerService->AddObserver(this, SESSION_LOGOUT_TOPIC, PR_FALSE);
observerService->AddObserver(this, PROFILE_CHANGE_NET_TEARDOWN_TOPIC, PR_FALSE);
observerService->AddObserver(this, PROFILE_CHANGE_NET_RESTORE_TOPIC, PR_FALSE);
}