"@" is valid in NetBIOS domain names.

Jeremy.
(This used to be commit 5c4857d8e00162fc43a0f2e3a335b441bad743bd)

diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 3dc9fe9208c0411cbc615324b333e09999375d00..09288ad44dd8d9510700bb8f2bd8603a59d1d95a 100644 (file)
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -734,7 +734,7 @@ int reply_sesssetup_and_X(connection_struct *conn, char *inbuf,char *outbuf,
        
        /* don't allow for weird usernames or domains */
        alpha_strcpy(user, user, ". _-$", sizeof(user));
-       alpha_strcpy(domain, domain, ". _-", sizeof(domain));
+       alpha_strcpy(domain, domain, ". _-@", sizeof(domain));
        if (strstr(user, "..") || strstr(domain,"..")) {
                return ERROR_NT(NT_STATUS_LOGON_FAILURE);
        }