security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

dirmngr: Silence annoying warning for missing default ldap server file.

Browse Source 
* dirmngr/dirmngr.c (parse_ldapserver_file): Add arg ignore_enoent.
(main): Use that arg for the default file.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2020-07-02 16:05:40 +02:00
parent 0795ab1c8f
commit daca1a011b
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dirmngr/dirmngr.c
View File

@ -373,7 +373,7 @@ static npth_key_t my_tlskey_current_fd;
/* Prototypes. */ /* Prototypes. */
static void cleanup (void); static void cleanup (void);
#if USE_LDAP #if USE_LDAP
static ldap_server_t parse_ldapserver_file (const char* filename); static ldap_server_t parse_ldapserver_file (const char* filename, int ienoent);
#endif /*USE_LDAP*/ #endif /*USE_LDAP*/
static fingerprint_list_t parse_ocsp_signer (const char *string); static fingerprint_list_t parse_ocsp_signer (const char *string);
static void netactivity_action (void); static void netactivity_action (void);
@ -1100,11 +1100,11 @@ main (int argc, char **argv)
ldapfile = make_filename (gnupg_homedir (), ldapfile = make_filename (gnupg_homedir (),
"dirmngr_ldapservers.conf", "dirmngr_ldapservers.conf",
NULL); NULL);
opt.ldapservers = parse_ldapserver_file (ldapfile); opt.ldapservers = parse_ldapserver_file (ldapfile, 1);
xfree (ldapfile); xfree (ldapfile);
} }
else else
opt.ldapservers = parse_ldapserver_file (ldapfile); opt.ldapservers = parse_ldapserver_file (ldapfile, 0);
#endif /*USE_LDAP*/ #endif /*USE_LDAP*/
#ifndef HAVE_W32_SYSTEM #ifndef HAVE_W32_SYSTEM
@ -1618,7 +1618,7 @@ dirmngr_deinit_default_ctrl (ctrl_t ctrl)
*/ */
#if USE_LDAP #if USE_LDAP
static ldap_server_t static ldap_server_t
parse_ldapserver_file (const char* filename) parse_ldapserver_file (const char* filename, int ignore_enoent)
{ {
char buffer[1024]; char buffer[1024];
char *p; char *p;
@ -1631,7 +1631,10 @@ parse_ldapserver_file (const char* filename)
if (!fp) if (!fp)
{ {
if (errno == ENOENT) if (errno == ENOENT)
log_info ("No ldapserver file at: '%s'\n", filename); {
if (!ignore_enoent)
log_info ("No ldapserver file at: '%s'\n", filename);
}
else else
log_error (_("error opening '%s': %s\n"), filename, log_error (_("error opening '%s': %s\n"), filename,
strerror (errno)); strerror (errno));