diff --git a/lib/chkname.c b/lib/chkname.c
index 9e01e62dc..5ed72789d 100644
--- a/lib/chkname.c
+++ b/lib/chkname.c
@@ -84,10 +84,7 @@ is_valid_name(const char *name)
          * sake of Samba 3.x "add machine script"
          */
 
-	if (!(isalnum(*name) ||
-	      *name == '_' ||
-	      *name == '.'))
-	{
+	if (!ispfchar(*name)) {
 		errno = EILSEQ;
 		return false;
 	}
@@ -96,12 +93,7 @@ is_valid_name(const char *name)
 		if (streq(name, "$"))  // Samba
 			return true;
 
-		if (!(isalnum(*name) ||
-		      *name == '_' ||
-		      *name == '.' ||
-		      *name == '-'
-		     ))
-		{
+		if (!ispfchar(*name)) {
 			errno = EILSEQ;
 			return false;
 		}