090d4afcaf0482dfa3f5eaec25d915f1d4a9fa9e max Thu Jun 15 13:34:32 2017 -0700 Cleanup of hgSession to make the distinction between the login server and local server clearer in the code. Renaming and moving two functions from wikiLink to hdb, as at least one is not necessarily wikiLink-related and it's good to keep them together. Also adding a warning to hgSession.c (probably useless). refs #19632 and also see related tickets there. diff --git src/hg/inc/wikiLink.h src/hg/inc/wikiLink.h index c8687bd..678aea4 100644 --- src/hg/inc/wikiLink.h +++ src/hg/inc/wikiLink.h @@ -1,24 +1,24 @@ /* wikiLink - interoperate with a wiki site (share user identities). */ /* Copyright (C) 2014 The Regents of the University of California * See README in this or parent directory for licensing information. */ #ifndef WIKILINK_H #define WIKILINK_H -/* hg.conf wiki parameters -- wikiLink is disabled if any are undefined. */ +/* hg.conf wiki parameters -- logins are disabled if any are undefined. */ #define CFG_WIKI_HOST "wiki.host" #define CFG_WIKI_USER_NAME_COOKIE "wiki.userNameCookie" #define CFG_WIKI_LOGGED_IN_COOKIE "wiki.loggedInCookie" #define CFG_WIKI_SESSION_COOKIE "wiki.sessionCookie" /* hg.conf login system parameter -- using non-wiki login system (hgLogin) if defined */ #define CFG_LOGIN_SYSTEM_NAME "login.systemName" #define CFG_LOGIN_USE_HTTPS "login.https" #define CFG_LOGIN_COOKIE_SALT "login.cookieSalt" #define CFG_LOGIN_ACCEPT_ANY_ID "login.acceptAnyId" #define CFG_LOGIN_ACCEPT_IDX "login.acceptIdx" #define CFG_LOGIN_BASICAUTH "login.basicAuth" #define CFG_LOGIN_RELATIVE "login.relativeLink" /* hg.conf central db parameters */