[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-28-132-g698f63c

[Volker Lendecke]

The branch, v3-0-test has been updated
       via  698f63cc3adc652c20cfd84a0b2eab72076b7e8a (commit)
       via  7d4b9b46a01dc4139d6d29dc3feb747d0991ebea (commit)
      from  eff92e2ff0893eecbfc7c66ca4700429df5dc6bc (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-0-test


- Log -----------------------------------------------------------------
commit 698f63cc3adc652c20cfd84a0b2eab72076b7e8a
Author: Karolin Seeger <kseeger at samba.org>
Date:   Fri Feb 8 13:48:23 2008 +0100

    Fix typo.
    
    Karolin

commit 7d4b9b46a01dc4139d6d29dc3feb747d0991ebea
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Feb 19 11:36:35 2008 +0100

    Change ldap search filter. This function is also used to search machine accounts which may be located in a different ou.
    
    Karolin

-----------------------------------------------------------------------

Summary of changes:
 source/passdb/pdb_ldap.c |    6 +++---
 source/utils/net_rpc.c   |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/passdb/pdb_ldap.c b/source/passdb/pdb_ldap.c
index 8d7caba..8c6fa81 100644
--- a/source/passdb/pdb_ldap.c
+++ b/source/passdb/pdb_ldap.c
@@ -2458,7 +2458,7 @@ static NTSTATUS ldapsam_enum_group_members(struct pdb_methods *methods,
 			goto done;
 		}
 
-		rc = smbldap_search(conn, lp_ldap_user_suffix(),
+		rc = smbldap_search(conn, lp_ldap_suffix(),
 				    LDAP_SCOPE_SUBTREE, filter, sid_attrs, 0,
 				    &result);
 
@@ -2514,7 +2514,7 @@ static NTSTATUS ldapsam_enum_group_members(struct pdb_methods *methods,
 				 LDAP_OBJ_SAMBASAMACCOUNT,
 				 gidstr);
 
-	rc = smbldap_search(conn, lp_ldap_user_suffix(),
+	rc = smbldap_search(conn, lp_ldap_suffix(),
 			    LDAP_SCOPE_SUBTREE, filter, sid_attrs, 0,
 			    &result);
 
@@ -2598,7 +2598,7 @@ static NTSTATUS ldapsam_enum_group_memberships(struct pdb_methods *methods,
 		goto done;
 	}
 
-	rc = smbldap_search(conn, lp_ldap_user_suffix(),
+	rc = smbldap_search(conn, lp_ldap_suffix(),
 			    LDAP_SCOPE_SUBTREE, filter, attrs, 0, &result);
 
 	if (rc != LDAP_SUCCESS)
diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c
index 1a3de4f..9944ef0 100644
--- a/source/utils/net_rpc.c
+++ b/source/utils/net_rpc.c
@@ -381,7 +381,7 @@ static int rpc_join_usage(int argc, const char **argv)
  * @param argc  Standard main() style argv.  Initial components are already
  *              stripped
  *
- * Main 'net_rpc_join()' (where the admain username/password is used) is 
+ * Main 'net_rpc_join()' (where the admin username/password is used) is
  * in net_rpc_join.c
  * Try to just change the password, but if that doesn't work, use/prompt
  * for a username/password.


-- 
Samba Shared Repository