107 lines
3.1 KiB
Diff
107 lines
3.1 KiB
Diff
|
Index: nss/lib/sysinit/nsssysinit.c
|
||
|
|
===================================================================
|
||
|
|
--- nss.orig/lib/sysinit/nsssysinit.c
|
||
|
|
+++ nss/lib/sysinit/nsssysinit.c
|
||
|
|
@@ -36,41 +36,9 @@ testdir(char *dir)
|
||
|
|
return S_ISDIR(buf.st_mode);
|
||
|
|
}
|
||
|
|
|
||
|
|
-/**
|
||
|
|
- * Append given @dir to @path and creates the directory with mode @mode.
|
||
|
|
- * Returns 0 if successful, -1 otherwise.
|
||
|
|
- * Assumes that the allocation for @path has sufficient space for @dir
|
||
|
|
- * to be added.
|
||
|
|
- */
|
||
|
|
-static int
|
||
|
|
-appendDirAndCreate(char *path, char *dir, mode_t mode)
|
||
|
|
-{
|
||
|
|
- PORT_Strcat(path, dir);
|
||
|
|
- if (!testdir(path)) {
|
||
|
|
- if (mkdir(path, mode)) {
|
||
|
|
- return -1;
|
||
|
|
- }
|
||
|
|
- }
|
||
|
|
- return 0;
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
-#define XDG_NSS_USER_PATH1 "/.local"
|
||
|
|
-#define XDG_NSS_USER_PATH2 "/share"
|
||
|
|
-#define XDG_NSS_USER_PATH3 "/pki"
|
||
|
|
-
|
||
|
|
#define NSS_USER_PATH1 "/.pki"
|
||
|
|
#define NSS_USER_PATH2 "/nssdb"
|
||
|
|
-
|
||
|
|
-/**
|
||
|
|
- * Return the path to user's NSS database.
|
||
|
|
- * We search in the following dirs in order:
|
||
|
|
- * (1) $HOME/.pki/nssdb;
|
||
|
|
- * (2) $XDG_DATA_HOME/pki/nssdb if XDG_DATA_HOME is set;
|
||
|
|
- * (3) $HOME/.local/share/pki/nssdb (default XDG_DATA_HOME value).
|
||
|
|
- * If (1) does not exist, then the returned dir will be set to either
|
||
|
|
- * (2) or (3), depending if XDG_DATA_HOME is set.
|
||
|
|
- */
|
||
|
|
-char *
|
||
|
|
+static char *
|
||
|
|
getUserDB(void)
|
||
|
|
{
|
||
|
|
char *userdir = PR_GetEnvSecure("HOME");
|
||
|
|
@@ -81,47 +49,22 @@ getUserDB(void)
|
||
|
|
}
|
||
|
|
|
||
|
|
nssdir = PORT_Alloc(strlen(userdir) + sizeof(NSS_USER_PATH1) + sizeof(NSS_USER_PATH2));
|
||
|
|
+ if (nssdir == NULL) {
|
||
|
|
+ return NULL;
|
||
|
|
+ }
|
||
|
|
PORT_Strcpy(nssdir, userdir);
|
||
|
|
- PORT_Strcat(nssdir, NSS_USER_PATH1 NSS_USER_PATH2);
|
||
|
|
- if (testdir(nssdir)) {
|
||
|
|
- /* $HOME/.pki/nssdb exists */
|
||
|
|
- return nssdir;
|
||
|
|
- } else {
|
||
|
|
- /* either $HOME/.pki or $HOME/.pki/nssdb does not exist */
|
||
|
|
+ /* verify it exists */
|
||
|
|
+ if (!testdir(nssdir)) {
|
||
|
|
PORT_Free(nssdir);
|
||
|
|
- }
|
||
|
|
- int size = 0;
|
||
|
|
- char *xdguserdatadir = PR_GetEnvSecure("XDG_DATA_HOME");
|
||
|
|
- if (xdguserdatadir) {
|
||
|
|
- size = strlen(xdguserdatadir);
|
||
|
|
- } else {
|
||
|
|
- size = strlen(userdir) + sizeof(XDG_NSS_USER_PATH1) + sizeof(XDG_NSS_USER_PATH2);
|
||
|
|
- }
|
||
|
|
- size += sizeof(XDG_NSS_USER_PATH3) + sizeof(NSS_USER_PATH2);
|
||
|
|
-
|
||
|
|
- nssdir = PORT_Alloc(size);
|
||
|
|
- if (nssdir == NULL) {
|
||
|
|
return NULL;
|
||
|
|
}
|
||
|
|
-
|
||
|
|
- if (xdguserdatadir) {
|
||
|
|
- PORT_Strcpy(nssdir, xdguserdatadir);
|
||
|
|
- if (!testdir(nssdir)) {
|
||
|
|
- PORT_Free(nssdir);
|
||
|
|
- return NULL;
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
- } else {
|
||
|
|
- PORT_Strcpy(nssdir, userdir);
|
||
|
|
- if (appendDirAndCreate(nssdir, XDG_NSS_USER_PATH1, 0755) ||
|
||
|
|
- appendDirAndCreate(nssdir, XDG_NSS_USER_PATH2, 0755)) {
|
||
|
|
- PORT_Free(nssdir);
|
||
|
|
- return NULL;
|
||
|
|
- }
|
||
|
|
+ PORT_Strcat(nssdir, NSS_USER_PATH1);
|
||
|
|
+ if (!testdir(nssdir) && mkdir(nssdir, 0760)) {
|
||
|
|
+ PORT_Free(nssdir);
|
||
|
|
+ return NULL;
|
||
|
|
}
|
||
|
|
- /* ${XDG_DATA_HOME:-$HOME/.local/share}/pki/nssdb */
|
||
|
|
- if (appendDirAndCreate(nssdir, XDG_NSS_USER_PATH3, 0760) ||
|
||
|
|
- appendDirAndCreate(nssdir, NSS_USER_PATH2, 0760)) {
|
||
|
|
+ PORT_Strcat(nssdir, NSS_USER_PATH2);
|
||
|
|
+ if (!testdir(nssdir) && mkdir(nssdir, 0760)) {
|
||
|
|
PORT_Free(nssdir);
|
||
|
|
return NULL;
|
||
|
|
}
|