13b2b31 Comment out the new user/group management for now — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Comment out the new user/group management for now

Baptiste Daroussin committed 14 years ago

commit 13b2b31993e004a3ac6a12ced23f4ca8ee72f7f6
parent 8badfaf

2 files changed +6 -6

modified libpkg/pkg_add.c

@@ -212,7 +212,7 @@ pkg_add(struct pkgdb *db, const char *path, int flags)

 		pkg_script_run(pkg, PKG_SCRIPT_PRE_INSTALL);
 	/* add the user and group if necessary */
 	pkg_add_user_group(pkg);
 	/* pkg_add_user_group(pkg); */
 	/*
 	 * Extract the files on disk.

modified libpkg/pkgdb.c

@@ -1054,8 +1054,8 @@ pkgdb_load_category(struct pkgdb *db, struct pkg *pkg)

 int
 pkgdb_load_user(struct pkgdb *db, struct pkg *pkg)
 {
 	struct pkg_user *u = NULL;
 	struct passwd *pwd = NULL;
 	/*struct pkg_user *u = NULL;
 	struct passwd *pwd = NULL;*/
 	int ret;
 	const char sql[] = ""

@@ -1069,13 +1069,13 @@ pkgdb_load_user(struct pkgdb *db, struct pkg *pkg)

 	ret = load_val(db->sqlite, pkg, sql, PKG_LOAD_USERS, pkg_adduser, PKG_USERS);
 	/* get user uidstr from local database */
 	while (pkg_users(pkg, &u) == EPKG_OK) {
 	/* TODO get user uidstr from local database */
 /*	while (pkg_users(pkg, &u) == EPKG_OK) {
 		pwd = getpwnam(pkg_user_name(u));
 		if (pwd == NULL)
 			continue;
 		strlcpy(u->uidstr, pw_make(pwd), sizeof(u->uidstr));
 	}
 	}*/
 	return (ret);
 }