[SCM] Samba Shared Repository - branch v3-4-stable updated -
release-3-4-0rc1-28-g51b334e
Karolin Seeger
kseeger at samba.org
Fri Jul 3 11:21:51 GMT 2009
The branch, v3-4-stable has been updated
via 51b334e2d9739abc748490f6085ed8b8e5e1f4b4 (commit)
via 7907d399ed0110072ff39ed1f8edccbbad531bfd (commit)
via 385df2910af4f4369b34fb2ccddbe64af6e2c0a5 (commit)
from 92bc5b1f8d3bd5629cd733875eeaabd5561585fb (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-stable
- Log -----------------------------------------------------------------
commit 51b334e2d9739abc748490f6085ed8b8e5e1f4b4
Author: Volker Lendecke <vl at samba.org>
Date: Tue Jun 30 11:42:15 2009 -0700
Fix bug #6431 - local groups from 3.0 setups no longer found.
Search for groups without group suffix, group suffix is only used for new entries.
(cherry picked from commit 91a8cb851e1919a337310e2c699d8fcf76a55060)
(cherry picked from commit f0d67b6e119d719c2540eadce5849d3200dea2d0)
commit 7907d399ed0110072ff39ed1f8edccbbad531bfd
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Jul 3 13:08:06 2009 +0200
WHATSNEW: Update changes.
Karolin
(cherry picked from commit 4735bf0e744e1015eeb5a9ef6e744011183d9e30)
commit 385df2910af4f4369b34fb2ccddbe64af6e2c0a5
Author: Michael Adam <obnox at samba.org>
Date: Fri Jul 3 11:35:11 2009 +0200
Revert "[s3]pidfile_create: use check is_default_dyn_CONFIGFILE() since we have it."
This reverts commit 1d3dcd1e420104c23769b691d0b8b7958d5c58a7.
This fixes Bug #6531 (Pid File creation.)
Usually, I would extend is_default_dyn_XYZ() so that it returns true
when dyn_XYZ has not been set yet or when its value is equal to the
compiled in default value XZY. But this would have a change in effect
in popt_common and torture.c: is_default_dyn_CONFIGFILE() is used
there to check whether the config file should be overwritten by the
contents of the environment variable SMB_CONF_PATH. Currently this
is only done when set_dyn_CONFIGFILE() had _not_ previously been called
at all, not even with the same value as the compiled in default.
Michael
(cherry picked from commit 914a14b3a9c9d922d2a5c1aa413945afa11cfd2a)
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 09411113d8f6b2389b3763bad24bcfdb61b0508c)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 2 ++
source3/lib/pidfile.c | 2 +-
source3/passdb/pdb_ldap.c | 16 ++++++++--------
3 files changed, 11 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 68c8b9e..9d45601 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -213,6 +213,7 @@ o Jeremy Allison <jra at samba.org>
o Michael Adam <obnox at samba.org>
* BUG 6509: Use gid (not uid) cache in fetch_gid_from_cache().
* BUG 6521: Fix building tevent_ntstatus without config.h.
+ * BUG 6531: Fix pid file name.
o Guenther Deschner <gd at samba.org>
@@ -225,6 +226,7 @@ o Bjoern Jacke <bj at sernet.de>
o Volker Lendecke <vl at samba.org>
+ * BUG 6431: Local groups from 3.0 setups no longer found.
* BUG 6498: Add workaround for MS KB932762.
diff --git a/source3/lib/pidfile.c b/source3/lib/pidfile.c
index 37b36af..2c52d12 100644
--- a/source3/lib/pidfile.c
+++ b/source3/lib/pidfile.c
@@ -94,7 +94,7 @@ void pidfile_create(const char *program_name)
/* Add a suffix to the program name if this is a process with a
* none default configuration file name. */
- if (is_default_dyn_CONFIGFILE()) {
+ if (strcmp( CONFIGFILE, get_dyn_CONFIGFILE()) == 0) {
name = SMB_STRDUP(program_name);
} else {
short_configfile = strrchr( get_dyn_CONFIGFILE(), '/');
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 5cbe675..0886a10 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -2297,7 +2297,7 @@ static int ldapsam_search_one_group (struct ldapsam_privates *ldap_state,
attr_list = get_attr_list(NULL, groupmap_attr_list);
rc = smbldap_search(ldap_state->smbldap_state,
- lp_ldap_group_suffix (), scope,
+ lp_ldap_suffix (), scope,
filter, attr_list, 0, result);
TALLOC_FREE(attr_list);
@@ -2617,7 +2617,7 @@ static NTSTATUS ldapsam_enum_group_members(struct pdb_methods *methods,
goto done;
}
- rc = smbldap_search(conn, lp_ldap_group_suffix(),
+ rc = smbldap_search(conn, lp_ldap_suffix(),
LDAP_SCOPE_SUBTREE, filter, id_attrs, 0,
&result);
@@ -2865,7 +2865,7 @@ static NTSTATUS ldapsam_enum_group_memberships(struct pdb_methods *methods,
goto done;
}
- rc = smbldap_search(conn, lp_ldap_group_suffix(),
+ rc = smbldap_search(conn, lp_ldap_suffix(),
LDAP_SCOPE_SUBTREE, filter, attrs, 0, &result);
if (rc != LDAP_SUCCESS)
@@ -3323,7 +3323,7 @@ static NTSTATUS ldapsam_setsamgrent(struct pdb_methods *my_methods,
return NT_STATUS_NO_MEMORY;
}
attr_list = get_attr_list( NULL, groupmap_attr_list );
- rc = smbldap_search(ldap_state->smbldap_state, lp_ldap_group_suffix(),
+ rc = smbldap_search(ldap_state->smbldap_state, lp_ldap_suffix(),
LDAP_SCOPE_SUBTREE, filter,
attr_list, 0, &ldap_state->result);
TALLOC_FREE(attr_list);
@@ -3332,7 +3332,7 @@ static NTSTATUS ldapsam_setsamgrent(struct pdb_methods *my_methods,
DEBUG(0, ("ldapsam_setsamgrent: LDAP search failed: %s\n",
ldap_err2string(rc)));
DEBUG(3, ("ldapsam_setsamgrent: Query was: %s, %s\n",
- lp_ldap_group_suffix(), filter));
+ lp_ldap_suffix(), filter));
ldap_msgfree(ldap_state->result);
ldap_state->result = NULL;
TALLOC_FREE(filter);
@@ -3722,7 +3722,7 @@ static NTSTATUS ldapsam_alias_memberships(struct pdb_methods *methods,
return NT_STATUS_NO_MEMORY;
}
- rc = smbldap_search(ldap_state->smbldap_state, lp_ldap_group_suffix(),
+ rc = smbldap_search(ldap_state->smbldap_state, lp_ldap_suffix(),
LDAP_SCOPE_SUBTREE, filter, attrs, 0, &result);
if (rc != LDAP_SUCCESS)
@@ -4078,7 +4078,7 @@ static NTSTATUS ldapsam_lookup_rids(struct pdb_methods *methods,
}
rc = smbldap_search(ldap_state->smbldap_state,
- lp_ldap_group_suffix(),
+ lp_ldap_suffix(),
LDAP_SCOPE_SUBTREE, filter, ldap_attrs, 0,
&msg);
talloc_autofree_ldapmsg(mem_ctx, msg);
@@ -4680,7 +4680,7 @@ static bool ldapsam_search_grouptype(struct pdb_methods *methods,
state->connection = ldap_state->smbldap_state;
- state->base = talloc_strdup(search, lp_ldap_group_suffix());
+ state->base = talloc_strdup(search, lp_ldap_suffix());
state->connection = ldap_state->smbldap_state;
state->scope = LDAP_SCOPE_SUBTREE;
state->filter = talloc_asprintf(search, "(&(objectclass=%s)"
--
Samba Shared Repository
More information about the samba-cvs
mailing list