SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

machine-credential: replace machine_credentials_contains() by machine_credential_find()

Browse Source
This commit is contained in:
Lennart Poettering
2025-09-19 17:07:50 +02:00
parent 0dc73c5253
commit 9dd33dce76
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/machine-credential.c
+5 -5
View File
@@ -28,15 +28,15 @@ void machine_credential_context_done(MachineCredentialContext *ctx) {
free(ctx->credentials);
}
bool machine_credentials_contains(const MachineCredentialContext *ctx, const char *id) {
MachineCredential* machine_credential_find(MachineCredentialContext *ctx, const char *id) {
assert(ctx);
assert(id);
FOREACH_ARRAY(cred, ctx->credentials, ctx->n_credentials)
if (streq(cred->id, id))
return true;
return cred;
return false;
return NULL;
}
int machine_credential_set(MachineCredentialContext *ctx, const char *cred_str) {
@@ -58,7 +58,7 @@ int machine_credential_set(MachineCredentialContext *ctx, const char *cred_str)
if (!credential_name_valid(cred.id))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Credential name is not valid: %s", cred.id);
if (machine_credentials_contains(ctx, cred.id))
if (machine_credential_find(ctx, cred.id))
return log_error_errno(SYNTHETIC_ERRNO(EEXIST), "Duplicate credential '%s', refusing.", cred.id);
l = cunescape(p, UNESCAPE_ACCEPT_NUL, &cred.data);
@@ -93,7 +93,7 @@ int machine_credential_load(MachineCredentialContext *ctx, const char *cred_path
if (!credential_name_valid(cred.id))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Credential name is not valid: %s", cred.id);
if (machine_credentials_contains(ctx, cred.id))
if (machine_credential_find(ctx, cred.id))
return log_error_errno(SYNTHETIC_ERRNO(EEXIST), "Duplicate credential '%s', refusing.", cred.id);
if (is_path(p) && path_is_valid(p))
src/shared/machine-credential.h
+1 -1
View File
@@ -16,7 +16,7 @@ typedef struct MachineCredentialContext {
void machine_credential_context_done(MachineCredentialContext *ctx);
bool machine_credentials_contains(const MachineCredentialContext *ctx, const char *id);
MachineCredential* machine_credential_find(MachineCredentialContext *ctx, const char *id);
int machine_credential_set(MachineCredentialContext *ctx, const char *cred_str);
int machine_credential_load(MachineCredentialContext *ctx, const char *cred_path);