> Am 25.05.2022 um 21:45 schrieb Christophe JAILLET 
> <christophe.jail...@wanadoo.fr>:
> 
> Le 16/03/2022 à 09:28, ic...@apache.org a écrit :
>> Author: icing
>> Date: Wed Mar 16 08:28:27 2022
>> New Revision: 1898962
>> URL: http://svn.apache.org/viewvc?rev=1898962&view=rev
>> Log:
>>   *) mod_md: fix compiler warning about NULL arg to a %s log. Fixes PR 65955.
>> Modified:
>>     httpd/httpd/trunk/modules/md/md_store_fs.c
>> Modified: httpd/httpd/trunk/modules/md/md_store_fs.c
>> URL: 
>> http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/md/md_store_fs.c?rev=1898962&r1=1898961&r2=1898962&view=diff
>> ==============================================================================
>> --- httpd/httpd/trunk/modules/md/md_store_fs.c (original)
>> +++ httpd/httpd/trunk/modules/md/md_store_fs.c Wed Mar 16 08:28:27 2022
>> @@ -503,6 +503,7 @@ static apr_status_t mk_group_dir(const c
>>            perms = gperms(s_fs, group);
>>  +    *pdir = NULL;
>>      rv = fs_get_dname(pdir, &s_fs->s, group, name, p);
>>      if ((APR_SUCCESS != rv) || (MD_SG_NONE == group)) goto cleanup;
>>  @@ -521,7 +522,8 @@ static apr_status_t mk_group_dir(const c
>>      }
>>  cleanup:
>>      if (APR_SUCCESS != rv) {
>> -        md_log_perror(MD_LOG_MARK, MD_LOG_ERR, rv, p, "mk_group_dir %d %s", 
>> group, name);
>> +        md_log_perror(MD_LOG_MARK, MD_LOG_ERR, rv, p, "mk_group_dir %d %s",
>> +            group, (*pdir? *pdir : (name? name : "(null)")));
>>      }
>>      return rv;
>>  }
> 
> Hi,
> 
> looks that this has been reverted in r1900313.
> 
> Is it intentional?

Thanks for spotting this. My way of merging changes between the repositories is 
not as robust as it should be..

Restored in r1901271.

Kind Regards,
Stefan

Reply via email to