summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-02-25 15:56:13 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:55:47 -0500
commitc7a00987e3c8b02e82142be16658d339f9b9dcd2 (patch)
tree6693707cfac0194da1a610d9e78ef4df57fc1d4b
parentd8b85fa12b1224c8db3ae3ec4f767801e1c9713a (diff)
downloadsamba-c7a00987e3c8b02e82142be16658d339f9b9dcd2.tar.gz
samba-c7a00987e3c8b02e82142be16658d339f9b9dcd2.tar.bz2
samba-c7a00987e3c8b02e82142be16658d339f9b9dcd2.zip
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)
-rw-r--r--source3/VERSION2
-rw-r--r--source3/auth/auth_sam.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/VERSION b/source3/VERSION
index 31fe471547..1e67d25e21 100644
--- 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 db05ac97f8..35f85f5e60 100644
--- 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)) {