r5562: * bump version to 3.0.12pre2

* change special character in gd's valid workstation
  check to a '+' to be more in line with the characters
  used by valid users
(This used to be commit 8bff0486508b9952c192345302b9313ac0b2270e)

diff --git a/source3/VERSION b/source3/VERSION
index 31fe4715470bc3574de4f1994688b08b85325710..1e67d25e21257f4b581e588709c714a2d30e7a90 100644 (file)
--- a/source3/VERSION
+++ b/source3/VERSION
@@ -29,7 +29,7 @@ SAMBA_VERSION_RELEASE=12
 # e.g. SAMBA_VERSION_PRE_RELEASE=1                     #
 #  ->  "2.2.9pre1"                                     #
 ########################################################
-SAMBA_VERSION_PRE_RELEASE=1
+SAMBA_VERSION_PRE_RELEASE=2
 
 ########################################################
 # For 'rc' releases the version will be                #

diff --git a/source3/auth/auth_sam.c b/source3/auth/auth_sam.c
index db05ac97f8851a734b1b68e82d8cf3a0be38326b..35f85f5e6085f66f37c9f11445c710cedc6e644e 100644 (file)
--- a/source3/auth/auth_sam.c
+++ b/source3/auth/auth_sam.c
@@ -185,7 +185,7 @@ static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
                                invalid_ws = False;
                                break;
                        }
-                       if (tok[0] == '@') {
+                       if (tok[0] == '+') {
                                DEBUG(10,("sam_account_ok: checking for workstation %s in group: %s\n", 
                                        machine_name, tok + 1));
                                if (user_in_group_list(machine_name, tok + 1, NULL, 0)) {