Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 97e214a
There is no no need to pass the path to the dbdir to the function that checks for this db access rights.
Baptiste Daroussin committed 6 years ago
commit 97e214aab7bc5d5e5164472c2c8a1c3069199670
parent cba344f
3 files changed +6 -14
modified libpkg/pkgdb.c
@@ -811,7 +811,7 @@ pkgdb_is_insecure_mode(int dbdirfd, const char *path, bool install_as_user)
}



int
- 
pkgdb_check_access(unsigned mode, const char* dbdir, const char *dbname)
+ 
pkgdb_check_access(unsigned mode, const char *dbname)

{

	const char *dbpath = ".";

	int retval;
@@ -854,10 +854,6 @@ pkgdb_check_access(unsigned mode, const char* dbdir, const char *dbname)
				goto out;

		}

		retval = faccessat(dbdirfd, dbpath, W_OK, AT_EACCESS);
- 
		if (retval != 0 && errno == ENOENT) {
- 
			mkdirs(dbdir);
- 
			retval = faccessat(dbdirfd, dbpath, W_OK, AT_EACCESS);
- 
		}

		break;

	case PKGDB_MODE_READ|PKGDB_MODE_WRITE:

		if (dbdirfd == -1) {
@@ -867,10 +863,6 @@ pkgdb_check_access(unsigned mode, const char* dbdir, const char *dbname)
				goto out;

		}

		retval = faccessat(dbdirfd, dbpath, R_OK|W_OK, AT_EACCESS);
- 
		if (retval != 0 && errno == ENOENT) {
- 
			mkdirs(dbdir);
- 
			retval = faccessat(dbdirfd, dbpath, R_OK|W_OK, AT_EACCESS);
- 
		}

		break;

	}
@@ -925,16 +917,16 @@ pkgdb_access(unsigned mode, unsigned database)


	if ((mode & PKGDB_MODE_CREATE) != 0) {

		retval = pkgdb_check_access(PKGDB_MODE_READ|PKGDB_MODE_WRITE,
- 
					 ctx.dbdir, NULL);
+ 
		    NULL);

	} else
- 
		retval = pkgdb_check_access(PKGDB_MODE_READ, ctx.dbdir, NULL);
+ 
		retval = pkgdb_check_access(PKGDB_MODE_READ, NULL);

	if (retval != EPKG_OK)

		return (retval);



	/* Test local.sqlite, if required */



	if ((database & PKGDB_DB_LOCAL) != 0) {
- 
		retval = pkgdb_check_access(mode, ctx.dbdir, "local.sqlite");
+ 
		retval = pkgdb_check_access(mode, "local.sqlite");

		if (retval != EPKG_OK)

			return (retval);

	}
modified libpkg/private/pkgdb.h
@@ -166,7 +166,7 @@ int pkgdb_end_solver(struct pkgdb *db);
 * @param dbname

 * @return

 */
- 
int pkgdb_check_access(unsigned mode, const char* dbdir, const char *dbname);
+ 
int pkgdb_check_access(unsigned mode, const char *dbname);



/*

 * SQLite utility functions
modified libpkg/repo/binary/init.c
@@ -527,7 +527,7 @@ pkg_repo_binary_access(struct pkg_repo *repo, unsigned mode)
{

	int			 ret = EPKG_OK;
- 
	ret = pkgdb_check_access(mode, ctx.dbdir,
+ 
	ret = pkgdb_check_access(mode,

		pkg_repo_binary_get_filename(pkg_repo_name(repo)));



	return (ret);