[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  61e8b80 s3:passdb: fix building pdb_ldap as shared module
      from  d913fb1 docs: Merge both samba.8 manpages.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 61e8b80c85bf114da7f1d3dadfc2207564f5fbaa
Author: Michael Adam <obnox at samba.org>
Date:   Mon Dec 3 16:52:12 2012 +0100

    s3:passdb: fix building pdb_ldap as shared module
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Mon Dec  3 19:12:29 CET 2012 on sn-devel-104

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

Summary of changes:
 source3/passdb/ABI/pdb-0.sigs  |    1 +
 source3/passdb/pdb_interface.c |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/passdb/ABI/pdb-0.sigs b/source3/passdb/ABI/pdb-0.sigs
index f32ca4f..4108b9a 100644
--- a/source3/passdb/ABI/pdb-0.sigs
+++ b/source3/passdb/ABI/pdb-0.sigs
@@ -238,6 +238,7 @@ pdb_set_workstations: bool (struct samu *, const char *, enum pdb_value_state)
 pdb_sethexhours: void (char *, const unsigned char *)
 pdb_sethexpwd: void (char *, const unsigned char *, uint32_t)
 pdb_sid_to_id: bool (const struct dom_sid *, struct unixid *)
+pdb_sid_to_id_unix_users_and_groups: bool (const struct dom_sid *, struct unixid *)
 pdb_uid_to_sid: bool (uid_t, struct dom_sid *)
 pdb_update_autolock_flag: bool (struct samu *, bool *)
 pdb_update_bad_password_count: bool (struct samu *, bool *)
diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index 436e774..775f8a3 100644
--- a/source3/passdb/pdb_interface.c
+++ b/source3/passdb/pdb_interface.c
@@ -1425,8 +1425,8 @@ static bool pdb_default_gid_to_sid(struct pdb_methods *methods, gid_t gid,
  * The "Unix User" and "Unix Group" domains have a special
  * id mapping that is a rid-algorithm with range starting at 0.
  */
-_PRIVATE_ bool pdb_sid_to_id_unix_users_and_groups(const struct dom_sid *sid,
-						   struct unixid *id)
+bool pdb_sid_to_id_unix_users_and_groups(const struct dom_sid *sid,
+					 struct unixid *id)
 {
 	uint32_t rid;
 


-- 
Samba Shared Repository