svn commit: samba r16627 - in trunk/source: include passdb

[jra@xxxxxxxxx]

Author: jra
Date: 2006-06-28 17:56:05 +0000 (Wed, 28 Jun 2006)
New Revision: 16627

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16627

Log:
Fix bug #3880, reported by jason@xxxxxxxxxxxx
by ensuring we return the correct enum for sid
type, not a uint32.
Jeremy.

Modified:
   trunk/source/include/passdb.h
   trunk/source/passdb/pdb_interface.c
   trunk/source/passdb/pdb_ldap.c


Changeset:
Modified: trunk/source/include/passdb.h
===================================================================
--- trunk/source/include/passdb.h       2006-06-28 17:26:48 UTC (rev 16626)
+++ trunk/source/include/passdb.h       2006-06-28 17:56:05 UTC (rev 16627)
@@ -240,9 +240,11 @@
  * There's no point in allocating arrays in
  * samr_lookup_rids twice. It was done in the srv_samr_nt.c code as well as in
  * the pdb module. Remove the latter, this might happen more often. VL.
+ * changed to version 14 to move lookup_rids and lookup_names to return
+ * enum SID_NAME_USE rather than uint32.
  */
 
-#define PASSDB_INTERFACE_VERSION 13
+#define PASSDB_INTERFACE_VERSION 14
 
 struct pdb_methods 
 {
@@ -363,14 +365,14 @@
                                int num_rids,
                                uint32 *rids,
                                const char **pp_names,
-                               uint32 *attrs);
+                               enum SID_NAME_USE *attrs);
 
        NTSTATUS (*lookup_names)(struct pdb_methods *methods,
                                 const DOM_SID *domain_sid,
                                 int num_names,
                                 const char **pp_names,
                                 uint32 *rids,
-                                uint32 *attrs);
+                                enum SID_NAME_USE *attrs);
 
        NTSTATUS (*get_account_policy)(struct pdb_methods *methods,
                                       int policy_index, uint32 *value);

Modified: trunk/source/passdb/pdb_interface.c
===================================================================
--- trunk/source/passdb/pdb_interface.c 2006-06-28 17:26:48 UTC (rev 16626)
+++ trunk/source/passdb/pdb_interface.c 2006-06-28 17:56:05 UTC (rev 16627)
@@ -965,22 +965,20 @@
                         int num_rids,
                         uint32 *rids,
                         const char **names,
-                        uint32 *attrs)
+                        enum SID_NAME_USE *attrs)
 {
        struct pdb_methods *pdb = pdb_get_methods();
-       return pdb->lookup_rids(pdb, domain_sid,
-                                           num_rids, rids, names, attrs);
+       return pdb->lookup_rids(pdb, domain_sid, num_rids, rids, names, attrs);
 }
 
 NTSTATUS pdb_lookup_names(const DOM_SID *domain_sid,
                          int num_names,
                          const char **names,
                          uint32 *rids,
-                         uint32 *attrs)
+                         enum SID_NAME_USE *attrs)
 {
        struct pdb_methods *pdb = pdb_get_methods();
-       return pdb->lookup_names(pdb, domain_sid,
-                                            num_names, names, rids, attrs);
+       return pdb->lookup_names(pdb, domain_sid, num_names, names, rids, 
attrs);
 }
 
 BOOL pdb_get_account_policy(int policy_index, uint32 *value)
@@ -1542,7 +1540,7 @@
                                 int num_rids,
                                 uint32 *rids,
                                 const char **names,
-                                uint32 *attrs)
+                                enum SID_NAME_USE *attrs)
 {
        int i;
        NTSTATUS result;
@@ -1605,7 +1603,7 @@
                                  int num_names,
                                  const char **names,
                                  uint32 *rids,
-                                 uint32 *attrs)
+                                 enum SID_NAME_USE *attrs)
 {
        int i;
        NTSTATUS result;

Modified: trunk/source/passdb/pdb_ldap.c
===================================================================
--- trunk/source/passdb/pdb_ldap.c      2006-06-28 17:26:48 UTC (rev 16626)
+++ trunk/source/passdb/pdb_ldap.c      2006-06-28 17:56:05 UTC (rev 16627)
@@ -3641,7 +3641,7 @@
                                    int num_rids,
                                    uint32 *rids,
                                    const char **names,
-                                   uint32 *attrs)
+                                   enum SID_NAME_USE *attrs)
 {
        struct ldapsam_privates *ldap_state =
                (struct ldapsam_privates *)methods->private_data;