VesperOS/shadow
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib/nss.c: nss_init(): Use stpsep() instead of strtok_r(3)

Browse Source 
Signed-off-by: Alejandro Colomar <alx@kernel.org>
This commit is contained in:
Alejandro Colomar
2024-07-08 20:25:01 -05:00
committed by Serge Hallyn
parent 8714ac0cd6
commit d95b899bfc
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/nss.c
+9 -8
View File
@@ -15,6 +15,7 @@
#include "shadowlog_internal.h"
#include "shadowlog.h"
#include "string/sprintf/snprintf.h"
#include "string/strtok/stpsep.h"
#define NSSWITCH "/etc/nsswitch.conf"
@@ -45,8 +46,9 @@ static void nss_exit(void) {
}
// nsswitch_path is an argument only to support testing.
void nss_init(const char *nsswitch_path) {
char *line = NULL, *p, *token, *saveptr;
void
nss_init(const char *nsswitch_path) {
char *line = NULL, *p;
char libname[64];
FILE *nssfp = NULL;
FILE *shadow_logfd = log_get_logfd();
@@ -91,21 +93,20 @@ void nss_init(const char *nsswitch_path) {
if (p == NULL) {
goto null_subid;
}
token = strtok_r(p, " \n\t", &saveptr);
if (token == NULL) {
if (stpsep(p, " \t\n") == NULL) {
fprintf(shadow_logfd, "No usable subid NSS module found, using files\n");
// subid_nss has to be null here, but to ease reviews:
goto null_subid;
}
if (strcmp(token, "files") == 0) {
if (strcmp(p, "files") == 0) {
goto null_subid;
}
if (strlen(token) > 50) {
fprintf(shadow_logfd, "Subid NSS module name too long (longer than 50 characters): %s\n", token);
if (strlen(p) > 50) {
fprintf(shadow_logfd, "Subid NSS module name too long (longer than 50 characters): %s\n", p);
fprintf(shadow_logfd, "Using files\n");
goto null_subid;
}
SNPRINTF(libname, "libsubid_%s.so", token);
SNPRINTF(libname, "libsubid_%s.so", p);
h = dlopen(libname, RTLD_LAZY);
if (!h) {
fprintf(shadow_logfd, "Error opening %s: %s\n", libname, dlerror());