*** a/src/backend/replication/basebackup.c
--- b/src/backend/replication/basebackup.c
***************
*** 834,840 **** sendDir(char *path, int basepathlen, bool sizeonly, List *tablespaces)
  
  		/* skip auto conf temporary file */
  		if (strncmp(de->d_name,
! 					PG_AUTOCONF_FILENAME ".temp",
  					sizeof(PG_AUTOCONF_FILENAME) + 4) == 0)
  			continue;
  
--- 834,840 ----
  
  		/* skip auto conf temporary file */
  		if (strncmp(de->d_name,
! 					PG_AUTOCONF_FILENAME ".tmp",
  					sizeof(PG_AUTOCONF_FILENAME) + 4) == 0)
  			continue;
  
*** a/src/backend/utils/misc/guc.c
--- b/src/backend/utils/misc/guc.c
***************
*** 6671,6677 **** AlterSystemSetConfigFile(AlterSystemStmt * altersysstmt)
  	canonicalize_path(AutoConfFileName);
  	snprintf(AutoConfTmpFileName, sizeof(AutoConfTmpFileName), "%s.%s",
  			 AutoConfFileName,
! 			 "temp");
  
  	/*
  	 * one backend is allowed to operate on postgresql.auto.conf file, to
--- 6671,6677 ----
  	canonicalize_path(AutoConfFileName);
  	snprintf(AutoConfTmpFileName, sizeof(AutoConfTmpFileName), "%s.%s",
  			 AutoConfFileName,
! 			 "tmp");
  
  	/*
  	 * one backend is allowed to operate on postgresql.auto.conf file, to